diff --git a/Aaru.Core/PluginBase.cs b/Aaru.Core/PluginBase.cs
index 431aba800..0dae8d9fa 100644
--- a/Aaru.Core/PluginBase.cs
+++ b/Aaru.Core/PluginBase.cs
@@ -48,7 +48,7 @@ public static class PluginBase
{
new Register(),
new Filters.Register(),
- new DiscImages.Register(),
+ new Images.Register(),
new Aaru.Filesystems.Register(),
new Aaru.Partitions.Register(),
new Archives.Register()
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index eff83c3ac..65ada4242 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -42,9 +42,9 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs.Devices.ATA;
using Aaru.Console;
using Aaru.Decoders.PCMCIA;
-using Aaru.DiscImages;
using Aaru.Filters;
using Aaru.Helpers;
+using Aaru.Images;
using Directory = System.IO.Directory;
using File = System.IO.File;
using MediaType = Aaru.CommonTypes.Metadata.MediaType;
diff --git a/Aaru.Images/A2R/A2R.cs b/Aaru.Images/A2R/A2R.cs
index 6c95cbc14..eac58366d 100644
--- a/Aaru.Images/A2R/A2R.cs
+++ b/Aaru.Images/A2R/A2R.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading A2R flux images
diff --git a/Aaru.Images/A2R/Constants.cs b/Aaru.Images/A2R/Constants.cs
index df8fc2668..114e73923 100644
--- a/Aaru.Images/A2R/Constants.cs
+++ b/Aaru.Images/A2R/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Enums.cs b/Aaru.Images/A2R/Enums.cs
index a351bbeb7..a6fbcf977 100644
--- a/Aaru.Images/A2R/Enums.cs
+++ b/Aaru.Images/A2R/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Helpers.cs b/Aaru.Images/A2R/Helpers.cs
index e76dcb716..3eb0a95df 100644
--- a/Aaru.Images/A2R/Helpers.cs
+++ b/Aaru.Images/A2R/Helpers.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Aaru.CommonTypes;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Identify.cs b/Aaru.Images/A2R/Identify.cs
index 905153cca..921a18449 100644
--- a/Aaru.Images/A2R/Identify.cs
+++ b/Aaru.Images/A2R/Identify.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Properties.cs b/Aaru.Images/A2R/Properties.cs
index 8d8a804e2..702e4e6e8 100644
--- a/Aaru.Images/A2R/Properties.cs
+++ b/Aaru.Images/A2R/Properties.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Read.cs b/Aaru.Images/A2R/Read.cs
index b7533e50c..3b3c3f37b 100644
--- a/Aaru.Images/A2R/Read.cs
+++ b/Aaru.Images/A2R/Read.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Structs.cs b/Aaru.Images/A2R/Structs.cs
index 09ff3eb1b..c35566fd7 100644
--- a/Aaru.Images/A2R/Structs.cs
+++ b/Aaru.Images/A2R/Structs.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/A2R/Write.cs b/Aaru.Images/A2R/Write.cs
index 761b3060a..50f785da7 100644
--- a/Aaru.Images/A2R/Write.cs
+++ b/Aaru.Images/A2R/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 7e71dc21b..c467cc3b1 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -4,7 +4,7 @@
2.0
{74032CBC-339B-42F3-AF6F-E96C261F3E6A}
Library
- Aaru.DiscImages
+ Aaru.Images
Aaru.Images
$(Version)
true
@@ -12,7 +12,7 @@
Claunia.com
Copyright © 2011-2023 Natalia Portillo
Aaru Data Preservation Suite
- Aaru.DiscImages
+ Aaru.Images
$(Version)
net8.0
CS0649
diff --git a/Aaru.Images/AaruFormat/AaruFormat.cs b/Aaru.Images/AaruFormat/AaruFormat.cs
index 99bc00dec..986f0975b 100644
--- a/Aaru.Images/AaruFormat/AaruFormat.cs
+++ b/Aaru.Images/AaruFormat/AaruFormat.cs
@@ -77,7 +77,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing AaruFormat media images
diff --git a/Aaru.Images/AaruFormat/CdEcc.cs b/Aaru.Images/AaruFormat/CdEcc.cs
index 820f27c27..8117dfccf 100644
--- a/Aaru.Images/AaruFormat/CdEcc.cs
+++ b/Aaru.Images/AaruFormat/CdEcc.cs
@@ -34,7 +34,7 @@
using System;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
index a5c814861..798e42216 100644
--- a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
+++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
@@ -34,7 +34,7 @@ using System;
using System.Diagnostics;
using Aaru.Console;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Constants.cs b/Aaru.Images/AaruFormat/Constants.cs
index 8344cb7b3..ee37f6d9c 100644
--- a/Aaru.Images/AaruFormat/Constants.cs
+++ b/Aaru.Images/AaruFormat/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Enums.cs b/Aaru.Images/AaruFormat/Enums.cs
index 5fdecfbf8..9a8920480 100644
--- a/Aaru.Images/AaruFormat/Enums.cs
+++ b/Aaru.Images/AaruFormat/Enums.cs
@@ -32,7 +32,7 @@
// ReSharper disable UnusedMember.Local
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs
index ce670da5f..e586fa944 100644
--- a/Aaru.Images/AaruFormat/Helpers.cs
+++ b/Aaru.Images/AaruFormat/Helpers.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
using Aaru.Decoders.SecureDigital;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Identify.cs b/Aaru.Images/AaruFormat/Identify.cs
index 4c7301a17..2a3a57bc3 100644
--- a/Aaru.Images/AaruFormat/Identify.cs
+++ b/Aaru.Images/AaruFormat/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Properties.cs b/Aaru.Images/AaruFormat/Properties.cs
index fcb5b0b71..27419ab3d 100644
--- a/Aaru.Images/AaruFormat/Properties.cs
+++ b/Aaru.Images/AaruFormat/Properties.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs
index 28ef33daa..82c000d23 100644
--- a/Aaru.Images/AaruFormat/Read.cs
+++ b/Aaru.Images/AaruFormat/Read.cs
@@ -59,7 +59,7 @@ using TapePartition = Aaru.CommonTypes.Structs.TapePartition;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Structs.cs b/Aaru.Images/AaruFormat/Structs.cs
index fd5ceae3a..55bfe07ee 100644
--- a/Aaru.Images/AaruFormat/Structs.cs
+++ b/Aaru.Images/AaruFormat/Structs.cs
@@ -34,7 +34,7 @@ using System.Runtime.InteropServices;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Tape.cs b/Aaru.Images/AaruFormat/Tape.cs
index 503248d7d..cfd31abe7 100644
--- a/Aaru.Images/AaruFormat/Tape.cs
+++ b/Aaru.Images/AaruFormat/Tape.cs
@@ -34,7 +34,7 @@ using System.Collections.Generic;
using System.Linq;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs
index fc710c78d..333ea370b 100644
--- a/Aaru.Images/AaruFormat/Verify.cs
+++ b/Aaru.Images/AaruFormat/Verify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index 3f7686257..7f0617ffb 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -61,7 +61,7 @@ using TapePartition = Aaru.CommonTypes.Structs.TapePartition;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AaruFormat
{
diff --git a/Aaru.Images/Alcohol120/Alcohol120.cs b/Aaru.Images/Alcohol120/Alcohol120.cs
index 20871fac8..6de88e4dd 100644
--- a/Aaru.Images/Alcohol120/Alcohol120.cs
+++ b/Aaru.Images/Alcohol120/Alcohol120.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing Alcohol 120% disk images
diff --git a/Aaru.Images/Alcohol120/Constants.cs b/Aaru.Images/Alcohol120/Constants.cs
index 42a8c0ae9..0886e22f8 100644
--- a/Aaru.Images/Alcohol120/Constants.cs
+++ b/Aaru.Images/Alcohol120/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Enums.cs b/Aaru.Images/Alcohol120/Enums.cs
index 5a46fd6bf..e33dcfb2e 100644
--- a/Aaru.Images/Alcohol120/Enums.cs
+++ b/Aaru.Images/Alcohol120/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Helpers.cs b/Aaru.Images/Alcohol120/Helpers.cs
index dd37e6e7d..839ef9d2e 100644
--- a/Aaru.Images/Alcohol120/Helpers.cs
+++ b/Aaru.Images/Alcohol120/Helpers.cs
@@ -33,7 +33,7 @@
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Identify.cs b/Aaru.Images/Alcohol120/Identify.cs
index 3bce2ae63..5b86eb0e6 100644
--- a/Aaru.Images/Alcohol120/Identify.cs
+++ b/Aaru.Images/Alcohol120/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs
index ae29b88ad..79996a493 100644
--- a/Aaru.Images/Alcohol120/Properties.cs
+++ b/Aaru.Images/Alcohol120/Properties.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs
index df8d44064..78d0c2bb5 100644
--- a/Aaru.Images/Alcohol120/Read.cs
+++ b/Aaru.Images/Alcohol120/Read.cs
@@ -44,7 +44,7 @@ using Aaru.Helpers;
using DMI = Aaru.Decoders.Xbox.DMI;
using Sector = Aaru.Decoders.CD.Sector;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Structs.cs b/Aaru.Images/Alcohol120/Structs.cs
index 9e20caddc..64bc3ab99 100644
--- a/Aaru.Images/Alcohol120/Structs.cs
+++ b/Aaru.Images/Alcohol120/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Verify.cs b/Aaru.Images/Alcohol120/Verify.cs
index c43b811cc..47e390d09 100644
--- a/Aaru.Images/Alcohol120/Verify.cs
+++ b/Aaru.Images/Alcohol120/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Alcohol120/Write.cs b/Aaru.Images/Alcohol120/Write.cs
index cf2d498e3..21c2e3fca 100644
--- a/Aaru.Images/Alcohol120/Write.cs
+++ b/Aaru.Images/Alcohol120/Write.cs
@@ -43,7 +43,7 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Alcohol120
{
diff --git a/Aaru.Images/Anex86/Anex86.cs b/Aaru.Images/Anex86/Anex86.cs
index 88f2e34a9..b15305590 100644
--- a/Aaru.Images/Anex86/Anex86.cs
+++ b/Aaru.Images/Anex86/Anex86.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing Anex-86 disk images
diff --git a/Aaru.Images/Anex86/Identify.cs b/Aaru.Images/Anex86/Identify.cs
index e404617a5..e841ddc4c 100644
--- a/Aaru.Images/Anex86/Identify.cs
+++ b/Aaru.Images/Anex86/Identify.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Anex86/Properties.cs b/Aaru.Images/Anex86/Properties.cs
index 883cef1fc..95bdb0b73 100644
--- a/Aaru.Images/Anex86/Properties.cs
+++ b/Aaru.Images/Anex86/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs
index 11616b32f..def6cfc9c 100644
--- a/Aaru.Images/Anex86/Read.cs
+++ b/Aaru.Images/Anex86/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Anex86/Structs.cs b/Aaru.Images/Anex86/Structs.cs
index 2200759aa..670575d4d 100644
--- a/Aaru.Images/Anex86/Structs.cs
+++ b/Aaru.Images/Anex86/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Anex86/Unsupported.cs b/Aaru.Images/Anex86/Unsupported.cs
index 9798e6184..4575aeb13 100644
--- a/Aaru.Images/Anex86/Unsupported.cs
+++ b/Aaru.Images/Anex86/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Anex86/Write.cs b/Aaru.Images/Anex86/Write.cs
index e8f9a07e5..d9fbb59be 100644
--- a/Aaru.Images/Anex86/Write.cs
+++ b/Aaru.Images/Anex86/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Anex86
{
diff --git a/Aaru.Images/Apple2MG/Apple2MG.cs b/Aaru.Images/Apple2MG/Apple2MG.cs
index f1c72fc9c..a44919f04 100644
--- a/Aaru.Images/Apple2MG/Apple2MG.cs
+++ b/Aaru.Images/Apple2MG/Apple2MG.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing XGD emulator disk images
diff --git a/Aaru.Images/Apple2MG/Constants.cs b/Aaru.Images/Apple2MG/Constants.cs
index 57e4e8a77..7f78c557a 100644
--- a/Aaru.Images/Apple2MG/Constants.cs
+++ b/Aaru.Images/Apple2MG/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Apple2Mg
diff --git a/Aaru.Images/Apple2MG/Enums.cs b/Aaru.Images/Apple2MG/Enums.cs
index a406af53e..a02ae0f1e 100644
--- a/Aaru.Images/Apple2MG/Enums.cs
+++ b/Aaru.Images/Apple2MG/Enums.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Helpers.cs b/Aaru.Images/Apple2MG/Helpers.cs
index 3be1da662..5b33a5f6f 100644
--- a/Aaru.Images/Apple2MG/Helpers.cs
+++ b/Aaru.Images/Apple2MG/Helpers.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Identify.cs b/Aaru.Images/Apple2MG/Identify.cs
index 8eddde4be..80482586c 100644
--- a/Aaru.Images/Apple2MG/Identify.cs
+++ b/Aaru.Images/Apple2MG/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Properties.cs b/Aaru.Images/Apple2MG/Properties.cs
index b372ad2da..68ff9babd 100644
--- a/Aaru.Images/Apple2MG/Properties.cs
+++ b/Aaru.Images/Apple2MG/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs
index 9f1e6f9da..e317a0552 100644
--- a/Aaru.Images/Apple2MG/Read.cs
+++ b/Aaru.Images/Apple2MG/Read.cs
@@ -40,7 +40,7 @@ using Aaru.Console;
using Aaru.Filters;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
@@ -146,9 +146,7 @@ public sealed partial class Apple2Mg
for(var t = 0; t < 35; t++)
{
for(var s = 0; s < 16; s++)
- {
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
- }
}
_imageInfo.Sectors = 560;
@@ -165,9 +163,7 @@ public sealed partial class Apple2Mg
for(var t = 0; t < 200; t++)
{
for(var s = 0; s < 16; s++)
- {
Array.Copy(tmp, t * 16 * 256 + s * 256, _decodedImage, t * 16 * 256 + offsets[s] * 256, 256);
- }
}
_imageInfo.Sectors = 1600;
diff --git a/Aaru.Images/Apple2MG/Structs.cs b/Aaru.Images/Apple2MG/Structs.cs
index 1259bbfcf..2f055bff9 100644
--- a/Aaru.Images/Apple2MG/Structs.cs
+++ b/Aaru.Images/Apple2MG/Structs.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Unsupported.cs b/Aaru.Images/Apple2MG/Unsupported.cs
index fceb79fba..8a01d188f 100644
--- a/Aaru.Images/Apple2MG/Unsupported.cs
+++ b/Aaru.Images/Apple2MG/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/Apple2MG/Write.cs b/Aaru.Images/Apple2MG/Write.cs
index 5a1661e14..01563d276 100644
--- a/Aaru.Images/Apple2MG/Write.cs
+++ b/Aaru.Images/Apple2MG/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apple2Mg
{
diff --git a/Aaru.Images/AppleDOS/AppleDOS.cs b/Aaru.Images/AppleDOS/AppleDOS.cs
index 1b5910a49..f741022e4 100644
--- a/Aaru.Images/AppleDOS/AppleDOS.cs
+++ b/Aaru.Images/AppleDOS/AppleDOS.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing interleaved Apple DOS disk images
diff --git a/Aaru.Images/AppleDOS/Constants.cs b/Aaru.Images/AppleDOS/Constants.cs
index c2ef26654..ce802b078 100644
--- a/Aaru.Images/AppleDOS/Constants.cs
+++ b/Aaru.Images/AppleDOS/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
diff --git a/Aaru.Images/AppleDOS/Identify.cs b/Aaru.Images/AppleDOS/Identify.cs
index 41f7939b9..d29d64bf2 100644
--- a/Aaru.Images/AppleDOS/Identify.cs
+++ b/Aaru.Images/AppleDOS/Identify.cs
@@ -33,7 +33,7 @@
using System.IO;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
diff --git a/Aaru.Images/AppleDOS/Properties.cs b/Aaru.Images/AppleDOS/Properties.cs
index 9fc26f52a..a6a89e816 100644
--- a/Aaru.Images/AppleDOS/Properties.cs
+++ b/Aaru.Images/AppleDOS/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
diff --git a/Aaru.Images/AppleDOS/Read.cs b/Aaru.Images/AppleDOS/Read.cs
index fa1a64300..f5466be7a 100644
--- a/Aaru.Images/AppleDOS/Read.cs
+++ b/Aaru.Images/AppleDOS/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
@@ -77,9 +77,7 @@ public sealed partial class AppleDos
for(var t = 0; t < 35; t++)
{
for(var s = 0; s < 16; s++)
- {
Array.Copy(tmp, t * 16 * 256 + s * 256, _deinterleaved, t * 16 * 256 + offsets[s] * 256, 256);
- }
}
}
diff --git a/Aaru.Images/AppleDOS/Unsupported.cs b/Aaru.Images/AppleDOS/Unsupported.cs
index e012ccbdc..a8514041c 100644
--- a/Aaru.Images/AppleDOS/Unsupported.cs
+++ b/Aaru.Images/AppleDOS/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
diff --git a/Aaru.Images/AppleDOS/Write.cs b/Aaru.Images/AppleDOS/Write.cs
index 8a63bebe8..e230361a1 100644
--- a/Aaru.Images/AppleDOS/Write.cs
+++ b/Aaru.Images/AppleDOS/Write.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleDos
{
@@ -192,9 +192,7 @@ public sealed partial class AppleDos
for(var t = 0; t < 35; t++)
for(var s = 0; s < 16; s++)
- {
Array.Copy(_deinterleaved, t * 16 * 256 + offsets[s] * 256, tmp, t * 16 * 256 + s * 256, 256);
- }
}
_writingStream.Seek(0, SeekOrigin.Begin);
diff --git a/Aaru.Images/AppleNIB/AppleNIB.cs b/Aaru.Images/AppleNIB/AppleNIB.cs
index 77478ed03..786cc9796 100644
--- a/Aaru.Images/AppleNIB/AppleNIB.cs
+++ b/Aaru.Images/AppleNIB/AppleNIB.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Checksum sectors
///
diff --git a/Aaru.Images/AppleNIB/Constants.cs b/Aaru.Images/AppleNIB/Constants.cs
index c30053acb..00fbccf71 100644
--- a/Aaru.Images/AppleNIB/Constants.cs
+++ b/Aaru.Images/AppleNIB/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class AppleNib
diff --git a/Aaru.Images/AppleNIB/Identify.cs b/Aaru.Images/AppleNIB/Identify.cs
index 0246a5713..f4f7b9710 100644
--- a/Aaru.Images/AppleNIB/Identify.cs
+++ b/Aaru.Images/AppleNIB/Identify.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Decoders.Floppy;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleNib
{
diff --git a/Aaru.Images/AppleNIB/Properties.cs b/Aaru.Images/AppleNIB/Properties.cs
index e48c60d7a..59d8d7eb8 100644
--- a/Aaru.Images/AppleNIB/Properties.cs
+++ b/Aaru.Images/AppleNIB/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleNib
{
diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs
index 4df74ea04..77c8d445c 100644
--- a/Aaru.Images/AppleNIB/Read.cs
+++ b/Aaru.Images/AppleNIB/Read.cs
@@ -40,7 +40,7 @@ using Aaru.Console;
using Aaru.Decoders.Floppy;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleNib
{
diff --git a/Aaru.Images/AppleNIB/Unsupported.cs b/Aaru.Images/AppleNIB/Unsupported.cs
index 8178d90ed..4fa32edfc 100644
--- a/Aaru.Images/AppleNIB/Unsupported.cs
+++ b/Aaru.Images/AppleNIB/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class AppleNib
{
diff --git a/Aaru.Images/Apridisk/Apridisk.cs b/Aaru.Images/Apridisk/Apridisk.cs
index d9778debf..e46cde4c0 100644
--- a/Aaru.Images/Apridisk/Apridisk.cs
+++ b/Aaru.Images/Apridisk/Apridisk.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Check writing
///
diff --git a/Aaru.Images/Apridisk/Compression.cs b/Aaru.Images/Apridisk/Compression.cs
index e057c8541..05b4c76bf 100644
--- a/Aaru.Images/Apridisk/Compression.cs
+++ b/Aaru.Images/Apridisk/Compression.cs
@@ -33,7 +33,7 @@
using System;
using System.IO;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Constants.cs b/Aaru.Images/Apridisk/Constants.cs
index cfaca7ee9..0409b0f2f 100644
--- a/Aaru.Images/Apridisk/Constants.cs
+++ b/Aaru.Images/Apridisk/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Enums.cs b/Aaru.Images/Apridisk/Enums.cs
index 0de177040..7a6fdf628 100644
--- a/Aaru.Images/Apridisk/Enums.cs
+++ b/Aaru.Images/Apridisk/Enums.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Helpers.cs b/Aaru.Images/Apridisk/Helpers.cs
index abdfb2735..77af5a689 100644
--- a/Aaru.Images/Apridisk/Helpers.cs
+++ b/Aaru.Images/Apridisk/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Identify.cs b/Aaru.Images/Apridisk/Identify.cs
index ec97a94f8..89685fa66 100644
--- a/Aaru.Images/Apridisk/Identify.cs
+++ b/Aaru.Images/Apridisk/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Properties.cs b/Aaru.Images/Apridisk/Properties.cs
index afbab278d..39f008cee 100644
--- a/Aaru.Images/Apridisk/Properties.cs
+++ b/Aaru.Images/Apridisk/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs
index e9cf392b8..ebbc28659 100644
--- a/Aaru.Images/Apridisk/Read.cs
+++ b/Aaru.Images/Apridisk/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Structs.cs b/Aaru.Images/Apridisk/Structs.cs
index e5883a536..8bea2f26b 100644
--- a/Aaru.Images/Apridisk/Structs.cs
+++ b/Aaru.Images/Apridisk/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Unsupported.cs b/Aaru.Images/Apridisk/Unsupported.cs
index 8a13f3b2b..30abcacb7 100644
--- a/Aaru.Images/Apridisk/Unsupported.cs
+++ b/Aaru.Images/Apridisk/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Apridisk/Write.cs b/Aaru.Images/Apridisk/Write.cs
index c81c885e0..b4711c1c8 100644
--- a/Aaru.Images/Apridisk/Write.cs
+++ b/Aaru.Images/Apridisk/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Apridisk
{
diff --git a/Aaru.Images/Authors.cs b/Aaru.Images/Authors.cs
index da2afed4c..885a1e2e4 100644
--- a/Aaru.Images/Authors.cs
+++ b/Aaru.Images/Authors.cs
@@ -28,7 +28,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "InconsistentNaming")]
static class Authors
diff --git a/Aaru.Images/BLU/BLU.cs b/Aaru.Images/BLU/BLU.cs
index f83d74e71..b98a6600d 100644
--- a/Aaru.Images/BLU/BLU.cs
+++ b/Aaru.Images/BLU/BLU.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading Basic Lisa Utility disk images
diff --git a/Aaru.Images/BLU/Constants.cs b/Aaru.Images/BLU/Constants.cs
index 857ebdfdb..80f124285 100644
--- a/Aaru.Images/BLU/Constants.cs
+++ b/Aaru.Images/BLU/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Identify.cs b/Aaru.Images/BLU/Identify.cs
index b3e6eb336..a5081cc58 100644
--- a/Aaru.Images/BLU/Identify.cs
+++ b/Aaru.Images/BLU/Identify.cs
@@ -36,7 +36,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Properties.cs b/Aaru.Images/BLU/Properties.cs
index bf6e4c46e..550f60982 100644
--- a/Aaru.Images/BLU/Properties.cs
+++ b/Aaru.Images/BLU/Properties.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs
index e8329ec2c..d67b6c02a 100644
--- a/Aaru.Images/BLU/Read.cs
+++ b/Aaru.Images/BLU/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Unsupported.cs b/Aaru.Images/BLU/Unsupported.cs
index 2dbf488dc..849c88e6e 100644
--- a/Aaru.Images/BLU/Unsupported.cs
+++ b/Aaru.Images/BLU/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Verify.cs b/Aaru.Images/BLU/Verify.cs
index 1b1ad2ddf..259f2387a 100644
--- a/Aaru.Images/BLU/Verify.cs
+++ b/Aaru.Images/BLU/Verify.cs
@@ -33,7 +33,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs
index b7aeffb6c..da5c67ff6 100644
--- a/Aaru.Images/BLU/Write.cs
+++ b/Aaru.Images/BLU/Write.cs
@@ -44,7 +44,7 @@ using Aaru.Decoders;
using Aaru.Helpers;
using Version = Aaru.CommonTypes.Interop.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Blu
diff --git a/Aaru.Images/BlindWrite4/BlindWrite4.cs b/Aaru.Images/BlindWrite4/BlindWrite4.cs
index 66e2bd7a1..fd2063cf4 100644
--- a/Aaru.Images/BlindWrite4/BlindWrite4.cs
+++ b/Aaru.Images/BlindWrite4/BlindWrite4.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Too many unknowns, plus a completely unknown footer, to make this writable
///
diff --git a/Aaru.Images/BlindWrite4/Constants.cs b/Aaru.Images/BlindWrite4/Constants.cs
index f29e92492..39e697bdf 100644
--- a/Aaru.Images/BlindWrite4/Constants.cs
+++ b/Aaru.Images/BlindWrite4/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Enums.cs b/Aaru.Images/BlindWrite4/Enums.cs
index 1296ddd36..41a39e541 100644
--- a/Aaru.Images/BlindWrite4/Enums.cs
+++ b/Aaru.Images/BlindWrite4/Enums.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Identify.cs b/Aaru.Images/BlindWrite4/Identify.cs
index 300a60155..ebcc2f1f1 100644
--- a/Aaru.Images/BlindWrite4/Identify.cs
+++ b/Aaru.Images/BlindWrite4/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Properties.cs b/Aaru.Images/BlindWrite4/Properties.cs
index 72258be15..8cbfa1864 100644
--- a/Aaru.Images/BlindWrite4/Properties.cs
+++ b/Aaru.Images/BlindWrite4/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs
index 73fb0129a..37197fc74 100644
--- a/Aaru.Images/BlindWrite4/Read.cs
+++ b/Aaru.Images/BlindWrite4/Read.cs
@@ -45,7 +45,7 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Structs.cs b/Aaru.Images/BlindWrite4/Structs.cs
index 319a8cb6c..1afa98dd5 100644
--- a/Aaru.Images/BlindWrite4/Structs.cs
+++ b/Aaru.Images/BlindWrite4/Structs.cs
@@ -33,7 +33,7 @@
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite4/Verify.cs b/Aaru.Images/BlindWrite4/Verify.cs
index 1383fb861..bc5f7b747 100644
--- a/Aaru.Images/BlindWrite4/Verify.cs
+++ b/Aaru.Images/BlindWrite4/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite4
{
diff --git a/Aaru.Images/BlindWrite5/BlindWrite5.cs b/Aaru.Images/BlindWrite5/BlindWrite5.cs
index 08c7b4395..139e505ed 100644
--- a/Aaru.Images/BlindWrite5/BlindWrite5.cs
+++ b/Aaru.Images/BlindWrite5/BlindWrite5.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Too many unknowns to make this writable
///
diff --git a/Aaru.Images/BlindWrite5/Constants.cs b/Aaru.Images/BlindWrite5/Constants.cs
index f90d82d96..cb3a6deed 100644
--- a/Aaru.Images/BlindWrite5/Constants.cs
+++ b/Aaru.Images/BlindWrite5/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Enums.cs b/Aaru.Images/BlindWrite5/Enums.cs
index 4aabd9ef5..e778dea97 100644
--- a/Aaru.Images/BlindWrite5/Enums.cs
+++ b/Aaru.Images/BlindWrite5/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class BlindWrite5
diff --git a/Aaru.Images/BlindWrite5/Helpers.cs b/Aaru.Images/BlindWrite5/Helpers.cs
index fc600b160..b6f9159cf 100644
--- a/Aaru.Images/BlindWrite5/Helpers.cs
+++ b/Aaru.Images/BlindWrite5/Helpers.cs
@@ -33,7 +33,7 @@
using Aaru.CommonTypes;
using Aaru.Decoders.SCSI.MMC;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Identify.cs b/Aaru.Images/BlindWrite5/Identify.cs
index a6c8e81fa..24827e786 100644
--- a/Aaru.Images/BlindWrite5/Identify.cs
+++ b/Aaru.Images/BlindWrite5/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Properties.cs b/Aaru.Images/BlindWrite5/Properties.cs
index a912dd451..4d920e759 100644
--- a/Aaru.Images/BlindWrite5/Properties.cs
+++ b/Aaru.Images/BlindWrite5/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs
index 3f399c5c8..c8de0290f 100644
--- a/Aaru.Images/BlindWrite5/Read.cs
+++ b/Aaru.Images/BlindWrite5/Read.cs
@@ -52,7 +52,7 @@ using DMI = Aaru.Decoders.Xbox.DMI;
using Sector = Aaru.Decoders.CD.Sector;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Structs.cs b/Aaru.Images/BlindWrite5/Structs.cs
index b23aee4d8..171560f15 100644
--- a/Aaru.Images/BlindWrite5/Structs.cs
+++ b/Aaru.Images/BlindWrite5/Structs.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Decoders.SCSI.MMC;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/BlindWrite5/Verify.cs b/Aaru.Images/BlindWrite5/Verify.cs
index fae43ae44..533f117d2 100644
--- a/Aaru.Images/BlindWrite5/Verify.cs
+++ b/Aaru.Images/BlindWrite5/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class BlindWrite5
{
diff --git a/Aaru.Images/ByteAddressable/AtariLynx.cs b/Aaru.Images/ByteAddressable/AtariLynx.cs
index 2b5dad71b..69509823b 100644
--- a/Aaru.Images/ByteAddressable/AtariLynx.cs
+++ b/Aaru.Images/ByteAddressable/AtariLynx.cs
@@ -12,7 +12,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class AtariLynx : IByteAddressableImage
diff --git a/Aaru.Images/ByteAddressable/GameBoy.cs b/Aaru.Images/ByteAddressable/GameBoy.cs
index 8df97fe12..413d8a3b7 100644
--- a/Aaru.Images/ByteAddressable/GameBoy.cs
+++ b/Aaru.Images/ByteAddressable/GameBoy.cs
@@ -12,7 +12,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class GameBoy : IByteAddressableImage
diff --git a/Aaru.Images/ByteAddressable/GameBoyAdvance.cs b/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
index 5467f8177..7c4e36c2e 100644
--- a/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
+++ b/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
@@ -12,7 +12,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class GameBoyAdvance : IByteAddressableImage
diff --git a/Aaru.Images/ByteAddressable/MasterSystem.cs b/Aaru.Images/ByteAddressable/MasterSystem.cs
index 8d874e494..5fee9be84 100644
--- a/Aaru.Images/ByteAddressable/MasterSystem.cs
+++ b/Aaru.Images/ByteAddressable/MasterSystem.cs
@@ -12,7 +12,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class MasterSystem : IByteAddressableImage
diff --git a/Aaru.Images/ByteAddressable/NES.cs b/Aaru.Images/ByteAddressable/NES.cs
index 7fc7fbdb1..32a008747 100644
--- a/Aaru.Images/ByteAddressable/NES.cs
+++ b/Aaru.Images/ByteAddressable/NES.cs
@@ -15,7 +15,7 @@ using Aaru.Database;
using Aaru.Database.Models;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class Nes : IByteAddressableImage
diff --git a/Aaru.Images/ByteAddressable/Nintendo64.cs b/Aaru.Images/ByteAddressable/Nintendo64.cs
index 9c67f96b1..28e4cfeaf 100644
--- a/Aaru.Images/ByteAddressable/Nintendo64.cs
+++ b/Aaru.Images/ByteAddressable/Nintendo64.cs
@@ -44,7 +44,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements support for Nintendo 64 cartridge dumps
diff --git a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
index af5a9ffb2..acef0a928 100644
--- a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
+++ b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
@@ -44,7 +44,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements support for Sega Mega Drive, 32X, Genesis and Pico cartridge dumps
diff --git a/Aaru.Images/ByteAddressable/SuperNintendo.cs b/Aaru.Images/ByteAddressable/SuperNintendo.cs
index 4bd272842..84c23feef 100644
--- a/Aaru.Images/ByteAddressable/SuperNintendo.cs
+++ b/Aaru.Images/ByteAddressable/SuperNintendo.cs
@@ -12,7 +12,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public class SuperNintendo : IByteAddressableImage
diff --git a/Aaru.Images/CDRDAO/CDRDAO.cs b/Aaru.Images/CDRDAO/CDRDAO.cs
index 6a5e7fbc3..7e7b35cff 100644
--- a/Aaru.Images/CDRDAO/CDRDAO.cs
+++ b/Aaru.Images/CDRDAO/CDRDAO.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.CD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Doesn't support compositing from several files
// TODO: Doesn't support silences that are not in files
diff --git a/Aaru.Images/CDRDAO/Constants.cs b/Aaru.Images/CDRDAO/Constants.cs
index 497483186..9e9a01d49 100644
--- a/Aaru.Images/CDRDAO/Constants.cs
+++ b/Aaru.Images/CDRDAO/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Helpers.cs b/Aaru.Images/CDRDAO/Helpers.cs
index 25674d19c..85f3f1ce4 100644
--- a/Aaru.Images/CDRDAO/Helpers.cs
+++ b/Aaru.Images/CDRDAO/Helpers.cs
@@ -33,7 +33,7 @@
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs
index f88c963b4..f0406c6c3 100644
--- a/Aaru.Images/CDRDAO/Identify.cs
+++ b/Aaru.Images/CDRDAO/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs
index cfe037bdd..9e950eafa 100644
--- a/Aaru.Images/CDRDAO/Properties.cs
+++ b/Aaru.Images/CDRDAO/Properties.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs
index 4debb968b..f10ccc5b8 100644
--- a/Aaru.Images/CDRDAO/Read.cs
+++ b/Aaru.Images/CDRDAO/Read.cs
@@ -44,7 +44,7 @@ using Aaru.Console;
using Aaru.Decoders.CD;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Structs.cs b/Aaru.Images/CDRDAO/Structs.cs
index 004f9464b..ee3621390 100644
--- a/Aaru.Images/CDRDAO/Structs.cs
+++ b/Aaru.Images/CDRDAO/Structs.cs
@@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Verify.cs b/Aaru.Images/CDRDAO/Verify.cs
index d55443ea4..72c4244cb 100644
--- a/Aaru.Images/CDRDAO/Verify.cs
+++ b/Aaru.Images/CDRDAO/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRDAO/Write.cs b/Aaru.Images/CDRDAO/Write.cs
index 84453c69c..07fc43e49 100644
--- a/Aaru.Images/CDRDAO/Write.cs
+++ b/Aaru.Images/CDRDAO/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cdrdao
{
diff --git a/Aaru.Images/CDRWin/CDRWin.cs b/Aaru.Images/CDRWin/CDRWin.cs
index 6e49aa8e2..9cf84e1e6 100644
--- a/Aaru.Images/CDRWin/CDRWin.cs
+++ b/Aaru.Images/CDRWin/CDRWin.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.CD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Implement track flags
///
diff --git a/Aaru.Images/CDRWin/Constants.cs b/Aaru.Images/CDRWin/Constants.cs
index 7bd5ddd60..e0aeafb32 100644
--- a/Aaru.Images/CDRWin/Constants.cs
+++ b/Aaru.Images/CDRWin/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Helpers.cs b/Aaru.Images/CDRWin/Helpers.cs
index 521830029..db65bcf0e 100644
--- a/Aaru.Images/CDRWin/Helpers.cs
+++ b/Aaru.Images/CDRWin/Helpers.cs
@@ -34,7 +34,7 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Identify.cs b/Aaru.Images/CDRWin/Identify.cs
index d54e4db61..91615d9a2 100644
--- a/Aaru.Images/CDRWin/Identify.cs
+++ b/Aaru.Images/CDRWin/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs
index d1f05a66e..810673b9f 100644
--- a/Aaru.Images/CDRWin/Properties.cs
+++ b/Aaru.Images/CDRWin/Properties.cs
@@ -40,7 +40,7 @@ using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs
index 52eb6faaa..bced84fa7 100644
--- a/Aaru.Images/CDRWin/Read.cs
+++ b/Aaru.Images/CDRWin/Read.cs
@@ -48,7 +48,7 @@ using Session = Aaru.CommonTypes.Structs.Session;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Structs.cs b/Aaru.Images/CDRWin/Structs.cs
index 2346b3009..c9313127e 100644
--- a/Aaru.Images/CDRWin/Structs.cs
+++ b/Aaru.Images/CDRWin/Structs.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Verify.cs b/Aaru.Images/CDRWin/Verify.cs
index 07587b974..04e118508 100644
--- a/Aaru.Images/CDRWin/Verify.cs
+++ b/Aaru.Images/CDRWin/Verify.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs
index b3618240c..a36abfcde 100644
--- a/Aaru.Images/CDRWin/Write.cs
+++ b/Aaru.Images/CDRWin/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CdrWin
{
diff --git a/Aaru.Images/CHD/CHD.cs b/Aaru.Images/CHD/CHD.cs
index b28c94158..6898a4d5e 100644
--- a/Aaru.Images/CHD/CHD.cs
+++ b/Aaru.Images/CHD/CHD.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.CD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Implement PCMCIA support
///
diff --git a/Aaru.Images/CHD/Constants.cs b/Aaru.Images/CHD/Constants.cs
index 1740e7f82..740e4f330 100644
--- a/Aaru.Images/CHD/Constants.cs
+++ b/Aaru.Images/CHD/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Chd
diff --git a/Aaru.Images/CHD/Enums.cs b/Aaru.Images/CHD/Enums.cs
index 4d1e53020..b55711cd7 100644
--- a/Aaru.Images/CHD/Enums.cs
+++ b/Aaru.Images/CHD/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Chd
diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs
index 9004dc235..dd0370152 100644
--- a/Aaru.Images/CHD/Helpers.cs
+++ b/Aaru.Images/CHD/Helpers.cs
@@ -41,7 +41,7 @@ using Aaru.Helpers;
using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Chd
{
diff --git a/Aaru.Images/CHD/Identify.cs b/Aaru.Images/CHD/Identify.cs
index ec8dce776..02c0d162b 100644
--- a/Aaru.Images/CHD/Identify.cs
+++ b/Aaru.Images/CHD/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Chd
{
diff --git a/Aaru.Images/CHD/Properties.cs b/Aaru.Images/CHD/Properties.cs
index ad2037dfa..e99857b2c 100644
--- a/Aaru.Images/CHD/Properties.cs
+++ b/Aaru.Images/CHD/Properties.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Chd
{
diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs
index 792afebf8..1f321c518 100644
--- a/Aaru.Images/CHD/Read.cs
+++ b/Aaru.Images/CHD/Read.cs
@@ -48,7 +48,7 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Chd
{
diff --git a/Aaru.Images/CHD/Structs.cs b/Aaru.Images/CHD/Structs.cs
index cb064e7fb..02921cc88 100644
--- a/Aaru.Images/CHD/Structs.cs
+++ b/Aaru.Images/CHD/Structs.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
public sealed partial class Chd
diff --git a/Aaru.Images/CHD/Verify.cs b/Aaru.Images/CHD/Verify.cs
index 9271b6d0a..96e00db9e 100644
--- a/Aaru.Images/CHD/Verify.cs
+++ b/Aaru.Images/CHD/Verify.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Chd
{
diff --git a/Aaru.Images/CPCDSK/CPCDSK.cs b/Aaru.Images/CPCDSK/CPCDSK.cs
index e34e07c3e..9a96d13dc 100644
--- a/Aaru.Images/CPCDSK/CPCDSK.cs
+++ b/Aaru.Images/CPCDSK/CPCDSK.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading CPCDSK disk images
diff --git a/Aaru.Images/CPCDSK/Constants.cs b/Aaru.Images/CPCDSK/Constants.cs
index b5aa00943..07890566b 100644
--- a/Aaru.Images/CPCDSK/Constants.cs
+++ b/Aaru.Images/CPCDSK/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Helpers.cs b/Aaru.Images/CPCDSK/Helpers.cs
index 9250b8ced..0aa87843e 100644
--- a/Aaru.Images/CPCDSK/Helpers.cs
+++ b/Aaru.Images/CPCDSK/Helpers.cs
@@ -32,7 +32,7 @@
using Aaru.Decoders.Floppy;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs
index 6b5111762..2f573cfff 100644
--- a/Aaru.Images/CPCDSK/Identify.cs
+++ b/Aaru.Images/CPCDSK/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Properties.cs b/Aaru.Images/CPCDSK/Properties.cs
index b542c84ef..19832a705 100644
--- a/Aaru.Images/CPCDSK/Properties.cs
+++ b/Aaru.Images/CPCDSK/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs
index ddaee9372..f92b7d995 100644
--- a/Aaru.Images/CPCDSK/Read.cs
+++ b/Aaru.Images/CPCDSK/Read.cs
@@ -43,7 +43,7 @@ using Aaru.Console;
using Aaru.Decoders.Floppy;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Structs.cs b/Aaru.Images/CPCDSK/Structs.cs
index bc9f3a1cc..7cecdbfd7 100644
--- a/Aaru.Images/CPCDSK/Structs.cs
+++ b/Aaru.Images/CPCDSK/Structs.cs
@@ -33,7 +33,7 @@
using System.Runtime.InteropServices;
using Aaru.Decoders.Floppy;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CPCDSK/Unsupported.cs b/Aaru.Images/CPCDSK/Unsupported.cs
index bb18ef564..401dfe549 100644
--- a/Aaru.Images/CPCDSK/Unsupported.cs
+++ b/Aaru.Images/CPCDSK/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Cpcdsk
{
diff --git a/Aaru.Images/CisCopy/CisCopy.cs b/Aaru.Images/CisCopy/CisCopy.cs
index 11e3ba537..f5abd29b8 100644
--- a/Aaru.Images/CisCopy/CisCopy.cs
+++ b/Aaru.Images/CisCopy/CisCopy.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
/* This is a very simple format created by a German application called CisCopy, aka CCOPY.EXE, with extension .DCF.
* First byte indicates the floppy type, limited to standard formats.
diff --git a/Aaru.Images/CisCopy/Enums.cs b/Aaru.Images/CisCopy/Enums.cs
index 88f55b661..2a66b9f15 100644
--- a/Aaru.Images/CisCopy/Enums.cs
+++ b/Aaru.Images/CisCopy/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CisCopy/Identify.cs b/Aaru.Images/CisCopy/Identify.cs
index dc02b028c..79df6dcec 100644
--- a/Aaru.Images/CisCopy/Identify.cs
+++ b/Aaru.Images/CisCopy/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CisCopy/Properties.cs b/Aaru.Images/CisCopy/Properties.cs
index 7629bd33a..08821205c 100644
--- a/Aaru.Images/CisCopy/Properties.cs
+++ b/Aaru.Images/CisCopy/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs
index e7215ee44..a26a1bd3d 100644
--- a/Aaru.Images/CisCopy/Read.cs
+++ b/Aaru.Images/CisCopy/Read.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CisCopy/Unsupported.cs b/Aaru.Images/CisCopy/Unsupported.cs
index 394a4ea76..bb1d5e865 100644
--- a/Aaru.Images/CisCopy/Unsupported.cs
+++ b/Aaru.Images/CisCopy/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CisCopy/Write.cs b/Aaru.Images/CisCopy/Write.cs
index 01c49c7c1..e51ec6cdf 100644
--- a/Aaru.Images/CisCopy/Write.cs
+++ b/Aaru.Images/CisCopy/Write.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CisCopy
{
diff --git a/Aaru.Images/CloneCD/CloneCD.cs b/Aaru.Images/CloneCD/CloneCD.cs
index 1708dabb9..c0cf70d90 100644
--- a/Aaru.Images/CloneCD/CloneCD.cs
+++ b/Aaru.Images/CloneCD/CloneCD.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: CloneCD stores subchannel deinterleaved
///
diff --git a/Aaru.Images/CloneCD/Constants.cs b/Aaru.Images/CloneCD/Constants.cs
index 1910fd4f2..08ab416bc 100644
--- a/Aaru.Images/CloneCD/Constants.cs
+++ b/Aaru.Images/CloneCD/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Helpers.cs b/Aaru.Images/CloneCD/Helpers.cs
index fb53f2464..ae560a00d 100644
--- a/Aaru.Images/CloneCD/Helpers.cs
+++ b/Aaru.Images/CloneCD/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Identify.cs b/Aaru.Images/CloneCD/Identify.cs
index ef55dad82..16fa4ecfe 100644
--- a/Aaru.Images/CloneCD/Identify.cs
+++ b/Aaru.Images/CloneCD/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs
index 195519e3e..d4c975f27 100644
--- a/Aaru.Images/CloneCD/Properties.cs
+++ b/Aaru.Images/CloneCD/Properties.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs
index da459247d..c987e9d97 100644
--- a/Aaru.Images/CloneCD/Read.cs
+++ b/Aaru.Images/CloneCD/Read.cs
@@ -44,7 +44,7 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Verify.cs b/Aaru.Images/CloneCD/Verify.cs
index 32be19002..107f77b30 100644
--- a/Aaru.Images/CloneCD/Verify.cs
+++ b/Aaru.Images/CloneCD/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs
index fcb3cee88..0281430a8 100644
--- a/Aaru.Images/CloneCD/Write.cs
+++ b/Aaru.Images/CloneCD/Write.cs
@@ -44,7 +44,7 @@ using Aaru.Helpers;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CloneCd
{
diff --git a/Aaru.Images/CopyQM/Constants.cs b/Aaru.Images/CopyQM/Constants.cs
index c38ef5c0c..b7cf88172 100644
--- a/Aaru.Images/CopyQM/Constants.cs
+++ b/Aaru.Images/CopyQM/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class CopyQm
diff --git a/Aaru.Images/CopyQM/CopyQM.cs b/Aaru.Images/CopyQM/CopyQM.cs
index e3a32e8ab..11d8e72d3 100644
--- a/Aaru.Images/CopyQM/CopyQM.cs
+++ b/Aaru.Images/CopyQM/CopyQM.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading CopyQM disk images
diff --git a/Aaru.Images/CopyQM/Identify.cs b/Aaru.Images/CopyQM/Identify.cs
index d98d6e99c..fd1e1288c 100644
--- a/Aaru.Images/CopyQM/Identify.cs
+++ b/Aaru.Images/CopyQM/Identify.cs
@@ -35,7 +35,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyQm
{
diff --git a/Aaru.Images/CopyQM/Properties.cs b/Aaru.Images/CopyQM/Properties.cs
index 7bc68b4e2..a00f16293 100644
--- a/Aaru.Images/CopyQM/Properties.cs
+++ b/Aaru.Images/CopyQM/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyQm
{
diff --git a/Aaru.Images/CopyQM/Read.cs b/Aaru.Images/CopyQM/Read.cs
index 01409fcac..87d0c0c7d 100644
--- a/Aaru.Images/CopyQM/Read.cs
+++ b/Aaru.Images/CopyQM/Read.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyQm
{
diff --git a/Aaru.Images/CopyQM/Structs.cs b/Aaru.Images/CopyQM/Structs.cs
index fc51aafa9..45b6f26cb 100644
--- a/Aaru.Images/CopyQM/Structs.cs
+++ b/Aaru.Images/CopyQM/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyQm
{
diff --git a/Aaru.Images/CopyQM/Unsupported.cs b/Aaru.Images/CopyQM/Unsupported.cs
index 642e2c4a0..282ba83a1 100644
--- a/Aaru.Images/CopyQM/Unsupported.cs
+++ b/Aaru.Images/CopyQM/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyQm
{
diff --git a/Aaru.Images/CopyTape/Constants.cs b/Aaru.Images/CopyTape/Constants.cs
index 73432e0d9..05de4d128 100644
--- a/Aaru.Images/CopyTape/Constants.cs
+++ b/Aaru.Images/CopyTape/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/CopyTape/CopyTape.cs b/Aaru.Images/CopyTape/CopyTape.cs
index 20633ab21..d6ad87e7d 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;
+namespace Aaru.Images;
///
/// Implements reading and writing copytape tape images
diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs
index 94f0e5533..4afebfba8 100644
--- a/Aaru.Images/CopyTape/Identify.cs
+++ b/Aaru.Images/CopyTape/Identify.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/CopyTape/Properties.cs b/Aaru.Images/CopyTape/Properties.cs
index f8f0230ba..c306b0bc7 100644
--- a/Aaru.Images/CopyTape/Properties.cs
+++ b/Aaru.Images/CopyTape/Properties.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Structs;
using TapeFile = Aaru.CommonTypes.Structs.TapeFile;
using TapePartition = Aaru.CommonTypes.Structs.TapePartition;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs
index 12d12f9c7..9c847ab8e 100644
--- a/Aaru.Images/CopyTape/Read.cs
+++ b/Aaru.Images/CopyTape/Read.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/CopyTape/Unsupported.cs b/Aaru.Images/CopyTape/Unsupported.cs
index 17c6ecba7..7070d0750 100644
--- a/Aaru.Images/CopyTape/Unsupported.cs
+++ b/Aaru.Images/CopyTape/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs
index 0a9c5c9aa..5d0708da8 100644
--- a/Aaru.Images/CopyTape/Write.cs
+++ b/Aaru.Images/CopyTape/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Structs;
using TapeFile = Aaru.CommonTypes.Structs.TapeFile;
using TapePartition = Aaru.CommonTypes.Structs.TapePartition;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class CopyTape
{
diff --git a/Aaru.Images/D88/Constants.cs b/Aaru.Images/D88/Constants.cs
index e9beaa518..57850af08 100644
--- a/Aaru.Images/D88/Constants.cs
+++ b/Aaru.Images/D88/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class D88
diff --git a/Aaru.Images/D88/D88.cs b/Aaru.Images/D88/D88.cs
index d960b8dca..6eeedcbb1 100644
--- a/Aaru.Images/D88/D88.cs
+++ b/Aaru.Images/D88/D88.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Information from Quasi88's FORMAT.TXT file
// Japanese comments copied from there
diff --git a/Aaru.Images/D88/Enums.cs b/Aaru.Images/D88/Enums.cs
index 67aab70ce..e3f21c66e 100644
--- a/Aaru.Images/D88/Enums.cs
+++ b/Aaru.Images/D88/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
[SuppressMessage("ReSharper", "UnusedType.Local")]
diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs
index 162d70aef..dd2a53b84 100644
--- a/Aaru.Images/D88/Identify.cs
+++ b/Aaru.Images/D88/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class D88
{
diff --git a/Aaru.Images/D88/Properties.cs b/Aaru.Images/D88/Properties.cs
index 1cbde6c74..429b1eb21 100644
--- a/Aaru.Images/D88/Properties.cs
+++ b/Aaru.Images/D88/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class D88
{
diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs
index a767e4c80..20b1040ec 100644
--- a/Aaru.Images/D88/Read.cs
+++ b/Aaru.Images/D88/Read.cs
@@ -41,7 +41,7 @@ using Aaru.Console;
using Aaru.Decoders.Floppy;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class D88
{
diff --git a/Aaru.Images/D88/Structs.cs b/Aaru.Images/D88/Structs.cs
index 84e382f5c..84f4a3946 100644
--- a/Aaru.Images/D88/Structs.cs
+++ b/Aaru.Images/D88/Structs.cs
@@ -33,7 +33,7 @@
using System.Runtime.InteropServices;
using Aaru.Decoders.Floppy;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class D88
{
diff --git a/Aaru.Images/D88/Unsupported.cs b/Aaru.Images/D88/Unsupported.cs
index 809fd38bb..7c383ed0c 100644
--- a/Aaru.Images/D88/Unsupported.cs
+++ b/Aaru.Images/D88/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class D88
{
diff --git a/Aaru.Images/DART/Constants.cs b/Aaru.Images/DART/Constants.cs
index f12852fec..1e6ef6ee2 100644
--- a/Aaru.Images/DART/Constants.cs
+++ b/Aaru.Images/DART/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Dart
diff --git a/Aaru.Images/DART/DART.cs b/Aaru.Images/DART/DART.cs
index 1b1dcf57e..84ff80457 100644
--- a/Aaru.Images/DART/DART.cs
+++ b/Aaru.Images/DART/DART.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading Apple DART disk images
diff --git a/Aaru.Images/DART/Identify.cs b/Aaru.Images/DART/Identify.cs
index cc9d58433..a21870b8d 100644
--- a/Aaru.Images/DART/Identify.cs
+++ b/Aaru.Images/DART/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Dart
{
diff --git a/Aaru.Images/DART/Properties.cs b/Aaru.Images/DART/Properties.cs
index ddaec28ed..380a3268c 100644
--- a/Aaru.Images/DART/Properties.cs
+++ b/Aaru.Images/DART/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Dart
{
diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs
index 1940d2abe..ee8c42138 100644
--- a/Aaru.Images/DART/Read.cs
+++ b/Aaru.Images/DART/Read.cs
@@ -43,7 +43,7 @@ using Claunia.Encoding;
using Claunia.RsrcFork;
using Version = Resources.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Dart
{
diff --git a/Aaru.Images/DART/Structs.cs b/Aaru.Images/DART/Structs.cs
index 827c35f29..8d5bf52de 100644
--- a/Aaru.Images/DART/Structs.cs
+++ b/Aaru.Images/DART/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Dart
{
diff --git a/Aaru.Images/DART/Unsupported.cs b/Aaru.Images/DART/Unsupported.cs
index ea243d216..1d53b6cd3 100644
--- a/Aaru.Images/DART/Unsupported.cs
+++ b/Aaru.Images/DART/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Dart
{
diff --git a/Aaru.Images/DIM/Constants.cs b/Aaru.Images/DIM/Constants.cs
index b102f1684..5ef163c1c 100644
--- a/Aaru.Images/DIM/Constants.cs
+++ b/Aaru.Images/DIM/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DIM/DIM.cs b/Aaru.Images/DIM/DIM.cs
index d289678bb..19bf328cd 100644
--- a/Aaru.Images/DIM/DIM.cs
+++ b/Aaru.Images/DIM/DIM.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: What are the real supported floppies for this image format?
///
diff --git a/Aaru.Images/DIM/Enums.cs b/Aaru.Images/DIM/Enums.cs
index ab68903a8..24f03e59d 100644
--- a/Aaru.Images/DIM/Enums.cs
+++ b/Aaru.Images/DIM/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DIM/Identify.cs b/Aaru.Images/DIM/Identify.cs
index 8c570ab37..2c5f7ce24 100644
--- a/Aaru.Images/DIM/Identify.cs
+++ b/Aaru.Images/DIM/Identify.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DIM/Properties.cs b/Aaru.Images/DIM/Properties.cs
index 1e467d71a..2bb12e481 100644
--- a/Aaru.Images/DIM/Properties.cs
+++ b/Aaru.Images/DIM/Properties.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs
index e35bc6e0c..0fcbf759a 100644
--- a/Aaru.Images/DIM/Read.cs
+++ b/Aaru.Images/DIM/Read.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DIM/Unsupported.cs b/Aaru.Images/DIM/Unsupported.cs
index 13d12b413..10403b723 100644
--- a/Aaru.Images/DIM/Unsupported.cs
+++ b/Aaru.Images/DIM/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Dim
diff --git a/Aaru.Images/DiscFerret/Constants.cs b/Aaru.Images/DiscFerret/Constants.cs
index 01514e633..b5d444fd7 100644
--- a/Aaru.Images/DiscFerret/Constants.cs
+++ b/Aaru.Images/DiscFerret/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscFerret/DiscFerret.cs b/Aaru.Images/DiscFerret/DiscFerret.cs
index bd78dbe05..aa2bb659e 100644
--- a/Aaru.Images/DiscFerret/DiscFerret.cs
+++ b/Aaru.Images/DiscFerret/DiscFerret.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading DiscFerret flux images
diff --git a/Aaru.Images/DiscFerret/Identify.cs b/Aaru.Images/DiscFerret/Identify.cs
index d45dcafcb..6caa4a9b8 100644
--- a/Aaru.Images/DiscFerret/Identify.cs
+++ b/Aaru.Images/DiscFerret/Identify.cs
@@ -35,7 +35,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscFerret/Properties.cs b/Aaru.Images/DiscFerret/Properties.cs
index fbd583073..64a29d418 100644
--- a/Aaru.Images/DiscFerret/Properties.cs
+++ b/Aaru.Images/DiscFerret/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscFerret/Read.cs b/Aaru.Images/DiscFerret/Read.cs
index 1ac4f6940..71408b41c 100644
--- a/Aaru.Images/DiscFerret/Read.cs
+++ b/Aaru.Images/DiscFerret/Read.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscFerret/Structs.cs b/Aaru.Images/DiscFerret/Structs.cs
index af337662b..34c5439c2 100644
--- a/Aaru.Images/DiscFerret/Structs.cs
+++ b/Aaru.Images/DiscFerret/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscFerret/Verify.cs b/Aaru.Images/DiscFerret/Verify.cs
index da89cc627..766ce64d2 100644
--- a/Aaru.Images/DiscFerret/Verify.cs
+++ b/Aaru.Images/DiscFerret/Verify.cs
@@ -33,7 +33,7 @@
using System;
using System.Collections.Generic;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscFerret
{
diff --git a/Aaru.Images/DiscJuggler/DiscJuggler.cs b/Aaru.Images/DiscJuggler/DiscJuggler.cs
index 52c45750e..c4af5229f 100644
--- a/Aaru.Images/DiscJuggler/DiscJuggler.cs
+++ b/Aaru.Images/DiscJuggler/DiscJuggler.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.CD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Support separate data files? Never seen a DiscJuggler image using them anyways...
// TODO: Too many unknowns to make this writable
diff --git a/Aaru.Images/DiscJuggler/Helpers.cs b/Aaru.Images/DiscJuggler/Helpers.cs
index 752fac957..ac9a4bb95 100644
--- a/Aaru.Images/DiscJuggler/Helpers.cs
+++ b/Aaru.Images/DiscJuggler/Helpers.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscJuggler
{
diff --git a/Aaru.Images/DiscJuggler/Identify.cs b/Aaru.Images/DiscJuggler/Identify.cs
index 830612885..0d2b6ecb7 100644
--- a/Aaru.Images/DiscJuggler/Identify.cs
+++ b/Aaru.Images/DiscJuggler/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscJuggler
{
diff --git a/Aaru.Images/DiscJuggler/Properties.cs b/Aaru.Images/DiscJuggler/Properties.cs
index 083e8b8ca..aa3acaa88 100644
--- a/Aaru.Images/DiscJuggler/Properties.cs
+++ b/Aaru.Images/DiscJuggler/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscJuggler
{
diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs
index 272fb08ba..c3c3cdd1c 100644
--- a/Aaru.Images/DiscJuggler/Read.cs
+++ b/Aaru.Images/DiscJuggler/Read.cs
@@ -44,7 +44,7 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscJuggler
{
diff --git a/Aaru.Images/DiscJuggler/Verify.cs b/Aaru.Images/DiscJuggler/Verify.cs
index c56a61cef..dcea19cc9 100644
--- a/Aaru.Images/DiscJuggler/Verify.cs
+++ b/Aaru.Images/DiscJuggler/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiscJuggler
{
diff --git a/Aaru.Images/DiskCopy42/Constants.cs b/Aaru.Images/DiskCopy42/Constants.cs
index a801905a8..dc8735043 100644
--- a/Aaru.Images/DiskCopy42/Constants.cs
+++ b/Aaru.Images/DiskCopy42/Constants.cs
@@ -32,7 +32,7 @@
// ReSharper disable InconsistentNaming
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/DiskCopy42.cs b/Aaru.Images/DiskCopy42/DiskCopy42.cs
index 55cb44f4c..708d957a3 100644
--- a/Aaru.Images/DiskCopy42/DiskCopy42.cs
+++ b/Aaru.Images/DiskCopy42/DiskCopy42.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Checked using several images and strings inside Apple's DiskImages.framework
///
diff --git a/Aaru.Images/DiskCopy42/Helpers.cs b/Aaru.Images/DiskCopy42/Helpers.cs
index ca04a3703..e16b33abd 100644
--- a/Aaru.Images/DiskCopy42/Helpers.cs
+++ b/Aaru.Images/DiskCopy42/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs
index 4f44b2f35..d763fc245 100644
--- a/Aaru.Images/DiskCopy42/Identify.cs
+++ b/Aaru.Images/DiskCopy42/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.Console;
using Aaru.Helpers;
using Claunia.Encoding;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Properties.cs b/Aaru.Images/DiskCopy42/Properties.cs
index c233140bf..1902dfaa6 100644
--- a/Aaru.Images/DiskCopy42/Properties.cs
+++ b/Aaru.Images/DiskCopy42/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs
index 4c97c957d..e7a3a43fd 100644
--- a/Aaru.Images/DiskCopy42/Read.cs
+++ b/Aaru.Images/DiskCopy42/Read.cs
@@ -42,7 +42,7 @@ using Claunia.Encoding;
using Claunia.RsrcFork;
using Version = Resources.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Structs.cs b/Aaru.Images/DiskCopy42/Structs.cs
index f05f77e6b..e3aada870 100644
--- a/Aaru.Images/DiskCopy42/Structs.cs
+++ b/Aaru.Images/DiskCopy42/Structs.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Unsupported.cs b/Aaru.Images/DiskCopy42/Unsupported.cs
index f677e7f37..b2314f96e 100644
--- a/Aaru.Images/DiskCopy42/Unsupported.cs
+++ b/Aaru.Images/DiskCopy42/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Verify.cs b/Aaru.Images/DiskCopy42/Verify.cs
index 9faf84d07..e6ddc9fb8 100644
--- a/Aaru.Images/DiskCopy42/Verify.cs
+++ b/Aaru.Images/DiskCopy42/Verify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs
index 9dc9caba1..dc454e361 100644
--- a/Aaru.Images/DiskCopy42/Write.cs
+++ b/Aaru.Images/DiskCopy42/Write.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Claunia.Encoding;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskCopy42
{
diff --git a/Aaru.Images/DiskDupe/Constants.cs b/Aaru.Images/DiskDupe/Constants.cs
index ea44b3185..cb6debe2d 100644
--- a/Aaru.Images/DiskDupe/Constants.cs
+++ b/Aaru.Images/DiskDupe/Constants.cs
@@ -31,7 +31,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DiskDupe/DiskDupe.cs b/Aaru.Images/DiskDupe/DiskDupe.cs
index 46456d182..08cc49c88 100644
--- a/Aaru.Images/DiskDupe/DiskDupe.cs
+++ b/Aaru.Images/DiskDupe/DiskDupe.cs
@@ -62,7 +62,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading DiskDupe disk images
diff --git a/Aaru.Images/DiskDupe/Helpers.cs b/Aaru.Images/DiskDupe/Helpers.cs
index 6bd0cf4c6..dd066f541 100644
--- a/Aaru.Images/DiskDupe/Helpers.cs
+++ b/Aaru.Images/DiskDupe/Helpers.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DiskDupe/Identify.cs b/Aaru.Images/DiskDupe/Identify.cs
index 6609e14e4..5ed842559 100644
--- a/Aaru.Images/DiskDupe/Identify.cs
+++ b/Aaru.Images/DiskDupe/Identify.cs
@@ -34,7 +34,7 @@
using System.IO;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DiskDupe/Properties.cs b/Aaru.Images/DiskDupe/Properties.cs
index b9f81a9e3..442f19d14 100644
--- a/Aaru.Images/DiskDupe/Properties.cs
+++ b/Aaru.Images/DiskDupe/Properties.cs
@@ -36,7 +36,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DiskDupe/Read.cs b/Aaru.Images/DiskDupe/Read.cs
index d02714b13..8bf725b31 100644
--- a/Aaru.Images/DiskDupe/Read.cs
+++ b/Aaru.Images/DiskDupe/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DiskDupe/Structs.cs b/Aaru.Images/DiskDupe/Structs.cs
index dbbdca835..73a4d8b27 100644
--- a/Aaru.Images/DiskDupe/Structs.cs
+++ b/Aaru.Images/DiskDupe/Structs.cs
@@ -34,7 +34,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
public sealed partial class DiskDupe
diff --git a/Aaru.Images/DiskDupe/Unsupported.cs b/Aaru.Images/DiskDupe/Unsupported.cs
index cd41df25b..b82e2d5e8 100644
--- a/Aaru.Images/DiskDupe/Unsupported.cs
+++ b/Aaru.Images/DiskDupe/Unsupported.cs
@@ -33,7 +33,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DiskDupe
{
diff --git a/Aaru.Images/DriDiskCopy/Constants.cs b/Aaru.Images/DriDiskCopy/Constants.cs
index b7399f133..b03494cd9 100644
--- a/Aaru.Images/DriDiskCopy/Constants.cs
+++ b/Aaru.Images/DriDiskCopy/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
index 69cd189b5..8cebbdd51 100644
--- a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
+++ b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing DR-DOS' DISKCOPY disk images
diff --git a/Aaru.Images/DriDiskCopy/Enums.cs b/Aaru.Images/DriDiskCopy/Enums.cs
index 86c56cd5e..5555a1d99 100644
--- a/Aaru.Images/DriDiskCopy/Enums.cs
+++ b/Aaru.Images/DriDiskCopy/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class DriDiskCopy
diff --git a/Aaru.Images/DriDiskCopy/Identify.cs b/Aaru.Images/DriDiskCopy/Identify.cs
index a1a5820ad..7ba59252e 100644
--- a/Aaru.Images/DriDiskCopy/Identify.cs
+++ b/Aaru.Images/DriDiskCopy/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/Properties.cs b/Aaru.Images/DriDiskCopy/Properties.cs
index 9bd8fe3eb..cbc179030 100644
--- a/Aaru.Images/DriDiskCopy/Properties.cs
+++ b/Aaru.Images/DriDiskCopy/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs
index 8445a9b0a..c917f7b69 100644
--- a/Aaru.Images/DriDiskCopy/Read.cs
+++ b/Aaru.Images/DriDiskCopy/Read.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/Structs.cs b/Aaru.Images/DriDiskCopy/Structs.cs
index 0101dc6f4..7233c91f8 100644
--- a/Aaru.Images/DriDiskCopy/Structs.cs
+++ b/Aaru.Images/DriDiskCopy/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/Unsupported.cs b/Aaru.Images/DriDiskCopy/Unsupported.cs
index 6cc02271c..45a8341ee 100644
--- a/Aaru.Images/DriDiskCopy/Unsupported.cs
+++ b/Aaru.Images/DriDiskCopy/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/DriDiskCopy/Write.cs b/Aaru.Images/DriDiskCopy/Write.cs
index c8c6e8310..46f6f3d16 100644
--- a/Aaru.Images/DriDiskCopy/Write.cs
+++ b/Aaru.Images/DriDiskCopy/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class DriDiskCopy
{
diff --git a/Aaru.Images/GDI/Constants.cs b/Aaru.Images/GDI/Constants.cs
index e3a266ffe..1694e9194 100644
--- a/Aaru.Images/GDI/Constants.cs
+++ b/Aaru.Images/GDI/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/GDI.cs b/Aaru.Images/GDI/GDI.cs
index b62bd7323..f692538de 100644
--- a/Aaru.Images/GDI/GDI.cs
+++ b/Aaru.Images/GDI/GDI.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.CD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: There seems no be no clear definition on how to treat pregaps that are not included in the file, so this is just appending it to start of track
// TODO: This format doesn't support to specify pregaps that are included in the file (like Redump ones)
diff --git a/Aaru.Images/GDI/Identify.cs b/Aaru.Images/GDI/Identify.cs
index 8ce3c148e..1abf14e74 100644
--- a/Aaru.Images/GDI/Identify.cs
+++ b/Aaru.Images/GDI/Identify.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/Properties.cs b/Aaru.Images/GDI/Properties.cs
index d56dc2a71..5632c6931 100644
--- a/Aaru.Images/GDI/Properties.cs
+++ b/Aaru.Images/GDI/Properties.cs
@@ -40,7 +40,7 @@ using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs
index 4480133d8..e957adb6f 100644
--- a/Aaru.Images/GDI/Read.cs
+++ b/Aaru.Images/GDI/Read.cs
@@ -44,7 +44,7 @@ using Aaru.Console;
using Aaru.Decoders.CD;
using Session = Aaru.CommonTypes.Structs.Session;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/Structs.cs b/Aaru.Images/GDI/Structs.cs
index 3f13713a9..c7c2c6731 100644
--- a/Aaru.Images/GDI/Structs.cs
+++ b/Aaru.Images/GDI/Structs.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/Unsupported.cs b/Aaru.Images/GDI/Unsupported.cs
index c4d1e7276..fc4134676 100644
--- a/Aaru.Images/GDI/Unsupported.cs
+++ b/Aaru.Images/GDI/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/GDI/Verify.cs b/Aaru.Images/GDI/Verify.cs
index 53c4b4fba..b55d69e2b 100644
--- a/Aaru.Images/GDI/Verify.cs
+++ b/Aaru.Images/GDI/Verify.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Gdi
diff --git a/Aaru.Images/HDCopy/HDCopy.cs b/Aaru.Images/HDCopy/HDCopy.cs
index d6a4df01e..179455055 100644
--- a/Aaru.Images/HDCopy/HDCopy.cs
+++ b/Aaru.Images/HDCopy/HDCopy.cs
@@ -70,7 +70,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading HD-Copy disk images
diff --git a/Aaru.Images/HDCopy/Helpers.cs b/Aaru.Images/HDCopy/Helpers.cs
index a3bcf55a5..697d03133 100644
--- a/Aaru.Images/HDCopy/Helpers.cs
+++ b/Aaru.Images/HDCopy/Helpers.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class HdCopy
{
diff --git a/Aaru.Images/HDCopy/Identify.cs b/Aaru.Images/HDCopy/Identify.cs
index 35e7b7762..f5814c89d 100644
--- a/Aaru.Images/HDCopy/Identify.cs
+++ b/Aaru.Images/HDCopy/Identify.cs
@@ -34,7 +34,7 @@
using System.IO;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class HdCopy
{
diff --git a/Aaru.Images/HDCopy/Properties.cs b/Aaru.Images/HDCopy/Properties.cs
index 60fdbcbdb..1c7557c8c 100644
--- a/Aaru.Images/HDCopy/Properties.cs
+++ b/Aaru.Images/HDCopy/Properties.cs
@@ -36,7 +36,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class HdCopy
{
diff --git a/Aaru.Images/HDCopy/Read.cs b/Aaru.Images/HDCopy/Read.cs
index 8f4a2e857..12bb463c8 100644
--- a/Aaru.Images/HDCopy/Read.cs
+++ b/Aaru.Images/HDCopy/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class HdCopy
{
diff --git a/Aaru.Images/HDCopy/Structs.cs b/Aaru.Images/HDCopy/Structs.cs
index 15e9c76d9..c1c48306d 100644
--- a/Aaru.Images/HDCopy/Structs.cs
+++ b/Aaru.Images/HDCopy/Structs.cs
@@ -34,7 +34,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
public sealed partial class HdCopy
diff --git a/Aaru.Images/HDCopy/Unsupported.cs b/Aaru.Images/HDCopy/Unsupported.cs
index a818d46c8..1a43a4dda 100644
--- a/Aaru.Images/HDCopy/Unsupported.cs
+++ b/Aaru.Images/HDCopy/Unsupported.cs
@@ -33,7 +33,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class HdCopy
{
diff --git a/Aaru.Images/IMD/Constants.cs b/Aaru.Images/IMD/Constants.cs
index bc78a768d..965070687 100644
--- a/Aaru.Images/IMD/Constants.cs
+++ b/Aaru.Images/IMD/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Imd
diff --git a/Aaru.Images/IMD/Enums.cs b/Aaru.Images/IMD/Enums.cs
index 92e836b8b..156bcd91d 100644
--- a/Aaru.Images/IMD/Enums.cs
+++ b/Aaru.Images/IMD/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Imd
{
diff --git a/Aaru.Images/IMD/IMD.cs b/Aaru.Images/IMD/IMD.cs
index 07a5b9b81..6be4bf4ab 100644
--- a/Aaru.Images/IMD/IMD.cs
+++ b/Aaru.Images/IMD/IMD.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading IMageDisk disk images
diff --git a/Aaru.Images/IMD/Identify.cs b/Aaru.Images/IMD/Identify.cs
index 99cbf7a3f..2332e977f 100644
--- a/Aaru.Images/IMD/Identify.cs
+++ b/Aaru.Images/IMD/Identify.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Imd
{
diff --git a/Aaru.Images/IMD/Properties.cs b/Aaru.Images/IMD/Properties.cs
index 702f8aec4..e6fad94be 100644
--- a/Aaru.Images/IMD/Properties.cs
+++ b/Aaru.Images/IMD/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Imd
{
diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs
index 1f668006c..db4581e8c 100644
--- a/Aaru.Images/IMD/Read.cs
+++ b/Aaru.Images/IMD/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Imd
{
diff --git a/Aaru.Images/IMD/Unsupported.cs b/Aaru.Images/IMD/Unsupported.cs
index 2da314942..13230d832 100644
--- a/Aaru.Images/IMD/Unsupported.cs
+++ b/Aaru.Images/IMD/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Imd
{
diff --git a/Aaru.Images/KryoFlux/Constants.cs b/Aaru.Images/KryoFlux/Constants.cs
index bfb521161..94e0ef15c 100644
--- a/Aaru.Images/KryoFlux/Constants.cs
+++ b/Aaru.Images/KryoFlux/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class KryoFlux
diff --git a/Aaru.Images/KryoFlux/Enums.cs b/Aaru.Images/KryoFlux/Enums.cs
index 72bfad03a..89d7737de 100644
--- a/Aaru.Images/KryoFlux/Enums.cs
+++ b/Aaru.Images/KryoFlux/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class KryoFlux
diff --git a/Aaru.Images/KryoFlux/Identify.cs b/Aaru.Images/KryoFlux/Identify.cs
index c1df77e21..9039cd6be 100644
--- a/Aaru.Images/KryoFlux/Identify.cs
+++ b/Aaru.Images/KryoFlux/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class KryoFlux
{
diff --git a/Aaru.Images/KryoFlux/KryoFlux.cs b/Aaru.Images/KryoFlux/KryoFlux.cs
index 9fce87808..e4028eef1 100644
--- a/Aaru.Images/KryoFlux/KryoFlux.cs
+++ b/Aaru.Images/KryoFlux/KryoFlux.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading KryoFlux flux images
diff --git a/Aaru.Images/KryoFlux/Properties.cs b/Aaru.Images/KryoFlux/Properties.cs
index 8de7dc333..f1c9f3819 100644
--- a/Aaru.Images/KryoFlux/Properties.cs
+++ b/Aaru.Images/KryoFlux/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class KryoFlux
{
diff --git a/Aaru.Images/KryoFlux/Read.cs b/Aaru.Images/KryoFlux/Read.cs
index 7da128015..4127b2590 100644
--- a/Aaru.Images/KryoFlux/Read.cs
+++ b/Aaru.Images/KryoFlux/Read.cs
@@ -41,7 +41,7 @@ using Aaru.Console;
using Aaru.Filters;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class KryoFlux
{
diff --git a/Aaru.Images/KryoFlux/Structs.cs b/Aaru.Images/KryoFlux/Structs.cs
index 404139e80..8854b72a1 100644
--- a/Aaru.Images/KryoFlux/Structs.cs
+++ b/Aaru.Images/KryoFlux/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class KryoFlux
{
diff --git a/Aaru.Images/KryoFlux/Verify.cs b/Aaru.Images/KryoFlux/Verify.cs
index ea8afece6..bc38656ab 100644
--- a/Aaru.Images/KryoFlux/Verify.cs
+++ b/Aaru.Images/KryoFlux/Verify.cs
@@ -33,7 +33,7 @@
using System;
using System.Collections.Generic;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class KryoFlux
{
diff --git a/Aaru.Images/Localization/Localization.Designer.cs b/Aaru.Images/Localization/Localization.Designer.cs
index 42eebc1f3..74a9b5e87 100644
--- a/Aaru.Images/Localization/Localization.Designer.cs
+++ b/Aaru.Images/Localization/Localization.Designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace Aaru.DiscImages {
+namespace Aaru.Images {
using System;
@@ -38,7 +38,7 @@ namespace Aaru.DiscImages {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Aaru.DiscImages.Localization.Localization", typeof(Localization).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Aaru.Images.Localization.Localization", typeof(Localization).Assembly);
resourceMan = temp;
}
return resourceMan;
diff --git a/Aaru.Images/MaxiDisk/Enums.cs b/Aaru.Images/MaxiDisk/Enums.cs
index 354bb9c56..4424bda37 100644
--- a/Aaru.Images/MaxiDisk/Enums.cs
+++ b/Aaru.Images/MaxiDisk/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class MaxiDisk
diff --git a/Aaru.Images/MaxiDisk/Identify.cs b/Aaru.Images/MaxiDisk/Identify.cs
index 5b400f76d..115284e0a 100644
--- a/Aaru.Images/MaxiDisk/Identify.cs
+++ b/Aaru.Images/MaxiDisk/Identify.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/MaxiDisk/MaxiDisk.cs b/Aaru.Images/MaxiDisk/MaxiDisk.cs
index f6a694611..0c6649504 100644
--- a/Aaru.Images/MaxiDisk/MaxiDisk.cs
+++ b/Aaru.Images/MaxiDisk/MaxiDisk.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing MaxiDisk disk images
diff --git a/Aaru.Images/MaxiDisk/Properties.cs b/Aaru.Images/MaxiDisk/Properties.cs
index d97c72e75..d5a1e3c3a 100644
--- a/Aaru.Images/MaxiDisk/Properties.cs
+++ b/Aaru.Images/MaxiDisk/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/MaxiDisk/Read.cs b/Aaru.Images/MaxiDisk/Read.cs
index 12d69c4c1..25e85ef97 100644
--- a/Aaru.Images/MaxiDisk/Read.cs
+++ b/Aaru.Images/MaxiDisk/Read.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/MaxiDisk/Structs.cs b/Aaru.Images/MaxiDisk/Structs.cs
index ce9bd08a7..4b9f06c6a 100644
--- a/Aaru.Images/MaxiDisk/Structs.cs
+++ b/Aaru.Images/MaxiDisk/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/MaxiDisk/Unsupported.cs b/Aaru.Images/MaxiDisk/Unsupported.cs
index c7a2db2eb..b5e92bb5b 100644
--- a/Aaru.Images/MaxiDisk/Unsupported.cs
+++ b/Aaru.Images/MaxiDisk/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/MaxiDisk/Write.cs b/Aaru.Images/MaxiDisk/Write.cs
index 6cb252bb8..355ca003c 100644
--- a/Aaru.Images/MaxiDisk/Write.cs
+++ b/Aaru.Images/MaxiDisk/Write.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class MaxiDisk
{
diff --git a/Aaru.Images/NDIF/Constants.cs b/Aaru.Images/NDIF/Constants.cs
index a5bd01e50..6df1702f2 100644
--- a/Aaru.Images/NDIF/Constants.cs
+++ b/Aaru.Images/NDIF/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Ndif
diff --git a/Aaru.Images/NDIF/Identify.cs b/Aaru.Images/NDIF/Identify.cs
index 8f725ad6d..b2acbd70b 100644
--- a/Aaru.Images/NDIF/Identify.cs
+++ b/Aaru.Images/NDIF/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
using Claunia.RsrcFork;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Ndif
{
diff --git a/Aaru.Images/NDIF/NDIF.cs b/Aaru.Images/NDIF/NDIF.cs
index 031594ab0..ec61c2267 100644
--- a/Aaru.Images/NDIF/NDIF.cs
+++ b/Aaru.Images/NDIF/NDIF.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Detect OS X encrypted images
// TODO: Check checksum
diff --git a/Aaru.Images/NDIF/Properties.cs b/Aaru.Images/NDIF/Properties.cs
index c4dfeac04..197502de7 100644
--- a/Aaru.Images/NDIF/Properties.cs
+++ b/Aaru.Images/NDIF/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Ndif
{
diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs
index 00dba53df..e30047b0c 100644
--- a/Aaru.Images/NDIF/Read.cs
+++ b/Aaru.Images/NDIF/Read.cs
@@ -44,7 +44,7 @@ using Claunia.Encoding;
using Claunia.RsrcFork;
using Version = Resources.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Ndif
{
diff --git a/Aaru.Images/NDIF/Structs.cs b/Aaru.Images/NDIF/Structs.cs
index de8d114fb..7d3c920b8 100644
--- a/Aaru.Images/NDIF/Structs.cs
+++ b/Aaru.Images/NDIF/Structs.cs
@@ -34,7 +34,7 @@ using System;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
public sealed partial class Ndif
diff --git a/Aaru.Images/NDIF/Unsupported.cs b/Aaru.Images/NDIF/Unsupported.cs
index 0adaf12c3..a2101670b 100644
--- a/Aaru.Images/NDIF/Unsupported.cs
+++ b/Aaru.Images/NDIF/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Ndif
{
diff --git a/Aaru.Images/NHDr0/Constants.cs b/Aaru.Images/NHDr0/Constants.cs
index f230af63f..833204fab 100644
--- a/Aaru.Images/NHDr0/Constants.cs
+++ b/Aaru.Images/NHDr0/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs
index eb00abb0b..da9a5bb90 100644
--- a/Aaru.Images/NHDr0/Identify.cs
+++ b/Aaru.Images/NHDr0/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/NHDr0.cs b/Aaru.Images/NHDr0/NHDr0.cs
index 37aa78b75..9313f0cf8 100644
--- a/Aaru.Images/NHDr0/NHDr0.cs
+++ b/Aaru.Images/NHDr0/NHDr0.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Info from http://www.geocities.jp/t98next/nhdr0.txt
///
diff --git a/Aaru.Images/NHDr0/Properties.cs b/Aaru.Images/NHDr0/Properties.cs
index 7c140fb2c..f533edc1d 100644
--- a/Aaru.Images/NHDr0/Properties.cs
+++ b/Aaru.Images/NHDr0/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/Read.cs b/Aaru.Images/NHDr0/Read.cs
index 2c1ccf29e..bd0048c46 100644
--- a/Aaru.Images/NHDr0/Read.cs
+++ b/Aaru.Images/NHDr0/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/Structs.cs b/Aaru.Images/NHDr0/Structs.cs
index 0f1684124..d9acb38a5 100644
--- a/Aaru.Images/NHDr0/Structs.cs
+++ b/Aaru.Images/NHDr0/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/Unsupported.cs b/Aaru.Images/NHDr0/Unsupported.cs
index 33a03a035..1c2d3d842 100644
--- a/Aaru.Images/NHDr0/Unsupported.cs
+++ b/Aaru.Images/NHDr0/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/NHDr0/Write.cs b/Aaru.Images/NHDr0/Write.cs
index ba1e78b7b..e20f11037 100644
--- a/Aaru.Images/NHDr0/Write.cs
+++ b/Aaru.Images/NHDr0/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nhdr0
{
diff --git a/Aaru.Images/Nero/Constants.cs b/Aaru.Images/Nero/Constants.cs
index dbff4a773..e0cf4c77d 100644
--- a/Aaru.Images/Nero/Constants.cs
+++ b/Aaru.Images/Nero/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Nero/Enums.cs b/Aaru.Images/Nero/Enums.cs
index 123cc22f1..40ce8f611 100644
--- a/Aaru.Images/Nero/Enums.cs
+++ b/Aaru.Images/Nero/Enums.cs
@@ -33,7 +33,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Nero
diff --git a/Aaru.Images/Nero/Helpers.cs b/Aaru.Images/Nero/Helpers.cs
index 98e715ded..be95a52db 100644
--- a/Aaru.Images/Nero/Helpers.cs
+++ b/Aaru.Images/Nero/Helpers.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs
index cd3a0e5f8..e66c69494 100644
--- a/Aaru.Images/Nero/Identify.cs
+++ b/Aaru.Images/Nero/Identify.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Nero/Nero.cs b/Aaru.Images/Nero/Nero.cs
index 479df5ddb..19d02a5b9 100644
--- a/Aaru.Images/Nero/Nero.cs
+++ b/Aaru.Images/Nero/Nero.cs
@@ -42,7 +42,7 @@ using Aaru.Decoders.CD;
#pragma warning disable 414
#pragma warning disable 169
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading Nero Burning ROM disc images
diff --git a/Aaru.Images/Nero/Properties.cs b/Aaru.Images/Nero/Properties.cs
index a0a605983..dea3863cc 100644
--- a/Aaru.Images/Nero/Properties.cs
+++ b/Aaru.Images/Nero/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Structs;
using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs
index 0d6a6cfb8..4ff0110ae 100644
--- a/Aaru.Images/Nero/Read.cs
+++ b/Aaru.Images/Nero/Read.cs
@@ -43,7 +43,7 @@ using Aaru.Console;
using Aaru.Decoders.CD;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Nero/Structs.cs b/Aaru.Images/Nero/Structs.cs
index 802c0051b..0a2b3a66e 100644
--- a/Aaru.Images/Nero/Structs.cs
+++ b/Aaru.Images/Nero/Structs.cs
@@ -35,7 +35,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
public sealed partial class Nero
diff --git a/Aaru.Images/Nero/Verify.cs b/Aaru.Images/Nero/Verify.cs
index c505e00ef..d6e050d6a 100644
--- a/Aaru.Images/Nero/Verify.cs
+++ b/Aaru.Images/Nero/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Nero
{
diff --git a/Aaru.Images/Parallels/Constants.cs b/Aaru.Images/Parallels/Constants.cs
index 03cb2c1d5..a64b5f131 100644
--- a/Aaru.Images/Parallels/Constants.cs
+++ b/Aaru.Images/Parallels/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Parallels
diff --git a/Aaru.Images/Parallels/Identify.cs b/Aaru.Images/Parallels/Identify.cs
index e79cc7d4f..81903694f 100644
--- a/Aaru.Images/Parallels/Identify.cs
+++ b/Aaru.Images/Parallels/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/Parallels/Parallels.cs b/Aaru.Images/Parallels/Parallels.cs
index 44b87cabe..ee8592bd5 100644
--- a/Aaru.Images/Parallels/Parallels.cs
+++ b/Aaru.Images/Parallels/Parallels.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing Parallels' disk images
diff --git a/Aaru.Images/Parallels/Properties.cs b/Aaru.Images/Parallels/Properties.cs
index 9283a5128..5b00972b4 100644
--- a/Aaru.Images/Parallels/Properties.cs
+++ b/Aaru.Images/Parallels/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/Parallels/Read.cs b/Aaru.Images/Parallels/Read.cs
index 3bbd0b141..eb3a77fad 100644
--- a/Aaru.Images/Parallels/Read.cs
+++ b/Aaru.Images/Parallels/Read.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/Parallels/Structs.cs b/Aaru.Images/Parallels/Structs.cs
index 6bce7b66b..1a1c1dcd4 100644
--- a/Aaru.Images/Parallels/Structs.cs
+++ b/Aaru.Images/Parallels/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/Parallels/Unsupported.cs b/Aaru.Images/Parallels/Unsupported.cs
index 18fca09e6..fc1ffc6c0 100644
--- a/Aaru.Images/Parallels/Unsupported.cs
+++ b/Aaru.Images/Parallels/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/Parallels/Write.cs b/Aaru.Images/Parallels/Write.cs
index 2188fb1fe..6c79f9b0f 100644
--- a/Aaru.Images/Parallels/Write.cs
+++ b/Aaru.Images/Parallels/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Parallels
{
diff --git a/Aaru.Images/PartClone/Constants.cs b/Aaru.Images/PartClone/Constants.cs
index 8e153fad9..2774f6cf1 100644
--- a/Aaru.Images/PartClone/Constants.cs
+++ b/Aaru.Images/PartClone/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Helpers.cs b/Aaru.Images/PartClone/Helpers.cs
index 761970a64..a3b1f0367 100644
--- a/Aaru.Images/PartClone/Helpers.cs
+++ b/Aaru.Images/PartClone/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Identify.cs b/Aaru.Images/PartClone/Identify.cs
index 587e05d3c..d335feef1 100644
--- a/Aaru.Images/PartClone/Identify.cs
+++ b/Aaru.Images/PartClone/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/PartClone.cs b/Aaru.Images/PartClone/PartClone.cs
index 92d50b5ca..abbe030c8 100644
--- a/Aaru.Images/PartClone/PartClone.cs
+++ b/Aaru.Images/PartClone/PartClone.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading partclone disk images
diff --git a/Aaru.Images/PartClone/Properties.cs b/Aaru.Images/PartClone/Properties.cs
index 413c38f85..a2d191a75 100644
--- a/Aaru.Images/PartClone/Properties.cs
+++ b/Aaru.Images/PartClone/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Read.cs b/Aaru.Images/PartClone/Read.cs
index 25bd6b0b3..296a6d8b4 100644
--- a/Aaru.Images/PartClone/Read.cs
+++ b/Aaru.Images/PartClone/Read.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Structs.cs b/Aaru.Images/PartClone/Structs.cs
index 1fefb61e2..fdd011127 100644
--- a/Aaru.Images/PartClone/Structs.cs
+++ b/Aaru.Images/PartClone/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Unsupported.cs b/Aaru.Images/PartClone/Unsupported.cs
index e03245833..9e509d4a3 100644
--- a/Aaru.Images/PartClone/Unsupported.cs
+++ b/Aaru.Images/PartClone/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/PartClone/Verify.cs b/Aaru.Images/PartClone/Verify.cs
index 6f50ab791..ad1f09f67 100644
--- a/Aaru.Images/PartClone/Verify.cs
+++ b/Aaru.Images/PartClone/Verify.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class PartClone
{
diff --git a/Aaru.Images/Partimage/Constants.cs b/Aaru.Images/Partimage/Constants.cs
index b96e472d2..72a0a9e1d 100644
--- a/Aaru.Images/Partimage/Constants.cs
+++ b/Aaru.Images/Partimage/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
[SuppressMessage("ReSharper", "UnusedType.Global")]
diff --git a/Aaru.Images/Partimage/Enums.cs b/Aaru.Images/Partimage/Enums.cs
index 8bab12df8..a53b98673 100644
--- a/Aaru.Images/Partimage/Enums.cs
+++ b/Aaru.Images/Partimage/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
[SuppressMessage("ReSharper", "UnusedType.Global")]
diff --git a/Aaru.Images/Partimage/Helpers.cs b/Aaru.Images/Partimage/Helpers.cs
index 131c0c4fc..2e4cedd90 100644
--- a/Aaru.Images/Partimage/Helpers.cs
+++ b/Aaru.Images/Partimage/Helpers.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/Partimage/Identify.cs b/Aaru.Images/Partimage/Identify.cs
index 578546a75..d456a62aa 100644
--- a/Aaru.Images/Partimage/Identify.cs
+++ b/Aaru.Images/Partimage/Identify.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/Partimage/Partimage.cs b/Aaru.Images/Partimage/Partimage.cs
index d85f6226e..bb9599f22 100644
--- a/Aaru.Images/Partimage/Partimage.cs
+++ b/Aaru.Images/Partimage/Partimage.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Structs;
#pragma warning disable 649
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading partimage disk images
diff --git a/Aaru.Images/Partimage/Properties.cs b/Aaru.Images/Partimage/Properties.cs
index 3ad34c5b7..e41ea4c2f 100644
--- a/Aaru.Images/Partimage/Properties.cs
+++ b/Aaru.Images/Partimage/Properties.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/Partimage/Read.cs b/Aaru.Images/Partimage/Read.cs
index 1ae8ab738..c4d5dbf82 100644
--- a/Aaru.Images/Partimage/Read.cs
+++ b/Aaru.Images/Partimage/Read.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/Partimage/Structs.cs b/Aaru.Images/Partimage/Structs.cs
index 000779ffb..43e973e6a 100644
--- a/Aaru.Images/Partimage/Structs.cs
+++ b/Aaru.Images/Partimage/Structs.cs
@@ -34,7 +34,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
#pragma warning disable CS0649
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Local")]
[SuppressMessage("ReSharper", "UnusedType.Global")]
diff --git a/Aaru.Images/Partimage/Unsupported.cs b/Aaru.Images/Partimage/Unsupported.cs
index 8dc9acfb4..9f029b406 100644
--- a/Aaru.Images/Partimage/Unsupported.cs
+++ b/Aaru.Images/Partimage/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/Partimage/Verify.cs b/Aaru.Images/Partimage/Verify.cs
index 9b273b993..2e6afc697 100644
--- a/Aaru.Images/Partimage/Verify.cs
+++ b/Aaru.Images/Partimage/Verify.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class Partimage
diff --git a/Aaru.Images/QCOW/Constants.cs b/Aaru.Images/QCOW/Constants.cs
index be9047c28..7b2507c2f 100644
--- a/Aaru.Images/QCOW/Constants.cs
+++ b/Aaru.Images/QCOW/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/Identify.cs b/Aaru.Images/QCOW/Identify.cs
index 801a9217b..1269ea1f1 100644
--- a/Aaru.Images/QCOW/Identify.cs
+++ b/Aaru.Images/QCOW/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/Properties.cs b/Aaru.Images/QCOW/Properties.cs
index 9ea02a939..b436634f5 100644
--- a/Aaru.Images/QCOW/Properties.cs
+++ b/Aaru.Images/QCOW/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/QCOW.cs b/Aaru.Images/QCOW/QCOW.cs
index e86dcdbfe..5c5c1274a 100644
--- a/Aaru.Images/QCOW/QCOW.cs
+++ b/Aaru.Images/QCOW/QCOW.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing QEMU's Copy On Write disk images
diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs
index a33b7a2e7..ef60aa57d 100644
--- a/Aaru.Images/QCOW/Read.cs
+++ b/Aaru.Images/QCOW/Read.cs
@@ -43,7 +43,7 @@ using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/Structs.cs b/Aaru.Images/QCOW/Structs.cs
index 9f0a77007..90237ace0 100644
--- a/Aaru.Images/QCOW/Structs.cs
+++ b/Aaru.Images/QCOW/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/Unsupported.cs b/Aaru.Images/QCOW/Unsupported.cs
index 3c0c32883..6c72f4bfc 100644
--- a/Aaru.Images/QCOW/Unsupported.cs
+++ b/Aaru.Images/QCOW/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs
index 97b04792f..8e9dd65bf 100644
--- a/Aaru.Images/QCOW/Write.cs
+++ b/Aaru.Images/QCOW/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow
{
diff --git a/Aaru.Images/QCOW2/Constants.cs b/Aaru.Images/QCOW2/Constants.cs
index 8e6b87169..337044893 100644
--- a/Aaru.Images/QCOW2/Constants.cs
+++ b/Aaru.Images/QCOW2/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Qcow2
diff --git a/Aaru.Images/QCOW2/Identify.cs b/Aaru.Images/QCOW2/Identify.cs
index 36c468348..9e23f3203 100644
--- a/Aaru.Images/QCOW2/Identify.cs
+++ b/Aaru.Images/QCOW2/Identify.cs
@@ -35,7 +35,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QCOW2/Properties.cs b/Aaru.Images/QCOW2/Properties.cs
index 62849327f..0425c500e 100644
--- a/Aaru.Images/QCOW2/Properties.cs
+++ b/Aaru.Images/QCOW2/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QCOW2/QCOW2.cs b/Aaru.Images/QCOW2/QCOW2.cs
index 4ae257de5..5a2e47096 100644
--- a/Aaru.Images/QCOW2/QCOW2.cs
+++ b/Aaru.Images/QCOW2/QCOW2.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing QEMU's Copy On Write v2 and v3 disk images
diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs
index 7be83c12e..034292014 100644
--- a/Aaru.Images/QCOW2/Read.cs
+++ b/Aaru.Images/QCOW2/Read.cs
@@ -43,7 +43,7 @@ using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QCOW2/Structs.cs b/Aaru.Images/QCOW2/Structs.cs
index 1e1eb9ef2..dc0d25f4d 100644
--- a/Aaru.Images/QCOW2/Structs.cs
+++ b/Aaru.Images/QCOW2/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QCOW2/Unsupported.cs b/Aaru.Images/QCOW2/Unsupported.cs
index 6381575fb..3a9ccb226 100644
--- a/Aaru.Images/QCOW2/Unsupported.cs
+++ b/Aaru.Images/QCOW2/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs
index c1bf3003a..035c7250e 100644
--- a/Aaru.Images/QCOW2/Write.cs
+++ b/Aaru.Images/QCOW2/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qcow2
{
diff --git a/Aaru.Images/QED/Constants.cs b/Aaru.Images/QED/Constants.cs
index d6f49e8f7..adea7721e 100644
--- a/Aaru.Images/QED/Constants.cs
+++ b/Aaru.Images/QED/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Qed
diff --git a/Aaru.Images/QED/Helpers.cs b/Aaru.Images/QED/Helpers.cs
index 256412e3d..940247751 100644
--- a/Aaru.Images/QED/Helpers.cs
+++ b/Aaru.Images/QED/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/Identify.cs b/Aaru.Images/QED/Identify.cs
index 5f1751a91..4b5519195 100644
--- a/Aaru.Images/QED/Identify.cs
+++ b/Aaru.Images/QED/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/Properties.cs b/Aaru.Images/QED/Properties.cs
index 6d2679852..372d71029 100644
--- a/Aaru.Images/QED/Properties.cs
+++ b/Aaru.Images/QED/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/QED.cs b/Aaru.Images/QED/QED.cs
index 71437e6f0..13b2e3786 100644
--- a/Aaru.Images/QED/QED.cs
+++ b/Aaru.Images/QED/QED.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing QEMU Enhanced Disk images
diff --git a/Aaru.Images/QED/Read.cs b/Aaru.Images/QED/Read.cs
index 9fae4afc7..c168b6d69 100644
--- a/Aaru.Images/QED/Read.cs
+++ b/Aaru.Images/QED/Read.cs
@@ -41,7 +41,7 @@ using Aaru.Console;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/Structs.cs b/Aaru.Images/QED/Structs.cs
index bf6aaa0ea..0e9ff5e99 100644
--- a/Aaru.Images/QED/Structs.cs
+++ b/Aaru.Images/QED/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/Unsupported.cs b/Aaru.Images/QED/Unsupported.cs
index a00932d2f..ce2c3386b 100644
--- a/Aaru.Images/QED/Unsupported.cs
+++ b/Aaru.Images/QED/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs
index e1d7b6d00..bee6d4dab 100644
--- a/Aaru.Images/QED/Write.cs
+++ b/Aaru.Images/QED/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Qed
{
diff --git a/Aaru.Images/RayDIM/Constants.cs b/Aaru.Images/RayDIM/Constants.cs
index 6841b65ef..99737f4ff 100644
--- a/Aaru.Images/RayDIM/Constants.cs
+++ b/Aaru.Images/RayDIM/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/Enums.cs b/Aaru.Images/RayDIM/Enums.cs
index 831bf197c..a886f9907 100644
--- a/Aaru.Images/RayDIM/Enums.cs
+++ b/Aaru.Images/RayDIM/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class RayDim
diff --git a/Aaru.Images/RayDIM/Identify.cs b/Aaru.Images/RayDIM/Identify.cs
index d29801deb..ed7dd20bc 100644
--- a/Aaru.Images/RayDIM/Identify.cs
+++ b/Aaru.Images/RayDIM/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/Properties.cs b/Aaru.Images/RayDIM/Properties.cs
index 5b441e420..e63ff31c2 100644
--- a/Aaru.Images/RayDIM/Properties.cs
+++ b/Aaru.Images/RayDIM/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/RayDIM.cs b/Aaru.Images/RayDIM/RayDIM.cs
index 459cd5bbe..aaf08445e 100644
--- a/Aaru.Images/RayDIM/RayDIM.cs
+++ b/Aaru.Images/RayDIM/RayDIM.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing Ray Arachellian's DIM disk images
diff --git a/Aaru.Images/RayDIM/Read.cs b/Aaru.Images/RayDIM/Read.cs
index 65b326aac..5d609a14f 100644
--- a/Aaru.Images/RayDIM/Read.cs
+++ b/Aaru.Images/RayDIM/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/Structs.cs b/Aaru.Images/RayDIM/Structs.cs
index 8403f40ab..1a7dd3cac 100644
--- a/Aaru.Images/RayDIM/Structs.cs
+++ b/Aaru.Images/RayDIM/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/Unsupported.cs b/Aaru.Images/RayDIM/Unsupported.cs
index 42003f433..45f584343 100644
--- a/Aaru.Images/RayDIM/Unsupported.cs
+++ b/Aaru.Images/RayDIM/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs
index 49c48ddc8..5859d059d 100644
--- a/Aaru.Images/RayDIM/Write.cs
+++ b/Aaru.Images/RayDIM/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RayDim
{
diff --git a/Aaru.Images/Register.cs b/Aaru.Images/Register.cs
index 742e266d4..98f3a1418 100644
--- a/Aaru.Images/Register.cs
+++ b/Aaru.Images/Register.cs
@@ -38,7 +38,7 @@
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Needs to have the interface here so the source generator knows THIS IS the class
// ReSharper disable once RedundantExtendsListEntry
diff --git a/Aaru.Images/RsIde/Constants.cs b/Aaru.Images/RsIde/Constants.cs
index 1b7e3a5e5..00f175c8f 100644
--- a/Aaru.Images/RsIde/Constants.cs
+++ b/Aaru.Images/RsIde/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Enums.cs b/Aaru.Images/RsIde/Enums.cs
index a7035b878..74795b5c1 100644
--- a/Aaru.Images/RsIde/Enums.cs
+++ b/Aaru.Images/RsIde/Enums.cs
@@ -32,7 +32,7 @@
using System;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Helpers.cs b/Aaru.Images/RsIde/Helpers.cs
index 8aa4d3d8d..04de21bad 100644
--- a/Aaru.Images/RsIde/Helpers.cs
+++ b/Aaru.Images/RsIde/Helpers.cs
@@ -33,7 +33,7 @@
using System;
using System.Text;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Identify.cs b/Aaru.Images/RsIde/Identify.cs
index ef9059245..f0f066962 100644
--- a/Aaru.Images/RsIde/Identify.cs
+++ b/Aaru.Images/RsIde/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Properties.cs b/Aaru.Images/RsIde/Properties.cs
index 90d05a942..21d149807 100644
--- a/Aaru.Images/RsIde/Properties.cs
+++ b/Aaru.Images/RsIde/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Read.cs b/Aaru.Images/RsIde/Read.cs
index 555f1fff3..55b73a509 100644
--- a/Aaru.Images/RsIde/Read.cs
+++ b/Aaru.Images/RsIde/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs.Devices.ATA;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/RsIde.cs b/Aaru.Images/RsIde/RsIde.cs
index 307a08b6f..797a4bcd6 100644
--- a/Aaru.Images/RsIde/RsIde.cs
+++ b/Aaru.Images/RsIde/RsIde.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing RS-IDE disk images
diff --git a/Aaru.Images/RsIde/Structs.cs b/Aaru.Images/RsIde/Structs.cs
index 4c2fe3913..7bd0ac957 100644
--- a/Aaru.Images/RsIde/Structs.cs
+++ b/Aaru.Images/RsIde/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Unsupported.cs b/Aaru.Images/RsIde/Unsupported.cs
index 5672cb0bb..2f6c0f245 100644
--- a/Aaru.Images/RsIde/Unsupported.cs
+++ b/Aaru.Images/RsIde/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/RsIde/Write.cs b/Aaru.Images/RsIde/Write.cs
index 552d35fca..44479c7e1 100644
--- a/Aaru.Images/RsIde/Write.cs
+++ b/Aaru.Images/RsIde/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs.Devices.ATA;
using Aaru.Helpers;
using Version = Aaru.CommonTypes.Interop.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class RsIde
{
diff --git a/Aaru.Images/SaveDskF/Constants.cs b/Aaru.Images/SaveDskF/Constants.cs
index 05f8f9b9b..51cc66d09 100644
--- a/Aaru.Images/SaveDskF/Constants.cs
+++ b/Aaru.Images/SaveDskF/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Identify.cs b/Aaru.Images/SaveDskF/Identify.cs
index c2c5a5715..65abf1078 100644
--- a/Aaru.Images/SaveDskF/Identify.cs
+++ b/Aaru.Images/SaveDskF/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Properties.cs b/Aaru.Images/SaveDskF/Properties.cs
index 2c2ae1605..ffd007de6 100644
--- a/Aaru.Images/SaveDskF/Properties.cs
+++ b/Aaru.Images/SaveDskF/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Read.cs b/Aaru.Images/SaveDskF/Read.cs
index 44dfe59f0..393145489 100644
--- a/Aaru.Images/SaveDskF/Read.cs
+++ b/Aaru.Images/SaveDskF/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/SaveDskF.cs b/Aaru.Images/SaveDskF/SaveDskF.cs
index 738128bc0..7e44dffd4 100644
--- a/Aaru.Images/SaveDskF/SaveDskF.cs
+++ b/Aaru.Images/SaveDskF/SaveDskF.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing IBM's SaveDskF disk images
diff --git a/Aaru.Images/SaveDskF/Structs.cs b/Aaru.Images/SaveDskF/Structs.cs
index b4a4c87fb..e37eaca87 100644
--- a/Aaru.Images/SaveDskF/Structs.cs
+++ b/Aaru.Images/SaveDskF/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Unsupported.cs b/Aaru.Images/SaveDskF/Unsupported.cs
index 1840b93ae..2ec92c1ad 100644
--- a/Aaru.Images/SaveDskF/Unsupported.cs
+++ b/Aaru.Images/SaveDskF/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Verify.cs b/Aaru.Images/SaveDskF/Verify.cs
index 496331037..f5e9f699b 100644
--- a/Aaru.Images/SaveDskF/Verify.cs
+++ b/Aaru.Images/SaveDskF/Verify.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SaveDskF/Write.cs b/Aaru.Images/SaveDskF/Write.cs
index c558c851a..73b93e137 100644
--- a/Aaru.Images/SaveDskF/Write.cs
+++ b/Aaru.Images/SaveDskF/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SaveDskF
{
diff --git a/Aaru.Images/SuperCardPro/Constants.cs b/Aaru.Images/SuperCardPro/Constants.cs
index 769e51d51..a83d2c9f7 100644
--- a/Aaru.Images/SuperCardPro/Constants.cs
+++ b/Aaru.Images/SuperCardPro/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Enums.cs b/Aaru.Images/SuperCardPro/Enums.cs
index 744c17e82..18ed0b23e 100644
--- a/Aaru.Images/SuperCardPro/Enums.cs
+++ b/Aaru.Images/SuperCardPro/Enums.cs
@@ -33,7 +33,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Helpers.cs b/Aaru.Images/SuperCardPro/Helpers.cs
index b8d4e23d3..44935c37b 100644
--- a/Aaru.Images/SuperCardPro/Helpers.cs
+++ b/Aaru.Images/SuperCardPro/Helpers.cs
@@ -36,7 +36,7 @@ using System.IO;
using System.Text;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Identify.cs b/Aaru.Images/SuperCardPro/Identify.cs
index d075ab48c..28fa7c3ef 100644
--- a/Aaru.Images/SuperCardPro/Identify.cs
+++ b/Aaru.Images/SuperCardPro/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Properties.cs b/Aaru.Images/SuperCardPro/Properties.cs
index 933ee8492..9e98a43a0 100644
--- a/Aaru.Images/SuperCardPro/Properties.cs
+++ b/Aaru.Images/SuperCardPro/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Read.cs b/Aaru.Images/SuperCardPro/Read.cs
index 7d53789e8..ca5e0b535 100644
--- a/Aaru.Images/SuperCardPro/Read.cs
+++ b/Aaru.Images/SuperCardPro/Read.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Structs.cs b/Aaru.Images/SuperCardPro/Structs.cs
index 57779738c..e8c739b02 100644
--- a/Aaru.Images/SuperCardPro/Structs.cs
+++ b/Aaru.Images/SuperCardPro/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/SuperCardPro.cs b/Aaru.Images/SuperCardPro/SuperCardPro.cs
index f548268cd..5a4dad4f4 100644
--- a/Aaru.Images/SuperCardPro/SuperCardPro.cs
+++ b/Aaru.Images/SuperCardPro/SuperCardPro.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading SuperCardPro flux images
diff --git a/Aaru.Images/SuperCardPro/Verify.cs b/Aaru.Images/SuperCardPro/Verify.cs
index 2a18683d7..955ce387b 100644
--- a/Aaru.Images/SuperCardPro/Verify.cs
+++ b/Aaru.Images/SuperCardPro/Verify.cs
@@ -34,7 +34,7 @@ using System;
using System.Collections.Generic;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/SuperCardPro/Write.cs b/Aaru.Images/SuperCardPro/Write.cs
index 9a6837b4e..c35ad7806 100644
--- a/Aaru.Images/SuperCardPro/Write.cs
+++ b/Aaru.Images/SuperCardPro/Write.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class SuperCardPro
{
diff --git a/Aaru.Images/T98/Identify.cs b/Aaru.Images/T98/Identify.cs
index 0b16db413..38cbb1935 100644
--- a/Aaru.Images/T98/Identify.cs
+++ b/Aaru.Images/T98/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class T98
diff --git a/Aaru.Images/T98/Properties.cs b/Aaru.Images/T98/Properties.cs
index 0b5704bc7..618dfde5c 100644
--- a/Aaru.Images/T98/Properties.cs
+++ b/Aaru.Images/T98/Properties.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class T98
diff --git a/Aaru.Images/T98/Read.cs b/Aaru.Images/T98/Read.cs
index 99f546849..a0e0ed8ed 100644
--- a/Aaru.Images/T98/Read.cs
+++ b/Aaru.Images/T98/Read.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class T98
diff --git a/Aaru.Images/T98/T98.cs b/Aaru.Images/T98/T98.cs
index aec663774..b572136fb 100644
--- a/Aaru.Images/T98/T98.cs
+++ b/Aaru.Images/T98/T98.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing T98 disk images
diff --git a/Aaru.Images/T98/Unsupported.cs b/Aaru.Images/T98/Unsupported.cs
index c4428ca8f..a8097c4bb 100644
--- a/Aaru.Images/T98/Unsupported.cs
+++ b/Aaru.Images/T98/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class T98
diff --git a/Aaru.Images/T98/Write.cs b/Aaru.Images/T98/Write.cs
index d4405aa2e..e3416d936 100644
--- a/Aaru.Images/T98/Write.cs
+++ b/Aaru.Images/T98/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class T98
diff --git a/Aaru.Images/TeleDisk/Constants.cs b/Aaru.Images/TeleDisk/Constants.cs
index 1ecf46197..59808b18a 100644
--- a/Aaru.Images/TeleDisk/Constants.cs
+++ b/Aaru.Images/TeleDisk/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class TeleDisk
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index 3d54274a7..1a3d8a8a5 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/Identify.cs b/Aaru.Images/TeleDisk/Identify.cs
index aad6e7f89..ea5fd6058 100644
--- a/Aaru.Images/TeleDisk/Identify.cs
+++ b/Aaru.Images/TeleDisk/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/Properties.cs b/Aaru.Images/TeleDisk/Properties.cs
index 5f3296381..0dbc10c4e 100644
--- a/Aaru.Images/TeleDisk/Properties.cs
+++ b/Aaru.Images/TeleDisk/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/Read.cs b/Aaru.Images/TeleDisk/Read.cs
index 267c43ec4..c752843bc 100644
--- a/Aaru.Images/TeleDisk/Read.cs
+++ b/Aaru.Images/TeleDisk/Read.cs
@@ -39,7 +39,7 @@ using Aaru.Compression;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/Structs.cs b/Aaru.Images/TeleDisk/Structs.cs
index 16a2e738a..386cffe0d 100644
--- a/Aaru.Images/TeleDisk/Structs.cs
+++ b/Aaru.Images/TeleDisk/Structs.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/TeleDisk.cs b/Aaru.Images/TeleDisk/TeleDisk.cs
index a2c9e1948..2a15070e2 100644
--- a/Aaru.Images/TeleDisk/TeleDisk.cs
+++ b/Aaru.Images/TeleDisk/TeleDisk.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Created following notes from Dave Dunfield
// http://www.classiccmp.org/dunfield/img54306/td0notes.txt
diff --git a/Aaru.Images/TeleDisk/Unsupported.cs b/Aaru.Images/TeleDisk/Unsupported.cs
index bff1a6ced..76478f029 100644
--- a/Aaru.Images/TeleDisk/Unsupported.cs
+++ b/Aaru.Images/TeleDisk/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/TeleDisk/Verify.cs b/Aaru.Images/TeleDisk/Verify.cs
index 96ccac45a..dc722e4df 100644
--- a/Aaru.Images/TeleDisk/Verify.cs
+++ b/Aaru.Images/TeleDisk/Verify.cs
@@ -32,7 +32,7 @@
using System.Collections.Generic;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class TeleDisk
{
diff --git a/Aaru.Images/UDIF/Constants.cs b/Aaru.Images/UDIF/Constants.cs
index 34d4ab2e3..a7dc526f3 100644
--- a/Aaru.Images/UDIF/Constants.cs
+++ b/Aaru.Images/UDIF/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Udif
diff --git a/Aaru.Images/UDIF/Identify.cs b/Aaru.Images/UDIF/Identify.cs
index fab3a531e..f797936ab 100644
--- a/Aaru.Images/UDIF/Identify.cs
+++ b/Aaru.Images/UDIF/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UDIF/Properties.cs b/Aaru.Images/UDIF/Properties.cs
index 528c7e7e6..fc62977c1 100644
--- a/Aaru.Images/UDIF/Properties.cs
+++ b/Aaru.Images/UDIF/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs
index f8e8b79ee..9d76a6c56 100644
--- a/Aaru.Images/UDIF/Read.cs
+++ b/Aaru.Images/UDIF/Read.cs
@@ -48,7 +48,7 @@ using Version = Resources.Version;
#pragma warning disable 612
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UDIF/Structs.cs b/Aaru.Images/UDIF/Structs.cs
index 9c031e142..0de95e745 100644
--- a/Aaru.Images/UDIF/Structs.cs
+++ b/Aaru.Images/UDIF/Structs.cs
@@ -33,7 +33,7 @@
using System;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UDIF/UDIF.cs b/Aaru.Images/UDIF/UDIF.cs
index 183c1cdeb..863e4a875 100644
--- a/Aaru.Images/UDIF/UDIF.cs
+++ b/Aaru.Images/UDIF/UDIF.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Structs;
#pragma warning disable 612
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing Apple's Universal Disk Image Format disk images
diff --git a/Aaru.Images/UDIF/Unsupported.cs b/Aaru.Images/UDIF/Unsupported.cs
index 7bd5308a2..45e722bb0 100644
--- a/Aaru.Images/UDIF/Unsupported.cs
+++ b/Aaru.Images/UDIF/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs
index 63455e82c..ce18b3300 100644
--- a/Aaru.Images/UDIF/Write.cs
+++ b/Aaru.Images/UDIF/Write.cs
@@ -43,7 +43,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Claunia.PropertyList;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Udif
{
diff --git a/Aaru.Images/UkvFdi/Constants.cs b/Aaru.Images/UkvFdi/Constants.cs
index 19f15bbcb..8b9ae575a 100644
--- a/Aaru.Images/UkvFdi/Constants.cs
+++ b/Aaru.Images/UkvFdi/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/Enums.cs b/Aaru.Images/UkvFdi/Enums.cs
index 9b34dd7a3..ff259f545 100644
--- a/Aaru.Images/UkvFdi/Enums.cs
+++ b/Aaru.Images/UkvFdi/Enums.cs
@@ -33,7 +33,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
[SuppressMessage("ReSharper", "UnusedType.Global")]
diff --git a/Aaru.Images/UkvFdi/Helpers.cs b/Aaru.Images/UkvFdi/Helpers.cs
index 983e34f42..9917633aa 100644
--- a/Aaru.Images/UkvFdi/Helpers.cs
+++ b/Aaru.Images/UkvFdi/Helpers.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/Identify.cs b/Aaru.Images/UkvFdi/Identify.cs
index 8df7070e3..119d452ce 100644
--- a/Aaru.Images/UkvFdi/Identify.cs
+++ b/Aaru.Images/UkvFdi/Identify.cs
@@ -36,7 +36,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/Properties.cs b/Aaru.Images/UkvFdi/Properties.cs
index b61b741fa..263ea185e 100644
--- a/Aaru.Images/UkvFdi/Properties.cs
+++ b/Aaru.Images/UkvFdi/Properties.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/Read.cs b/Aaru.Images/UkvFdi/Read.cs
index b58641840..f6580c748 100644
--- a/Aaru.Images/UkvFdi/Read.cs
+++ b/Aaru.Images/UkvFdi/Read.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/Structs.cs b/Aaru.Images/UkvFdi/Structs.cs
index ea52df830..0d4feae5a 100644
--- a/Aaru.Images/UkvFdi/Structs.cs
+++ b/Aaru.Images/UkvFdi/Structs.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/UkvFdi/UkvFdi.cs b/Aaru.Images/UkvFdi/UkvFdi.cs
index 0fb5300c1..14afee807 100644
--- a/Aaru.Images/UkvFdi/UkvFdi.cs
+++ b/Aaru.Images/UkvFdi/UkvFdi.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading UKV FDI disk images
diff --git a/Aaru.Images/UkvFdi/Unsupported.cs b/Aaru.Images/UkvFdi/Unsupported.cs
index 87abb43ba..11daba78c 100644
--- a/Aaru.Images/UkvFdi/Unsupported.cs
+++ b/Aaru.Images/UkvFdi/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class UkvFdi
diff --git a/Aaru.Images/VDI/Constants.cs b/Aaru.Images/VDI/Constants.cs
index 8b2153c9f..ad2cca0b1 100644
--- a/Aaru.Images/VDI/Constants.cs
+++ b/Aaru.Images/VDI/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/Enums.cs b/Aaru.Images/VDI/Enums.cs
index 16fed5576..6d865fa4b 100644
--- a/Aaru.Images/VDI/Enums.cs
+++ b/Aaru.Images/VDI/Enums.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Vdi
diff --git a/Aaru.Images/VDI/Identify.cs b/Aaru.Images/VDI/Identify.cs
index 2272d527f..803ec2722 100644
--- a/Aaru.Images/VDI/Identify.cs
+++ b/Aaru.Images/VDI/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/Properties.cs b/Aaru.Images/VDI/Properties.cs
index ac4a2b20d..bb9175b02 100644
--- a/Aaru.Images/VDI/Properties.cs
+++ b/Aaru.Images/VDI/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/Read.cs b/Aaru.Images/VDI/Read.cs
index 8fcbd220a..bb77c01bd 100644
--- a/Aaru.Images/VDI/Read.cs
+++ b/Aaru.Images/VDI/Read.cs
@@ -42,7 +42,7 @@ using Aaru.Console;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/Structs.cs b/Aaru.Images/VDI/Structs.cs
index 09c1d1216..e6460cf05 100644
--- a/Aaru.Images/VDI/Structs.cs
+++ b/Aaru.Images/VDI/Structs.cs
@@ -33,7 +33,7 @@
using System;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/Unsupported.cs b/Aaru.Images/VDI/Unsupported.cs
index 1c44e21de..4f3626d90 100644
--- a/Aaru.Images/VDI/Unsupported.cs
+++ b/Aaru.Images/VDI/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VDI/VDI.cs b/Aaru.Images/VDI/VDI.cs
index 1957a4e4b..347d4a786 100644
--- a/Aaru.Images/VDI/VDI.cs
+++ b/Aaru.Images/VDI/VDI.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// TODO: Support version 0
// TODO: Support fixed images
diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs
index b4b31d8d3..1d2767523 100644
--- a/Aaru.Images/VDI/Write.cs
+++ b/Aaru.Images/VDI/Write.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vdi
{
diff --git a/Aaru.Images/VHD/Constants.cs b/Aaru.Images/VHD/Constants.cs
index 1af62745f..f8d147e44 100644
--- a/Aaru.Images/VHD/Constants.cs
+++ b/Aaru.Images/VHD/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Vhd
diff --git a/Aaru.Images/VHD/Helpers.cs b/Aaru.Images/VHD/Helpers.cs
index b0c87b9e2..ec246e4da 100644
--- a/Aaru.Images/VHD/Helpers.cs
+++ b/Aaru.Images/VHD/Helpers.cs
@@ -33,7 +33,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/Identify.cs b/Aaru.Images/VHD/Identify.cs
index 6c6b388a0..411bb75c8 100644
--- a/Aaru.Images/VHD/Identify.cs
+++ b/Aaru.Images/VHD/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/Properties.cs b/Aaru.Images/VHD/Properties.cs
index 04d51ccde..27eda748d 100644
--- a/Aaru.Images/VHD/Properties.cs
+++ b/Aaru.Images/VHD/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs
index d59ef0a4f..678204b58 100644
--- a/Aaru.Images/VHD/Read.cs
+++ b/Aaru.Images/VHD/Read.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/Structs.cs b/Aaru.Images/VHD/Structs.cs
index 99b0114ff..689547776 100644
--- a/Aaru.Images/VHD/Structs.cs
+++ b/Aaru.Images/VHD/Structs.cs
@@ -32,7 +32,7 @@
using System;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/Unsupported.cs b/Aaru.Images/VHD/Unsupported.cs
index d35aaa97b..aed9222ed 100644
--- a/Aaru.Images/VHD/Unsupported.cs
+++ b/Aaru.Images/VHD/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHD/VHD.cs b/Aaru.Images/VHD/VHD.cs
index ee0e3518d..bbe4f1fa9 100644
--- a/Aaru.Images/VHD/VHD.cs
+++ b/Aaru.Images/VHD/VHD.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
///
diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs
index c2e4011c8..c7d22b4aa 100644
--- a/Aaru.Images/VHD/Write.cs
+++ b/Aaru.Images/VHD/Write.cs
@@ -43,7 +43,7 @@ using Aaru.Helpers;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
using Version = System.Version;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhd
{
diff --git a/Aaru.Images/VHDX/Constants.cs b/Aaru.Images/VHDX/Constants.cs
index 3a829776e..baf99d939 100644
--- a/Aaru.Images/VHDX/Constants.cs
+++ b/Aaru.Images/VHDX/Constants.cs
@@ -33,7 +33,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class Vhdx
diff --git a/Aaru.Images/VHDX/Helpers.cs b/Aaru.Images/VHDX/Helpers.cs
index 2881b6709..f0513a872 100644
--- a/Aaru.Images/VHDX/Helpers.cs
+++ b/Aaru.Images/VHDX/Helpers.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/Identify.cs b/Aaru.Images/VHDX/Identify.cs
index fc07fabce..581ff66c8 100644
--- a/Aaru.Images/VHDX/Identify.cs
+++ b/Aaru.Images/VHDX/Identify.cs
@@ -34,7 +34,7 @@ using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/Properties.cs b/Aaru.Images/VHDX/Properties.cs
index 2d1120e45..9babb0a7f 100644
--- a/Aaru.Images/VHDX/Properties.cs
+++ b/Aaru.Images/VHDX/Properties.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs
index 36b01977f..b8f8b26ae 100644
--- a/Aaru.Images/VHDX/Read.cs
+++ b/Aaru.Images/VHDX/Read.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/Structs.cs b/Aaru.Images/VHDX/Structs.cs
index acb109ff7..1309dc69c 100644
--- a/Aaru.Images/VHDX/Structs.cs
+++ b/Aaru.Images/VHDX/Structs.cs
@@ -33,7 +33,7 @@
using System;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/Unsupported.cs b/Aaru.Images/VHDX/Unsupported.cs
index c414ca91a..ab04b7b9b 100644
--- a/Aaru.Images/VHDX/Unsupported.cs
+++ b/Aaru.Images/VHDX/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Vhdx
{
diff --git a/Aaru.Images/VHDX/VHDX.cs b/Aaru.Images/VHDX/VHDX.cs
index e3f30a7ec..fdb4e7ece 100644
--- a/Aaru.Images/VHDX/VHDX.cs
+++ b/Aaru.Images/VHDX/VHDX.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading Hyper-V disk images
diff --git a/Aaru.Images/VMware/Constants.cs b/Aaru.Images/VMware/Constants.cs
index 36c9e57e4..ff55269f1 100644
--- a/Aaru.Images/VMware/Constants.cs
+++ b/Aaru.Images/VMware/Constants.cs
@@ -32,7 +32,7 @@
using System.Diagnostics.CodeAnalysis;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class VMware
diff --git a/Aaru.Images/VMware/Identify.cs b/Aaru.Images/VMware/Identify.cs
index be2597efa..74e6933b6 100644
--- a/Aaru.Images/VMware/Identify.cs
+++ b/Aaru.Images/VMware/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/VMware/Properties.cs b/Aaru.Images/VMware/Properties.cs
index 8161cc3cd..748b55b6f 100644
--- a/Aaru.Images/VMware/Properties.cs
+++ b/Aaru.Images/VMware/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs
index 08009a4ca..34c1ed6ae 100644
--- a/Aaru.Images/VMware/Read.cs
+++ b/Aaru.Images/VMware/Read.cs
@@ -43,7 +43,7 @@ using Aaru.Console;
using Aaru.Helpers;
using Marshal = Aaru.Helpers.Marshal;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/VMware/Structs.cs b/Aaru.Images/VMware/Structs.cs
index 0f156b367..770b5cea1 100644
--- a/Aaru.Images/VMware/Structs.cs
+++ b/Aaru.Images/VMware/Structs.cs
@@ -33,7 +33,7 @@
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Interfaces;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/VMware/Unsupported.cs b/Aaru.Images/VMware/Unsupported.cs
index 2efd5a450..8377787af 100644
--- a/Aaru.Images/VMware/Unsupported.cs
+++ b/Aaru.Images/VMware/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/VMware/VMware.cs b/Aaru.Images/VMware/VMware.cs
index f594a7a9f..db022d51e 100644
--- a/Aaru.Images/VMware/VMware.cs
+++ b/Aaru.Images/VMware/VMware.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading VMware disk images
diff --git a/Aaru.Images/VMware/Write.cs b/Aaru.Images/VMware/Write.cs
index 77e14a50d..05f9f7876 100644
--- a/Aaru.Images/VMware/Write.cs
+++ b/Aaru.Images/VMware/Write.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class VMware
{
diff --git a/Aaru.Images/Virtual98/Constants.cs b/Aaru.Images/Virtual98/Constants.cs
index 858a05cca..aafb52114 100644
--- a/Aaru.Images/Virtual98/Constants.cs
+++ b/Aaru.Images/Virtual98/Constants.cs
@@ -30,7 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs
index 4591307b4..10f098685 100644
--- a/Aaru.Images/Virtual98/Identify.cs
+++ b/Aaru.Images/Virtual98/Identify.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Properties.cs b/Aaru.Images/Virtual98/Properties.cs
index fca91bf42..6bd3ca7a4 100644
--- a/Aaru.Images/Virtual98/Properties.cs
+++ b/Aaru.Images/Virtual98/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Read.cs b/Aaru.Images/Virtual98/Read.cs
index f8d44d45b..1130531fd 100644
--- a/Aaru.Images/Virtual98/Read.cs
+++ b/Aaru.Images/Virtual98/Read.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Structs.cs b/Aaru.Images/Virtual98/Structs.cs
index 8ee717a5c..ee6af5dde 100644
--- a/Aaru.Images/Virtual98/Structs.cs
+++ b/Aaru.Images/Virtual98/Structs.cs
@@ -32,7 +32,7 @@
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Unsupported.cs b/Aaru.Images/Virtual98/Unsupported.cs
index ae0d3c409..e14076fcf 100644
--- a/Aaru.Images/Virtual98/Unsupported.cs
+++ b/Aaru.Images/Virtual98/Unsupported.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/Virtual98/Virtual98.cs b/Aaru.Images/Virtual98/Virtual98.cs
index 019e8e7d5..22912a3ad 100644
--- a/Aaru.Images/Virtual98/Virtual98.cs
+++ b/Aaru.Images/Virtual98/Virtual98.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
// Info from Neko Project II emulator
///
diff --git a/Aaru.Images/Virtual98/Write.cs b/Aaru.Images/Virtual98/Write.cs
index 5ef90cef9..1e2318b9e 100644
--- a/Aaru.Images/Virtual98/Write.cs
+++ b/Aaru.Images/Virtual98/Write.cs
@@ -41,7 +41,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class Virtual98
{
diff --git a/Aaru.Images/WCDiskImage/Identify.cs b/Aaru.Images/WCDiskImage/Identify.cs
index 56b3fc0a4..568ae5a02 100644
--- a/Aaru.Images/WCDiskImage/Identify.cs
+++ b/Aaru.Images/WCDiskImage/Identify.cs
@@ -37,7 +37,7 @@ using System.Text;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class WCDiskImage
diff --git a/Aaru.Images/WCDiskImage/Properties.cs b/Aaru.Images/WCDiskImage/Properties.cs
index 5c0c7224e..7f613393a 100644
--- a/Aaru.Images/WCDiskImage/Properties.cs
+++ b/Aaru.Images/WCDiskImage/Properties.cs
@@ -37,7 +37,7 @@ using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class WCDiskImage
diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs
index c0f2da482..815367539 100644
--- a/Aaru.Images/WCDiskImage/Read.cs
+++ b/Aaru.Images/WCDiskImage/Read.cs
@@ -42,7 +42,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class WCDiskImage
diff --git a/Aaru.Images/WCDiskImage/Structs.cs b/Aaru.Images/WCDiskImage/Structs.cs
index 240f411a4..f629edbee 100644
--- a/Aaru.Images/WCDiskImage/Structs.cs
+++ b/Aaru.Images/WCDiskImage/Structs.cs
@@ -34,7 +34,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class WCDiskImage
diff --git a/Aaru.Images/WCDiskImage/Unsupported.cs b/Aaru.Images/WCDiskImage/Unsupported.cs
index 43de007c0..8b23338ef 100644
--- a/Aaru.Images/WCDiskImage/Unsupported.cs
+++ b/Aaru.Images/WCDiskImage/Unsupported.cs
@@ -33,7 +33,7 @@
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class WCDiskImage
diff --git a/Aaru.Images/WCDiskImage/WCDiskImage.cs b/Aaru.Images/WCDiskImage/WCDiskImage.cs
index 47120cdd2..c86a746bf 100644
--- a/Aaru.Images/WCDiskImage/WCDiskImage.cs
+++ b/Aaru.Images/WCDiskImage/WCDiskImage.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Manages floppy disk images created with d2f by DataPackRat
diff --git a/Aaru.Images/ZZZRawImage/Constants.cs b/Aaru.Images/ZZZRawImage/Constants.cs
index 4ef971788..76bb0565a 100644
--- a/Aaru.Images/ZZZRawImage/Constants.cs
+++ b/Aaru.Images/ZZZRawImage/Constants.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Helpers.cs b/Aaru.Images/ZZZRawImage/Helpers.cs
index e8d40ac96..6b2c23050 100644
--- a/Aaru.Images/ZZZRawImage/Helpers.cs
+++ b/Aaru.Images/ZZZRawImage/Helpers.cs
@@ -32,7 +32,7 @@
using Aaru.CommonTypes;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Identify.cs b/Aaru.Images/ZZZRawImage/Identify.cs
index b09977695..537d6e69e 100644
--- a/Aaru.Images/ZZZRawImage/Identify.cs
+++ b/Aaru.Images/ZZZRawImage/Identify.cs
@@ -35,7 +35,7 @@ using System.Linq;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Properties.cs b/Aaru.Images/ZZZRawImage/Properties.cs
index 435384d91..23115244a 100644
--- a/Aaru.Images/ZZZRawImage/Properties.cs
+++ b/Aaru.Images/ZZZRawImage/Properties.cs
@@ -41,7 +41,7 @@ using Partition = Aaru.CommonTypes.Partition;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index 731c7b50c..ceaa2c75f 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -56,7 +56,7 @@ using Session = Aaru.CommonTypes.Structs.Session;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Verify.cs b/Aaru.Images/ZZZRawImage/Verify.cs
index af2151a80..0058aac19 100644
--- a/Aaru.Images/ZZZRawImage/Verify.cs
+++ b/Aaru.Images/ZZZRawImage/Verify.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/Write.cs b/Aaru.Images/ZZZRawImage/Write.cs
index 354578f90..e4893b4f7 100644
--- a/Aaru.Images/ZZZRawImage/Write.cs
+++ b/Aaru.Images/ZZZRawImage/Write.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Track = Aaru.CommonTypes.Structs.Track;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
public sealed partial class ZZZRawImage
{
diff --git a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
index d59b360a5..f1f32a058 100644
--- a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
+++ b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Decoders.DVD;
-namespace Aaru.DiscImages;
+namespace Aaru.Images;
///
/// Implements reading and writing raw (sector by sector) images
diff --git a/Aaru.Tests/Devices/IomegaJaz.cs b/Aaru.Tests/Devices/IomegaJaz.cs
index 36dbadfd3..7a85c7cef 100644
--- a/Aaru.Tests/Devices/IomegaJaz.cs
+++ b/Aaru.Tests/Devices/IomegaJaz.cs
@@ -30,8 +30,8 @@ using System;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
-using Aaru.DiscImages;
using Aaru.Filters;
+using Aaru.Images;
using FluentAssertions.Execution;
using NUnit.Framework;
diff --git a/Aaru.Tests/Devices/LS120.cs b/Aaru.Tests/Devices/LS120.cs
index 8e285f52b..05d18023e 100644
--- a/Aaru.Tests/Devices/LS120.cs
+++ b/Aaru.Tests/Devices/LS120.cs
@@ -30,8 +30,8 @@ using System;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
-using Aaru.DiscImages;
using Aaru.Filters;
+using Aaru.Images;
using FluentAssertions.Execution;
using NUnit.Framework;
diff --git a/Aaru.Tests/Devices/PocketZip.cs b/Aaru.Tests/Devices/PocketZip.cs
index 60f1cde45..05c6863d7 100644
--- a/Aaru.Tests/Devices/PocketZip.cs
+++ b/Aaru.Tests/Devices/PocketZip.cs
@@ -30,8 +30,8 @@ using System;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
-using Aaru.DiscImages;
using Aaru.Filters;
+using Aaru.Images;
using FluentAssertions.Execution;
using NUnit.Framework;
diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs
index 1118c0749..d9aaff1b7 100644
--- a/Aaru.Tests/Images/2MG.cs
+++ b/Aaru.Tests/Images/2MG.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Apple2Mg : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "2mg");
- public override IMediaImage Plugin => new DiscImages.Apple2Mg();
+ public override IMediaImage Plugin => new Aaru.Images.Apple2Mg();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
index 53dfd5b24..7260d953a 100644
--- a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.AaruFormat.Tape;
public class V1 : TapeMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage Plugin => new DiscImages.AaruFormat();
+ public override IMediaImage Plugin => new Aaru.Images.AaruFormat();
public override TapeImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/AaruFormat/V1.cs b/Aaru.Tests/Images/AaruFormat/V1.cs
index 9d8ccf470..317e860d6 100644
--- a/Aaru.Tests/Images/AaruFormat/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/V1.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AaruFormat;
public class V1 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage Plugin => new DiscImages.AaruFormat();
+ public override IMediaImage Plugin => new Aaru.Images.AaruFormat();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs
index 0da5384ef..e185ec723 100644
--- a/Aaru.Tests/Images/Alcohol120.cs
+++ b/Aaru.Tests/Images/Alcohol120.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Alcohol120 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Alcohol 120%");
- public override IMediaImage Plugin => new DiscImages.Alcohol120();
+ public override IMediaImage Plugin => new Aaru.Images.Alcohol120();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs
index 4e0e74935..fa9e2a691 100644
--- a/Aaru.Tests/Images/Anex86.cs
+++ b/Aaru.Tests/Images/Anex86.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Anex86 : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Anex86");
- public override IMediaImage Plugin => new DiscImages.Anex86();
+ public override IMediaImage Plugin => new Aaru.Images.Anex86();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/AppleDOS/DOS.cs b/Aaru.Tests/Images/AppleDOS/DOS.cs
index 0477f3c75..2ffada365 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.AppleDOS;
diff --git a/Aaru.Tests/Images/AppleDOS/DOS32.cs b/Aaru.Tests/Images/AppleDOS/DOS32.cs
index 074f694b4..78c9a99cc 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS32.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS32.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.AppleDOS;
diff --git a/Aaru.Tests/Images/AppleDOS/ProDOS.cs b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
index f31f9d2e5..160e8cea9 100644
--- a/Aaru.Tests/Images/AppleDOS/ProDOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.AppleDOS;
diff --git a/Aaru.Tests/Images/AppleNIB.cs b/Aaru.Tests/Images/AppleNIB.cs
index b5c61fd55..457861090 100644
--- a/Aaru.Tests/Images/AppleNIB.cs
+++ b/Aaru.Tests/Images/AppleNIB.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class AppleNib : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nibbles");
- public override IMediaImage Plugin => new DiscImages.AppleNib();
+ public override IMediaImage Plugin => new Aaru.Images.AppleNib();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Apridisk.cs b/Aaru.Tests/Images/Apridisk.cs
index 9222aeb25..44aac01bb 100644
--- a/Aaru.Tests/Images/Apridisk.cs
+++ b/Aaru.Tests/Images/Apridisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Apridisk : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Apridisk");
- public override IMediaImage Plugin => new DiscImages.Apridisk();
+ public override IMediaImage Plugin => new Aaru.Images.Apridisk();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/BlindWrite4.cs b/Aaru.Tests/Images/BlindWrite4.cs
index 42ff7186c..a227aaaff 100644
--- a/Aaru.Tests/Images/BlindWrite4.cs
+++ b/Aaru.Tests/Images/BlindWrite4.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class BlindWrite4 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 4");
- public override IMediaImage Plugin => new DiscImages.BlindWrite4();
+ public override IMediaImage Plugin => new Aaru.Images.BlindWrite4();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs
index 7189881ce..8e27522b4 100644
--- a/Aaru.Tests/Images/BlindWrite5.cs
+++ b/Aaru.Tests/Images/BlindWrite5.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class BlindWrite5 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 5");
- public override IMediaImage Plugin => new DiscImages.BlindWrite5();
+ public override IMediaImage Plugin => new Aaru.Images.BlindWrite5();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs
index 7766cda50..4440e98c3 100644
--- a/Aaru.Tests/Images/BlindWrite6.cs
+++ b/Aaru.Tests/Images/BlindWrite6.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class BlindWrite6 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 6");
- public override IMediaImage Plugin => new DiscImages.BlindWrite5();
+ public override IMediaImage Plugin => new Aaru.Images.BlindWrite5();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs
index a48fa7018..6ff3cd09a 100644
--- a/Aaru.Tests/Images/BlindWrite7.cs
+++ b/Aaru.Tests/Images/BlindWrite7.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class BlindWrite7 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 7");
- public override IMediaImage Plugin => new DiscImages.BlindWrite5();
+ public override IMediaImage Plugin => new Aaru.Images.BlindWrite5();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs
index 6dcbdc3a6..4b6edd104 100644
--- a/Aaru.Tests/Images/CDRWin.cs
+++ b/Aaru.Tests/Images/CDRWin.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/CDRWin10.cs b/Aaru.Tests/Images/CDRWin10.cs
index 70f2a6bfc..18cb8bdab 100644
--- a/Aaru.Tests/Images/CDRWin10.cs
+++ b/Aaru.Tests/Images/CDRWin10.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Images;
public class CDRWin10 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CDRWin 10");
- public override IMediaImage Plugin => new DiscImages.Alcohol120();
+ public override IMediaImage Plugin => new Aaru.Images.Alcohol120();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/CPCDSK.cs b/Aaru.Tests/Images/CPCDSK.cs
index 865385786..8a38e3cf4 100644
--- a/Aaru.Tests/Images/CPCDSK.cs
+++ b/Aaru.Tests/Images/CPCDSK.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/CisCopy/Uncompressed.cs b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
index 9f4fbc4a3..d22b79dc3 100644
--- a/Aaru.Tests/Images/CisCopy/Uncompressed.cs
+++ b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
@@ -38,7 +38,7 @@ public class Uncompressed : BlockMediaImageTest
{
// TODO: Support compression
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CisCopy");
- public override IMediaImage Plugin => new DiscImages.CisCopy();
+ public override IMediaImage Plugin => new Aaru.Images.CisCopy();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs
index 43d9e25ca..0967f7e36 100644
--- a/Aaru.Tests/Images/CloneCD.cs
+++ b/Aaru.Tests/Images/CloneCD.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/Commodore64/D64.cs b/Aaru.Tests/Images/Commodore64/D64.cs
index 14ea14a2b..d846db3c3 100644
--- a/Aaru.Tests/Images/Commodore64/D64.cs
+++ b/Aaru.Tests/Images/Commodore64/D64.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.Commodore64;
diff --git a/Aaru.Tests/Images/Commodore64/D81.cs b/Aaru.Tests/Images/Commodore64/D81.cs
index afa354cb3..222a8b3b3 100644
--- a/Aaru.Tests/Images/Commodore64/D81.cs
+++ b/Aaru.Tests/Images/Commodore64/D81.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.Commodore64;
diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs
index 6adcd195a..11084901f 100644
--- a/Aaru.Tests/Images/CopyQM.cs
+++ b/Aaru.Tests/Images/CopyQM.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class CopyQm : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CopyQM");
- public override IMediaImage Plugin => new DiscImages.CopyQm();
+ public override IMediaImage Plugin => new Aaru.Images.CopyQm();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/CopyTape.cs b/Aaru.Tests/Images/CopyTape.cs
index f4d8fa36c..d9d8b0f73 100644
--- a/Aaru.Tests/Images/CopyTape.cs
+++ b/Aaru.Tests/Images/CopyTape.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images;
public class CopyTape : TapeMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "copytape");
- public override IMediaImage Plugin => new DiscImages.CopyTape();
+ public override IMediaImage Plugin => new Aaru.Images.CopyTape();
public override TapeImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs
index ea4dbf937..fa6d622b9 100644
--- a/Aaru.Tests/Images/D88.cs
+++ b/Aaru.Tests/Images/D88.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class D88 : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "D88");
- public override IMediaImage Plugin => new DiscImages.D88();
+ public override IMediaImage Plugin => new Aaru.Images.D88();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs
index 70a3b5fbb..56d8a4685 100644
--- a/Aaru.Tests/Images/DART.cs
+++ b/Aaru.Tests/Images/DART.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Dart : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DART");
- public override IMediaImage Plugin => new DiscImages.Dart();
+ public override IMediaImage Plugin => new Aaru.Images.Dart();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiscJuggler.cs b/Aaru.Tests/Images/DiscJuggler.cs
index 0770503c2..2ba7f0fbd 100644
--- a/Aaru.Tests/Images/DiscJuggler.cs
+++ b/Aaru.Tests/Images/DiscJuggler.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class DiscJuggler : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiscJuggler");
- public override IMediaImage Plugin => new DiscImages.DiscJuggler();
+ public override IMediaImage Plugin => new Aaru.Images.DiscJuggler();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs
index 8b8bc9c7d..b1e8d7f5b 100644
--- a/Aaru.Tests/Images/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class DiskCopy42 : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 4.2");
- public override IMediaImage Plugin => new DiscImages.DiskCopy42();
+ public override IMediaImage Plugin => new Aaru.Images.DiskCopy42();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
index fc3554e0f..76db9905a 100644
--- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
@@ -39,7 +39,7 @@ public class DiskCopy42 : BlockMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2");
- public override IMediaImage Plugin => new DiscImages.DiskCopy42();
+ public override IMediaImage Plugin => new Aaru.Images.DiskCopy42();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
index 217093a71..76830c4d6 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy633.NDIF;
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
index e7525730e..c77c70ffb 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy633.NDIF;
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
index 279a705e3..65e95810e 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy633.NDIF;
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCO.cs b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
index cd11ea7d3..656f8ed33 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65;
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
index ca6bf6feb..79ac85bf5 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65;
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
index fa80229e1..e914a9d9c 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65;
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRO.cs b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
index 10d6792b7..e06f134a0 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65;
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
index ea3f81972..347b34953 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65;
diff --git a/Aaru.Tests/Images/DiskDupe.cs b/Aaru.Tests/Images/DiskDupe.cs
index eafb64aa7..115ce7c33 100644
--- a/Aaru.Tests/Images/DiskDupe.cs
+++ b/Aaru.Tests/Images/DiskDupe.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images;
public class DiskDupe : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskDupe");
- public override IMediaImage Plugin => new DiscImages.DiskDupe();
+ public override IMediaImage Plugin => new Aaru.Images.DiskDupe();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
index 878b05811..e20076564 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
@@ -39,7 +39,7 @@ public class DiskCopy42 : BlockMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2");
- public override IMediaImage Plugin => new DiscImages.DiskCopy42();
+ public override IMediaImage Plugin => new Aaru.Images.DiskCopy42();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
index 11879385f..35327cb02 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
index c5e23a833..2d7b9944a 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
index 332d4709b..cc0c88e72 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
index 0b606c4ee..f3a507c21 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
index 3c7ebe1ff..d6ce64f2b 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
index baab3f1d7..8ddc007e7 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
index f93b07e9a..07c441e8b 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
index a5c5a8782..d844c79db 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
index 38d81f973..196fc0f49 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
index cf03f35fb..89a5037c6 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
index c595c0d39..f6f769019 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
index 04f919d6c..a6155f49c 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
@@ -29,7 +29,7 @@
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
diff --git a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
index 0e1753bce..fce1007d7 100644
--- a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
+++ b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskUtilities;
diff --git a/Aaru.Tests/Images/DiskUtilities/Raw.cs b/Aaru.Tests/Images/DiskUtilities/Raw.cs
index 67a2f2f8e..64e839260 100644
--- a/Aaru.Tests/Images/DiskUtilities/Raw.cs
+++ b/Aaru.Tests/Images/DiskUtilities/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskUtilities;
diff --git a/Aaru.Tests/Images/DriDiskCopy.cs b/Aaru.Tests/Images/DriDiskCopy.cs
index 3234c22c9..7fb6e3022 100644
--- a/Aaru.Tests/Images/DriDiskCopy.cs
+++ b/Aaru.Tests/Images/DriDiskCopy.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class DriDiskCopy : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DRI DISKCOPY");
- public override IMediaImage Plugin => new DiscImages.DriDiskCopy();
+ public override IMediaImage Plugin => new Aaru.Images.DriDiskCopy();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/GameJack6.cs b/Aaru.Tests/Images/GameJack6.cs
index 92378af79..c4b3ce8f1 100644
--- a/Aaru.Tests/Images/GameJack6.cs
+++ b/Aaru.Tests/Images/GameJack6.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class GameJack6 : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "GameJack 6");
- public override IMediaImage Plugin => new DiscImages.Alcohol120();
+ public override IMediaImage Plugin => new Aaru.Images.Alcohol120();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/HDCopy.cs b/Aaru.Tests/Images/HDCopy.cs
index aaf673712..f1a2ff8ee 100644
--- a/Aaru.Tests/Images/HDCopy.cs
+++ b/Aaru.Tests/Images/HDCopy.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs
index cbc27a2db..93316bc16 100644
--- a/Aaru.Tests/Images/HxC/ImageDisk.cs
+++ b/Aaru.Tests/Images/HxC/ImageDisk.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.HxC;
diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs
index c4ba73cc1..a7f04a1ae 100644
--- a/Aaru.Tests/Images/HxC/Raw.cs
+++ b/Aaru.Tests/Images/HxC/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.HxC;
diff --git a/Aaru.Tests/Images/HyperV.cs b/Aaru.Tests/Images/HyperV.cs
index f0374a564..3b0fbb723 100644
--- a/Aaru.Tests/Images/HyperV.cs
+++ b/Aaru.Tests/Images/HyperV.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/ImageDisk.cs b/Aaru.Tests/Images/ImageDisk.cs
index 78768297f..a3557ca27 100644
--- a/Aaru.Tests/Images/ImageDisk.cs
+++ b/Aaru.Tests/Images/ImageDisk.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
index 3c7ffed80..85b17c294 100644
--- a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
+++ b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.IsoBuster;
diff --git a/Aaru.Tests/Images/KryoFlux/Raw.cs b/Aaru.Tests/Images/KryoFlux/Raw.cs
index fcbfcf907..d808daa0f 100644
--- a/Aaru.Tests/Images/KryoFlux/Raw.cs
+++ b/Aaru.Tests/Images/KryoFlux/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.KryoFlux;
diff --git a/Aaru.Tests/Images/Lisa/Raw.cs b/Aaru.Tests/Images/Lisa/Raw.cs
index 975ee84bb..3371391a5 100644
--- a/Aaru.Tests/Images/Lisa/Raw.cs
+++ b/Aaru.Tests/Images/Lisa/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.Lisa;
diff --git a/Aaru.Tests/Images/MAME/v1.cs b/Aaru.Tests/Images/MAME/v1.cs
index a84cebdd7..78586c838 100644
--- a/Aaru.Tests/Images/MAME/v1.cs
+++ b/Aaru.Tests/Images/MAME/v1.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MAME;
diff --git a/Aaru.Tests/Images/MAME/v3.cs b/Aaru.Tests/Images/MAME/v3.cs
index 082a74457..f056fc706 100644
--- a/Aaru.Tests/Images/MAME/v3.cs
+++ b/Aaru.Tests/Images/MAME/v3.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MAME;
diff --git a/Aaru.Tests/Images/MAME/v4.cs b/Aaru.Tests/Images/MAME/v4.cs
index 27641e205..5fde595a9 100644
--- a/Aaru.Tests/Images/MAME/v4.cs
+++ b/Aaru.Tests/Images/MAME/v4.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MAME;
diff --git a/Aaru.Tests/Images/MAME/v5/compressed.cs b/Aaru.Tests/Images/MAME/v5/compressed.cs
index cc0474f52..42e42f58d 100644
--- a/Aaru.Tests/Images/MAME/v5/compressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/compressed.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MAME.v5;
diff --git a/Aaru.Tests/Images/MAME/v5/uncompressed.cs b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
index bf18c8659..19530b13f 100644
--- a/Aaru.Tests/Images/MAME/v5/uncompressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MAME.v5;
diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
index a5c65a7b9..fd14e0e60 100644
--- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.MagicISO;
diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs
index 9e45dcebb..2f8da63d8 100644
--- a/Aaru.Tests/Images/MagicISO/Nero.cs
+++ b/Aaru.Tests/Images/MagicISO/Nero.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MagicISO;
public class Nero : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MagicISO", "Nero");
- public override IMediaImage Plugin => new DiscImages.Nero();
+ public override IMediaImage Plugin => new Aaru.Images.Nero();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs
index 69d3f82f0..e256f2ae3 100644
--- a/Aaru.Tests/Images/MaxiDisk.cs
+++ b/Aaru.Tests/Images/MaxiDisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class MaxiDisk : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MaxiDisk");
- public override IMediaImage Plugin => new DiscImages.MaxiDisk();
+ public override IMediaImage Plugin => new Aaru.Images.MaxiDisk();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/NHDr0.cs b/Aaru.Tests/Images/NHDr0.cs
index 5ef12e69e..f230eb348 100644
--- a/Aaru.Tests/Images/NHDr0.cs
+++ b/Aaru.Tests/Images/NHDr0.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/Nero/V1.cs b/Aaru.Tests/Images/Nero/V1.cs
index cb325e56e..2f4da122b 100644
--- a/Aaru.Tests/Images/Nero/V1.cs
+++ b/Aaru.Tests/Images/Nero/V1.cs
@@ -39,7 +39,7 @@ public class V1 : OpticalMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nero Burning ROM", "V1");
- public override IMediaImage Plugin => new DiscImages.Nero();
+ public override IMediaImage Plugin => new Aaru.Images.Nero();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Nero/V2.cs b/Aaru.Tests/Images/Nero/V2.cs
index f90fe97b8..3bb418192 100644
--- a/Aaru.Tests/Images/Nero/V2.cs
+++ b/Aaru.Tests/Images/Nero/V2.cs
@@ -39,7 +39,7 @@ public class V2 : OpticalMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nero Burning ROM", "V2");
- public override IMediaImage Plugin => new DiscImages.Nero();
+ public override IMediaImage Plugin => new Aaru.Images.Nero();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
index 15105898a..4024ec4cc 100644
--- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.PowerISO;
diff --git a/Aaru.Tests/Images/QEMU/HyperV.cs b/Aaru.Tests/Images/QEMU/HyperV.cs
index f59d5d834..b3cf00122 100644
--- a/Aaru.Tests/Images/QEMU/HyperV.cs
+++ b/Aaru.Tests/Images/QEMU/HyperV.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/Parallels.cs b/Aaru.Tests/Images/QEMU/Parallels.cs
index 3ea4e3280..8c4d98941 100644
--- a/Aaru.Tests/Images/QEMU/Parallels.cs
+++ b/Aaru.Tests/Images/QEMU/Parallels.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU;
public class Parallels : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "Parallels");
- public override IMediaImage Plugin => new DiscImages.Parallels();
+ public override IMediaImage Plugin => new Aaru.Images.Parallels();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/QEMU/QCOW.cs b/Aaru.Tests/Images/QEMU/QCOW.cs
index 1b3a04935..9eff75648 100644
--- a/Aaru.Tests/Images/QEMU/QCOW.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/QCOW2.cs b/Aaru.Tests/Images/QEMU/QCOW2.cs
index a9b3b3214..2241143f8 100644
--- a/Aaru.Tests/Images/QEMU/QCOW2.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW2.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/QCOW3.cs b/Aaru.Tests/Images/QEMU/QCOW3.cs
index c4cc73f61..485977cea 100644
--- a/Aaru.Tests/Images/QEMU/QCOW3.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW3.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/QED.cs b/Aaru.Tests/Images/QEMU/QED.cs
index 913bf1d88..3f3bd9412 100644
--- a/Aaru.Tests/Images/QEMU/QED.cs
+++ b/Aaru.Tests/Images/QEMU/QED.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/Raw.cs b/Aaru.Tests/Images/QEMU/Raw.cs
index 36a0f5302..4362dbc85 100644
--- a/Aaru.Tests/Images/QEMU/Raw.cs
+++ b/Aaru.Tests/Images/QEMU/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/VMware5.cs b/Aaru.Tests/Images/QEMU/VMware5.cs
index d7d70d230..48757d327 100644
--- a/Aaru.Tests/Images/QEMU/VMware5.cs
+++ b/Aaru.Tests/Images/QEMU/VMware5.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/VMware6.cs b/Aaru.Tests/Images/QEMU/VMware6.cs
index 081388a15..6cff7bb04 100644
--- a/Aaru.Tests/Images/QEMU/VMware6.cs
+++ b/Aaru.Tests/Images/QEMU/VMware6.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/VirtualBox.cs b/Aaru.Tests/Images/QEMU/VirtualBox.cs
index ed94ca719..024849bbe 100644
--- a/Aaru.Tests/Images/QEMU/VirtualBox.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualBox.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs
index 6d3710572..a27c4c539 100644
--- a/Aaru.Tests/Images/QEMU/VirtualPC.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.QEMU;
diff --git a/Aaru.Tests/Images/RayDIM.cs b/Aaru.Tests/Images/RayDIM.cs
index f9b8edee1..7d9e155b9 100644
--- a/Aaru.Tests/Images/RayDIM.cs
+++ b/Aaru.Tests/Images/RayDIM.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/RsIde.cs b/Aaru.Tests/Images/RsIde.cs
index 351eafe2c..be7c23cec 100644
--- a/Aaru.Tests/Images/RsIde.cs
+++ b/Aaru.Tests/Images/RsIde.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class RsIde : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "RS-IDE");
- public override IMediaImage Plugin => new DiscImages.RsIde();
+ public override IMediaImage Plugin => new Aaru.Images.RsIde();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/SaveDskF.cs b/Aaru.Tests/Images/SaveDskF.cs
index 36bb65906..3de250622 100644
--- a/Aaru.Tests/Images/SaveDskF.cs
+++ b/Aaru.Tests/Images/SaveDskF.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class SaveDskF : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "SaveDskF");
- public override IMediaImage Plugin => new DiscImages.SaveDskF();
+ public override IMediaImage Plugin => new Aaru.Images.SaveDskF();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
index 8049f38cd..2b2288c3e 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
@@ -39,7 +39,7 @@ public class DiskCopy42 : BlockMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2");
- public override IMediaImage Plugin => new DiscImages.DiskCopy42();
+ public override IMediaImage Plugin => new Aaru.Images.DiskCopy42();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
index 00f8aca56..27eb62aee 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.ShrinkWrap;
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
index c7cadc61b..1efc5db91 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
index 02814317a..abdce8bf6 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
index e0463c6a9..e5616adc2 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
index e3fe3c257..6146f4c79 100644
--- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.ShrinkWrap;
diff --git a/Aaru.Tests/Images/TeleDisk.cs b/Aaru.Tests/Images/TeleDisk.cs
index 2cc80ba8c..55a0890c8 100644
--- a/Aaru.Tests/Images/TeleDisk.cs
+++ b/Aaru.Tests/Images/TeleDisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class TeleDisk : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "TeleDisk");
- public override IMediaImage Plugin => new DiscImages.TeleDisk();
+ public override IMediaImage Plugin => new Aaru.Images.TeleDisk();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Toast.cs b/Aaru.Tests/Images/Toast.cs
index f0243d530..902c59420 100644
--- a/Aaru.Tests/Images/Toast.cs
+++ b/Aaru.Tests/Images/Toast.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/UltraISO/Alcohol.cs b/Aaru.Tests/Images/UltraISO/Alcohol.cs
index 3fd5d1875..f6c1ce76b 100644
--- a/Aaru.Tests/Images/UltraISO/Alcohol.cs
+++ b/Aaru.Tests/Images/UltraISO/Alcohol.cs
@@ -39,7 +39,7 @@ public class Alcohol : OpticalMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "Alcohol");
- public override IMediaImage Plugin => new DiscImages.Alcohol120();
+ public override IMediaImage Plugin => new Aaru.Images.Alcohol120();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs
index 3f81c9c4d..737201348 100644
--- a/Aaru.Tests/Images/UltraISO/CloneCD.cs
+++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.UltraISO;
diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
index 52a58f6bc..5d37c22d1 100644
--- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.UltraISO;
diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs
index 813969625..f2749048d 100644
--- a/Aaru.Tests/Images/UltraISO/Nero.cs
+++ b/Aaru.Tests/Images/UltraISO/Nero.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.UltraISO;
public class Nero : OpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "Nero");
- public override IMediaImage Plugin => new DiscImages.Nero();
+ public override IMediaImage Plugin => new Aaru.Images.Nero();
public override OpticalImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/Virtual98.cs b/Aaru.Tests/Images/Virtual98.cs
index 5967bdef0..47a6ca8bd 100644
--- a/Aaru.Tests/Images/Virtual98.cs
+++ b/Aaru.Tests/Images/Virtual98.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images;
public class Virtual98 : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Virtual98");
- public override IMediaImage Plugin => new DiscImages.Virtual98();
+ public override IMediaImage Plugin => new Aaru.Images.Virtual98();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
index 1835ad267..c1b22cf1a 100644
--- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.VirtualBox;
diff --git a/Aaru.Tests/Images/VirtualPC/Raw.cs b/Aaru.Tests/Images/VirtualPC/Raw.cs
index f275c0711..c4d4f7d48 100644
--- a/Aaru.Tests/Images/VirtualPC/Raw.cs
+++ b/Aaru.Tests/Images/VirtualPC/Raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.VirtualPC;
diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
index 366abcccf..d542d8392 100644
--- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.VirtualPC;
diff --git a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
index fbf1618cf..39fa6d6fb 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.cooked;
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
index 798b3f6d3..d40522c02 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.cooked;
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
index 79c8d5749..079eed708 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.cooked;
diff --git a/Aaru.Tests/Images/cdrdao/raw/nosub.cs b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
index 6bf618a6b..b35ccd98a 100644
--- a/Aaru.Tests/Images/cdrdao/raw/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.raw;
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw.cs b/Aaru.Tests/Images/cdrdao/raw/rw.cs
index d8181386b..e146bdb65 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.raw;
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
index eaf173f67..6b9ec2ff1 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.cdrdao.raw;
diff --git a/Aaru.Tests/Images/partclone.cs b/Aaru.Tests/Images/partclone.cs
index d1a7c55f8..ef4762b27 100644
--- a/Aaru.Tests/Images/partclone.cs
+++ b/Aaru.Tests/Images/partclone.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images;
diff --git a/Aaru.Tests/Images/pce/DiskCopy42.cs b/Aaru.Tests/Images/pce/DiskCopy42.cs
index bc85103e3..b25323771 100644
--- a/Aaru.Tests/Images/pce/DiskCopy42.cs
+++ b/Aaru.Tests/Images/pce/DiskCopy42.cs
@@ -39,7 +39,7 @@ public class DiskCopy42 : BlockMediaImageTest
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "DiskCopy 4.2");
- public override IMediaImage Plugin => new DiscImages.DiskCopy42();
+ public override IMediaImage Plugin => new Aaru.Images.DiskCopy42();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/pce/ImageDisk.cs b/Aaru.Tests/Images/pce/ImageDisk.cs
index 2d2eb80c1..a496369e8 100644
--- a/Aaru.Tests/Images/pce/ImageDisk.cs
+++ b/Aaru.Tests/Images/pce/ImageDisk.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.pce;
diff --git a/Aaru.Tests/Images/pce/TeleDisk.cs b/Aaru.Tests/Images/pce/TeleDisk.cs
index 020aeb517..08903fe4a 100644
--- a/Aaru.Tests/Images/pce/TeleDisk.cs
+++ b/Aaru.Tests/Images/pce/TeleDisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce;
public class TeleDisk : BlockMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "TeleDisk");
- public override IMediaImage Plugin => new DiscImages.TeleDisk();
+ public override IMediaImage Plugin => new Aaru.Images.TeleDisk();
public override BlockImageTestExpected[] Tests => new[]
{
diff --git a/Aaru.Tests/Images/pce/XDF.cs b/Aaru.Tests/Images/pce/XDF.cs
index d80b080b4..06ed98855 100644
--- a/Aaru.Tests/Images/pce/XDF.cs
+++ b/Aaru.Tests/Images/pce/XDF.cs
@@ -30,7 +30,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.pce;
diff --git a/Aaru.Tests/Images/pce/raw.cs b/Aaru.Tests/Images/pce/raw.cs
index eefc1a879..659722f1f 100644
--- a/Aaru.Tests/Images/pce/raw.cs
+++ b/Aaru.Tests/Images/pce/raw.cs
@@ -29,7 +29,7 @@
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using NUnit.Framework;
namespace Aaru.Tests.Images.pce;
diff --git a/Aaru.Tests/Issues/257.cs b/Aaru.Tests/Issues/257.cs
index eaa04dca7..8fd56cb07 100644
--- a/Aaru.Tests/Issues/257.cs
+++ b/Aaru.Tests/Issues/257.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/286.cs b/Aaru.Tests/Issues/286.cs
index 932e3f9bb..a335b2640 100644
--- a/Aaru.Tests/Issues/286.cs
+++ b/Aaru.Tests/Issues/286.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/288/18Wheeler.cs b/Aaru.Tests/Issues/288/18Wheeler.cs
index cbae8eafa..5ad94232a 100644
--- a/Aaru.Tests/Issues/288/18Wheeler.cs
+++ b/Aaru.Tests/Issues/288/18Wheeler.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues._288;
diff --git a/Aaru.Tests/Issues/288/ArcadeHits.cs b/Aaru.Tests/Issues/288/ArcadeHits.cs
index 76bba247f..4f123e2b2 100644
--- a/Aaru.Tests/Issues/288/ArcadeHits.cs
+++ b/Aaru.Tests/Issues/288/ArcadeHits.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues._288;
diff --git a/Aaru.Tests/Issues/288/Roadsters.cs b/Aaru.Tests/Issues/288/Roadsters.cs
index d22b5cb5d..851cf320d 100644
--- a/Aaru.Tests/Issues/288/Roadsters.cs
+++ b/Aaru.Tests/Issues/288/Roadsters.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues._288;
diff --git a/Aaru.Tests/Issues/299.cs b/Aaru.Tests/Issues/299.cs
index f5bacb3f3..291af7f03 100644
--- a/Aaru.Tests/Issues/299.cs
+++ b/Aaru.Tests/Issues/299.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/379.cs b/Aaru.Tests/Issues/379.cs
index cb8c59cf8..9aed6e6b5 100644
--- a/Aaru.Tests/Issues/379.cs
+++ b/Aaru.Tests/Issues/379.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/398.cs b/Aaru.Tests/Issues/398.cs
index c557b4593..c427674df 100644
--- a/Aaru.Tests/Issues/398.cs
+++ b/Aaru.Tests/Issues/398.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/448.cs b/Aaru.Tests/Issues/448.cs
index 12bbb743e..f8fccc733 100644
--- a/Aaru.Tests/Issues/448.cs
+++ b/Aaru.Tests/Issues/448.cs
@@ -3,7 +3,7 @@ using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.Tests.Images;
-using BlindWrite5 = Aaru.DiscImages.BlindWrite5;
+using BlindWrite5 = Aaru.Images.BlindWrite5;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/450.cs b/Aaru.Tests/Issues/450.cs
index 03c053a34..e7a747158 100644
--- a/Aaru.Tests/Issues/450.cs
+++ b/Aaru.Tests/Issues/450.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/623.cs b/Aaru.Tests/Issues/623.cs
index 513d24ed4..7472788db 100644
--- a/Aaru.Tests/Issues/623.cs
+++ b/Aaru.Tests/Issues/623.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using Aaru.Tests.WritableImages;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/624.cs b/Aaru.Tests/Issues/624.cs
index 7a207280f..ea3a7f8f1 100644
--- a/Aaru.Tests/Issues/624.cs
+++ b/Aaru.Tests/Issues/624.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using Aaru.Tests.WritableImages;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/Issues/625.cs b/Aaru.Tests/Issues/625.cs
index 3baf47872..c1d01282a 100644
--- a/Aaru.Tests/Issues/625.cs
+++ b/Aaru.Tests/Issues/625.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
using Aaru.Tests.WritableImages;
namespace Aaru.Tests.Issues;
diff --git a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
index e882dace0..6aad34106 100644
--- a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
@@ -9,8 +9,8 @@ namespace Aaru.Tests.WritableImages.AaruFormat.V1;
public class FromAaru : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage InputPlugin => new DiscImages.AaruFormat();
- public override IWritableImage OutputPlugin => new DiscImages.AaruFormat();
+ public override IMediaImage InputPlugin => new Aaru.Images.AaruFormat();
+ public override IWritableImage OutputPlugin => new Aaru.Images.AaruFormat();
public override string OutputExtension => "aif";
public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
index 9a9d9b756..ae49cc428 100644
--- a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.WritableImages.Alcohol;
@@ -10,7 +10,7 @@ namespace Aaru.Tests.WritableImages.Alcohol;
public class FromAaru : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage InputPlugin => new DiscImages.AaruFormat();
+ public override IMediaImage InputPlugin => new Aaru.Images.AaruFormat();
public override IWritableImage OutputPlugin => new Alcohol120();
public override string OutputExtension => "mds";
diff --git a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
index 0c4ad9e9f..b6666a7c3 100644
--- a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.WritableImages.CDRDAO;
@@ -10,7 +10,7 @@ namespace Aaru.Tests.WritableImages.CDRDAO;
public class FromAaru : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage InputPlugin => new DiscImages.AaruFormat();
+ public override IMediaImage InputPlugin => new Aaru.Images.AaruFormat();
public override IWritableImage OutputPlugin => new Cdrdao();
public override string OutputExtension => "toc";
diff --git a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
index 572956b8e..bf7bf08f5 100644
--- a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.WritableImages.CDRWin;
@@ -10,7 +10,7 @@ namespace Aaru.Tests.WritableImages.CDRWin;
public class FromAaru : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage InputPlugin => new DiscImages.AaruFormat();
+ public override IMediaImage InputPlugin => new Aaru.Images.AaruFormat();
public override IWritableImage OutputPlugin => new CdrWin();
public override string OutputExtension => "cue";
diff --git a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
index ec584daaf..90510a46c 100644
--- a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
-using Aaru.DiscImages;
+using Aaru.Images;
namespace Aaru.Tests.WritableImages.CloneCD;
@@ -10,7 +10,7 @@ namespace Aaru.Tests.WritableImages.CloneCD;
public class FromAaru : WritableOpticalMediaImageTest
{
public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
- public override IMediaImage InputPlugin => new DiscImages.AaruFormat();
+ public override IMediaImage InputPlugin => new Aaru.Images.AaruFormat();
public override IWritableImage OutputPlugin => new CloneCd();
public override string OutputExtension => "ccd";
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4827049a9..0b16a188e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,9 +82,9 @@ Aaru is intentionally very modular. Here's a list of them:
has high-level calls in its own folder. Device commands are separated by protocol standard, or vendor name.
* [Aaru.Device.Report](https://github.com/aaru-dps/Aaru/tree/master/Aaru.Device.Report) - This is a separate application
in C89 designed to create device reports on environments where you can't run .NET or Mono but can run Linux.
-* [Aaru.DiscImages](https://github.com/aaru-dps/Aaru/tree/master/Aaru.DiscImages) - This module provides reading
+* [Aaru.Images](https://github.com/aaru-dps/Aaru/tree/master/Aaru.Images) - This module provides reading
capabilities for the disk/disc images, one per file.
-* [Aaru.DiscImages](https://github.com/aaru-dps/Aaru.Dto) - This module provides common structures between Aaru and
+* [Aaru.Dto](https://github.com/aaru-dps/Aaru.Dto) - This module provides common structures between Aaru and
Aaru.Server.
* [Aaru.Filesystems](https://github.com/aaru-dps/Aaru/tree/master/Aaru.Filesystems) - This module provides the
filesystem support. If only identification is implemented a single file should be used. For full read-only support, a