diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlAnimationHeader.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlAnimationHeader.cs
similarity index 79%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlAnimationHeader.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlAnimationHeader.cs
index 3a11ff88f..647e8bbc7 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlAnimationHeader.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlAnimationHeader.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlAnimationHeader : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlBitDepth.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlBitDepth.cs
similarity index 98%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlBitDepth.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlBitDepth.cs
index fd842b363..0a9db0f57 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlBitDepth.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlBitDepth.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 /// <summary>
 /// Represents the JPEG XL Bit Depth image metadata.
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlCodecMetadata.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCodecMetadata.cs
similarity index 86%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlCodecMetadata.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCodecMetadata.cs
index d26d79d9a..5a3aaeecb 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlCodecMetadata.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCodecMetadata.cs
@@ -1,19 +1,19 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlCodecMetadata
 {
     public JxlImageMetadata? ImageMetadata { get; set; }
 
-    public SizeHeader Size { get; set; }
+    public JxlSizeHeader? Size { get; set; }
 
     public JxlCustomTransformData? CustomTransformData { get; set; }
 
-    public int XSize => this.Size.XSize;
+    public int XSize => this.Size?.XSize ?? 0;
 
-    public int YSize => this.Size.YSize;
+    public int YSize => this.Size?.YSize ?? 0;
 
     public int GetOrientedPreviewXSize(bool keepOrientation)
     {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlCustomTransformData.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCustomTransformData.cs
similarity index 92%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlCustomTransformData.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCustomTransformData.cs
index 8b938b736..3b3c6bc20 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlCustomTransformData.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlCustomTransformData.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlCustomTransformData : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlExifOrientation.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExifOrientation.cs
similarity index 83%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlExifOrientation.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExifOrientation.cs
index b5f52d67f..406e7e9a1 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlExifOrientation.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExifOrientation.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal enum JxlExifOrientation : byte
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannel.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannel.cs
similarity index 86%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannel.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannel.cs
index 1fb39d860..8e2b842a5 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannel.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal enum JxlExtraChannel : byte
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannelInfo.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannelInfo.cs
similarity index 85%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannelInfo.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannelInfo.cs
index 0279c2d7a..5b492b102 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlExtraChannelInfo.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlExtraChannelInfo.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlExtraChannelInfo : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlImageMetadata.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlImageMetadata.cs
similarity index 96%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlImageMetadata.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlImageMetadata.cs
index 10855235b..d9bc419e9 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlImageMetadata.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlImageMetadata.cs
@@ -2,9 +2,9 @@
 // Licensed under the Six Labors Split License.
 
 using System.Diagnostics;
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlImageMetadata : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlOpsinInverseMatrix.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlOpsinInverseMatrix.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlOpsinInverseMatrix.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlOpsinInverseMatrix.cs
index d0a14ffb4..357ce27c3 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlOpsinInverseMatrix.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlOpsinInverseMatrix.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.Formats.Jxl.Fields;
 using SixLabors.ImageSharp.Formats.Jxl.Processing;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlOpsinInverseMatrix : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlPreviewHeader.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlPreviewHeader.cs
similarity index 93%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlPreviewHeader.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlPreviewHeader.cs
index 0c2bbab2e..e46763cfe 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlPreviewHeader.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlPreviewHeader.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlPreviewHeader : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlSizeHeader.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlSizeHeader.cs
similarity index 94%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlSizeHeader.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlSizeHeader.cs
index 9c6e66dbe..5da30b8a0 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlSizeHeader.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlSizeHeader.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlSizeHeader : IJxlFields
 {
diff --git a/src/ImageSharp/Formats/Jxl/Metadata/JxlToneMapping.cs b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlToneMapping.cs
similarity index 74%
rename from src/ImageSharp/Formats/Jxl/Metadata/JxlToneMapping.cs
rename to src/ImageSharp/Formats/Jxl/IO/Metadata/JxlToneMapping.cs
index 1698b0701..9a399dc0b 100644
--- a/src/ImageSharp/Formats/Jxl/Metadata/JxlToneMapping.cs
+++ b/src/ImageSharp/Formats/Jxl/IO/Metadata/JxlToneMapping.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.Jxl.IO;
+using SixLabors.ImageSharp.Formats.Jxl.Fields;
 
-namespace SixLabors.ImageSharp.Formats.Jxl.Metadata;
+namespace SixLabors.ImageSharp.Formats.Jxl.IO.Metadata;
 
 internal sealed class JxlToneMapping : IJxlFields
 {
@@ -15,7 +15,7 @@ internal sealed class JxlToneMapping : IJxlFields
 
     public bool RelativeToMaxDisplay { get; set; }
 
-    public float LinearBelow { get; set;}
+    public float LinearBelow { get; set; }
 
     public bool Visit(JxlVisitor visitor) => throw new NotImplementedException();
 }