diff --git a/src/ImageSharp/ColorSpaces/CieLab.cs b/src/ImageSharp/ColorSpaces/CieLab.cs
deleted file mode 100644
index 2346b395c..000000000
--- a/src/ImageSharp/ColorSpaces/CieLab.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents a CIE L*a*b* 1976 color.
-/// <see href="https://en.wikipedia.org/wiki/Lab_color_space"/>
-/// </summary>
-public readonly struct CieLab : IEquatable<CieLab>
-{
-    /// <summary>
-    /// D50 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = Illuminants.D50;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLab"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="a">The a (green - magenta) component.</param>
-    /// <param name="b">The b (blue - yellow) component.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLab(float l, float a, float b)
-        : this(l, a, b, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLab"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="a">The a (green - magenta) component.</param>
-    /// <param name="b">The b (blue - yellow) component.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLab(float l, float a, float b, CieXyz whitePoint)
-        : this(new Vector3(l, a, b), whitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLab"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, a, b components.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLab(Vector3 vector)
-        : this(vector, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLab"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, a, b components.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLab(Vector3 vector, CieXyz whitePoint)
-        : this()
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.L = vector.X;
-        this.A = vector.Y;
-        this.B = vector.Z;
-        this.WhitePoint = whitePoint;
-    }
-
-    /// <summary>
-    /// Gets the lightness dimension.
-    /// <remarks>A value usually ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the a color component.
-    /// <remarks>A value usually ranging from -100 to 100. Negative is green, positive magenta.</remarks>
-    /// </summary>
-    public readonly float A { get; }
-
-    /// <summary>
-    /// Gets the b color component.
-    /// <remarks>A value usually ranging from -100 to 100. Negative is blue, positive is yellow</remarks>
-    /// </summary>
-    public readonly float B { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieLab"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieLab"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLab"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieLab left, CieLab right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieLab"/> objects for inequality
-    /// </summary>
-    /// <param name="left">The <see cref="CieLab"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLab"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieLab left, CieLab right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.L, this.A, this.B, this.WhitePoint);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieLab({this.L:#0.##}, {this.A:#0.##}, {this.B:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is CieLab other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieLab other) =>
-        this.L.Equals(other.L)
-        && this.A.Equals(other.A)
-        && this.B.Equals(other.B)
-        && this.WhitePoint.Equals(other.WhitePoint);
-}
diff --git a/src/ImageSharp/ColorSpaces/CieLch.cs b/src/ImageSharp/ColorSpaces/CieLch.cs
deleted file mode 100644
index 48e8e2c6d..000000000
--- a/src/ImageSharp/ColorSpaces/CieLch.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents the CIE L*C*h°, cylindrical form of the CIE L*a*b* 1976 color.
-/// <see href="https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC"/>
-/// </summary>
-public readonly struct CieLch : IEquatable<CieLch>
-{
-    /// <summary>
-    /// D50 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = Illuminants.D50;
-
-    private static readonly Vector3 Min = new(0, -200, 0);
-    private static readonly Vector3 Max = new(100, 200, 360);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLch"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="c">The chroma, relative saturation.</param>
-    /// <param name="h">The hue in degrees.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLch(float l, float c, float h)
-        : this(l, c, h, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLch"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="c">The chroma, relative saturation.</param>
-    /// <param name="h">The hue in degrees.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLch(float l, float c, float h, CieXyz whitePoint)
-        : this(new Vector3(l, c, h), whitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLch"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, c, h components.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLch(Vector3 vector)
-        : this(vector, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLch"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, c, h components.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLch(Vector3 vector, CieXyz whitePoint)
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.L = vector.X;
-        this.C = vector.Y;
-        this.H = vector.Z;
-        this.WhitePoint = whitePoint;
-    }
-
-    /// <summary>
-    /// Gets the lightness dimension.
-    /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the a chroma component.
-    /// <remarks>A value ranging from 0 to 200.</remarks>
-    /// </summary>
-    public readonly float C { get; }
-
-    /// <summary>
-    /// Gets the h° hue component in degrees.
-    /// <remarks>A value ranging from 0 to 360.</remarks>
-    /// </summary>
-    public readonly float H { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieLch"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieLch"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLch"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieLch left, CieLch right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieLch"/> objects for inequality
-    /// </summary>
-    /// <param name="left">The <see cref="CieLch"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLch"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieLch left, CieLch right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override int GetHashCode()
-        => HashCode.Combine(this.L, this.C, this.H, this.WhitePoint);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieLch({this.L:#0.##}, {this.C:#0.##}, {this.H:#0.##})");
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override bool Equals(object? obj) => obj is CieLch other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieLch other)
-        => this.L.Equals(other.L)
-        && this.C.Equals(other.C)
-        && this.H.Equals(other.H)
-        && this.WhitePoint.Equals(other.WhitePoint);
-
-    /// <summary>
-    /// Computes the saturation of the color (chroma normalized by lightness)
-    /// </summary>
-    /// <remarks>
-    /// A value ranging from 0 to 100.
-    /// </remarks>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public float Saturation()
-    {
-        float result = 100 * (this.C / this.L);
-
-        if (float.IsNaN(result))
-        {
-            return 0;
-        }
-
-        return result;
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/CieLchuv.cs b/src/ImageSharp/ColorSpaces/CieLchuv.cs
deleted file mode 100644
index 4d47be5aa..000000000
--- a/src/ImageSharp/ColorSpaces/CieLchuv.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents the CIE L*C*h°, cylindrical form of the CIE L*u*v* 1976 color.
-/// <see href="https://en.wikipedia.org/wiki/CIELAB_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC"/>
-/// </summary>
-public readonly struct CieLchuv : IEquatable<CieLchuv>
-{
-    private static readonly Vector3 Min = new(0, -200, 0);
-    private static readonly Vector3 Max = new(100, 200, 360);
-
-    /// <summary>
-    /// D50 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = Illuminants.D65;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLchuv"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="c">The chroma, relative saturation.</param>
-    /// <param name="h">The hue in degrees.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLchuv(float l, float c, float h)
-        : this(l, c, h, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLchuv"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="c">The chroma, relative saturation.</param>
-    /// <param name="h">The hue in degrees.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLchuv(float l, float c, float h, CieXyz whitePoint)
-       : this(new Vector3(l, c, h), whitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLchuv"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, c, h components.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLchuv(Vector3 vector)
-        : this(vector, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLchuv"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, c, h components.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLchuv(Vector3 vector, CieXyz whitePoint)
-        : this()
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.L = vector.X;
-        this.C = vector.Y;
-        this.H = vector.Z;
-        this.WhitePoint = whitePoint;
-    }
-
-    /// <summary>
-    /// Gets the lightness dimension.
-    /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the a chroma component.
-    /// <remarks>A value ranging from 0 to 200.</remarks>
-    /// </summary>
-    public readonly float C { get; }
-
-    /// <summary>
-    /// Gets the h° hue component in degrees.
-    /// <remarks>A value ranging from 0 to 360.</remarks>
-    /// </summary>
-    public readonly float H { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieLchuv"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieLchuv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLchuv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator ==(CieLchuv left, CieLchuv right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieLchuv"/> objects for inequality
-    /// </summary>
-    /// <param name="left">The <see cref="CieLchuv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLchuv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator !=(CieLchuv left, CieLchuv right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.L, this.C, this.H, this.WhitePoint);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieLchuv({this.L:#0.##}, {this.C:#0.##}, {this.H:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is CieLchuv other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieLchuv other)
-        => this.L.Equals(other.L)
-        && this.C.Equals(other.C)
-        && this.H.Equals(other.H)
-        && this.WhitePoint.Equals(other.WhitePoint);
-
-    /// <summary>
-    /// Computes the saturation of the color (chroma normalized by lightness)
-    /// </summary>
-    /// <remarks>
-    /// A value ranging from 0 to 100.
-    /// </remarks>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public float Saturation()
-    {
-        float result = 100 * (this.C / this.L);
-
-        if (float.IsNaN(result))
-        {
-            return 0;
-        }
-
-        return result;
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/CieLuv.cs b/src/ImageSharp/ColorSpaces/CieLuv.cs
deleted file mode 100644
index 04bc96cfa..000000000
--- a/src/ImageSharp/ColorSpaces/CieLuv.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// The CIE 1976 (L*, u*, v*) color space, commonly known by its abbreviation CIELUV, is a color space adopted by the International
-/// Commission on Illumination (CIE) in 1976, as a simple-to-compute transformation of the 1931 CIE XYZ color space, but which
-/// attempted perceptual uniformity
-/// <see href="https://en.wikipedia.org/wiki/CIELUV"/>
-/// </summary>
-public readonly struct CieLuv : IEquatable<CieLuv>
-{
-    /// <summary>
-    /// D65 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = Illuminants.D65;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLuv"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="u">The blue-yellow chromaticity coordinate of the given whitepoint.</param>
-    /// <param name="v">The red-green chromaticity coordinate of the given whitepoint.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLuv(float l, float u, float v)
-        : this(l, u, v, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLuv"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="u">The blue-yellow chromaticity coordinate of the given whitepoint.</param>
-    /// <param name="v">The red-green chromaticity coordinate of the given whitepoint.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLuv(float l, float u, float v, CieXyz whitePoint)
-        : this(new Vector3(l, u, v), whitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLuv"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, u, v components.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLuv(Vector3 vector)
-        : this(vector, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieLuv"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, u, v components.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLuv(Vector3 vector, CieXyz whitePoint)
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.L = vector.X;
-        this.U = vector.Y;
-        this.V = vector.Z;
-        this.WhitePoint = whitePoint;
-    }
-
-    /// <summary>
-    /// Gets the lightness dimension
-    /// <remarks>A value usually ranging between 0 and 100.</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the blue-yellow chromaticity coordinate of the given whitepoint.
-    /// <remarks>A value usually ranging between -100 and 100.</remarks>
-    /// </summary>
-    public readonly float U { get; }
-
-    /// <summary>
-    /// Gets the red-green chromaticity coordinate of the given whitepoint.
-    /// <remarks>A value usually ranging between -100 and 100.</remarks>
-    /// </summary>
-    public readonly float V { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieLuv"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieLuv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLuv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieLuv left, CieLuv right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieLuv"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieLuv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieLuv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieLuv left, CieLuv right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.L, this.U, this.V, this.WhitePoint);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieLuv({this.L:#0.##}, {this.U:#0.##}, {this.V:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is CieLuv other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieLuv other)
-        => this.L.Equals(other.L)
-        && this.U.Equals(other.U)
-        && this.V.Equals(other.V)
-        && this.WhitePoint.Equals(other.WhitePoint);
-}
diff --git a/src/ImageSharp/ColorSpaces/CieXyy.cs b/src/ImageSharp/ColorSpaces/CieXyy.cs
deleted file mode 100644
index 6b7d2e6cb..000000000
--- a/src/ImageSharp/ColorSpaces/CieXyy.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an CIE xyY 1931 color
-/// <see href="https://en.wikipedia.org/wiki/CIE_1931_color_space#CIE_xy_chromaticity_diagram_and_the_CIE_xyY_color_space"/>
-/// </summary>
-public readonly struct CieXyy : IEquatable<CieXyy>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyy"/> struct.
-    /// </summary>
-    /// <param name="x">The x chroma component.</param>
-    /// <param name="y">The y chroma component.</param>
-    /// <param name="yl">The y luminance component.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyy(float x, float y, float yl)
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.X = x;
-        this.Y = y;
-        this.Yl = yl;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyy"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the x, y, Y components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyy(Vector3 vector)
-        : this()
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.X = vector.X;
-        this.Y = vector.Y;
-        this.Yl = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the X chrominance component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float X { get; }
-
-    /// <summary>
-    /// Gets the Y chrominance component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float Y { get; }
-
-    /// <summary>
-    /// Gets the Y luminance component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float Yl { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieXyy"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyy"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyy"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieXyy left, CieXyy right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieXyy"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyy"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyy"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieXyy left, CieXyy right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.X, this.Y, this.Yl);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieXyy({this.X:#0.##}, {this.Y:#0.##}, {this.Yl:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is CieXyy other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieXyy other)
-        => this.X.Equals(other.X)
-        && this.Y.Equals(other.Y)
-        && this.Yl.Equals(other.Yl);
-}
diff --git a/src/ImageSharp/ColorSpaces/CieXyz.cs b/src/ImageSharp/ColorSpaces/CieXyz.cs
deleted file mode 100644
index 2ac9c9f28..000000000
--- a/src/ImageSharp/ColorSpaces/CieXyz.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an CIE XYZ 1931 color
-/// <see href="https://en.wikipedia.org/wiki/CIE_1931_color_space#Definition_of_the_CIE_XYZ_color_space"/>
-/// </summary>
-public readonly struct CieXyz : IEquatable<CieXyz>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyz"/> struct.
-    /// </summary>
-    /// <param name="x">X is a mix (a linear combination) of cone response curves chosen to be nonnegative</param>
-    /// <param name="y">The y luminance component.</param>
-    /// <param name="z">Z is quasi-equal to blue stimulation, or the S cone of the human eye.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyz(float x, float y, float z)
-        : this(new Vector3(x, y, z))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyz"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the x, y, z components.</param>
-    public CieXyz(Vector3 vector)
-        : this()
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.X = vector.X;
-        this.Y = vector.Y;
-        this.Z = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the X component. A mix (a linear combination) of cone response curves chosen to be nonnegative.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float X { get; }
-
-    /// <summary>
-    /// Gets the Y luminance component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float Y { get; }
-
-    /// <summary>
-    /// Gets the Z component. Quasi-equal to blue stimulation, or the S cone response.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float Z { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieXyz"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyz"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyz"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieXyz left, CieXyz right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieXyz"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyz"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyz"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieXyz left, CieXyz right) => !left.Equals(right);
-
-    /// <summary>
-    /// Returns a new <see cref="Vector3"/> representing this instance.
-    /// </summary>
-    /// <returns>The <see cref="Vector3"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Vector3 ToVector3() => new(this.X, this.Y, this.Z);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.X, this.Y, this.Z);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"CieXyz({this.X:#0.##}, {this.Y:#0.##}, {this.Z:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is CieXyz other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieXyz other)
-        => this.X.Equals(other.X)
-        && this.Y.Equals(other.Y)
-        && this.Z.Equals(other.Z);
-}
diff --git a/src/ImageSharp/ColorSpaces/Cmyk.cs b/src/ImageSharp/ColorSpaces/Cmyk.cs
deleted file mode 100644
index a5aacf38a..000000000
--- a/src/ImageSharp/ColorSpaces/Cmyk.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an CMYK (cyan, magenta, yellow, keyline) color.
-/// </summary>
-public readonly struct Cmyk : IEquatable<Cmyk>
-{
-    private static readonly Vector4 Min = Vector4.Zero;
-    private static readonly Vector4 Max = Vector4.One;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Cmyk"/> struct.
-    /// </summary>
-    /// <param name="c">The cyan component.</param>
-    /// <param name="m">The magenta component.</param>
-    /// <param name="y">The yellow component.</param>
-    /// <param name="k">The keyline black component.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Cmyk(float c, float m, float y, float k)
-        : this(new Vector4(c, m, y, k))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Cmyk"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the c, m, y, k components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Cmyk(Vector4 vector)
-    {
-        vector = Numerics.Clamp(vector, Min, Max);
-        this.C = vector.X;
-        this.M = vector.Y;
-        this.Y = vector.Z;
-        this.K = vector.W;
-    }
-
-    /// <summary>
-    /// Gets the cyan color component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float C { get; }
-
-    /// <summary>
-    /// Gets the magenta color component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float M { get; }
-
-    /// <summary>
-    /// Gets the yellow color component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float Y { get; }
-
-    /// <summary>
-    /// Gets the keyline black color component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float K { get; }
-
-    /// <summary>
-    /// Compares two <see cref="Cmyk"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="Cmyk"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Cmyk"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(Cmyk left, Cmyk right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="Cmyk"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="Cmyk"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Cmyk"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(Cmyk left, Cmyk right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.C, this.M, this.Y, this.K);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"Cmyk({this.C:#0.##}, {this.M:#0.##}, {this.Y:#0.##}, {this.K:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Cmyk other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(Cmyk other)
-        => this.C.Equals(other.C)
-        && this.M.Equals(other.M)
-        && this.Y.Equals(other.Y)
-        && this.K.Equals(other.K);
-}
diff --git a/src/ImageSharp/ColorSpaces/Companding/GammaCompanding.cs b/src/ImageSharp/ColorSpaces/Companding/GammaCompanding.cs
deleted file mode 100644
index e5d98430f..000000000
--- a/src/ImageSharp/ColorSpaces/Companding/GammaCompanding.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Companding;
-
-/// <summary>
-/// Implements gamma companding.
-/// </summary>
-/// <remarks>
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_RGB_to_XYZ.html"/>
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_RGB.html"/>
-/// </remarks>
-public static class GammaCompanding
-{
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <param name="gamma">The gamma value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Expand(float channel, float gamma) => MathF.Pow(channel, gamma);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <param name="gamma">The gamma value.</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Compress(float channel, float gamma) => MathF.Pow(channel, 1 / gamma);
-}
diff --git a/src/ImageSharp/ColorSpaces/Companding/LCompanding.cs b/src/ImageSharp/ColorSpaces/Companding/LCompanding.cs
deleted file mode 100644
index db44fd069..000000000
--- a/src/ImageSharp/ColorSpaces/Companding/LCompanding.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Companding;
-
-/// <summary>
-/// Implements L* companding.
-/// </summary>
-/// <remarks>
-/// For more info see:
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_RGB_to_XYZ.html"/>
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_RGB.html"/>
-/// </remarks>
-public static class LCompanding
-{
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Expand(float channel)
-        => channel <= 0.08F ? (100F * channel) / CieConstants.Kappa : Numerics.Pow3((channel + 0.16F) / 1.16F);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="channel">The channel value</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Compress(float channel)
-        => channel <= CieConstants.Epsilon ? (channel * CieConstants.Kappa) / 100F : (1.16F * MathF.Pow(channel, 0.3333333F)) - 0.16F;
-}
diff --git a/src/ImageSharp/ColorSpaces/Companding/Rec2020Companding.cs b/src/ImageSharp/ColorSpaces/Companding/Rec2020Companding.cs
deleted file mode 100644
index 450097618..000000000
--- a/src/ImageSharp/ColorSpaces/Companding/Rec2020Companding.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Companding;
-
-/// <summary>
-/// Implements Rec. 2020 companding function.
-/// </summary>
-/// <remarks>
-/// <see href="http://en.wikipedia.org/wiki/Rec._2020"/>
-/// </remarks>
-public static class Rec2020Companding
-{
-    private const float Alpha = 1.09929682680944F;
-    private const float AlphaMinusOne = Alpha - 1F;
-    private const float Beta = 0.018053968510807F;
-    private const float InverseBeta = Beta * 4.5F;
-    private const float Epsilon = 1 / 0.45F;
-
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Expand(float channel)
-        => channel < InverseBeta ? channel / 4.5F : MathF.Pow((channel + AlphaMinusOne) / Alpha, Epsilon);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Compress(float channel)
-        => channel < Beta ? 4.5F * channel : (Alpha * MathF.Pow(channel, 0.45F)) - AlphaMinusOne;
-}
diff --git a/src/ImageSharp/ColorSpaces/Companding/Rec709Companding.cs b/src/ImageSharp/ColorSpaces/Companding/Rec709Companding.cs
deleted file mode 100644
index 6e4767bcd..000000000
--- a/src/ImageSharp/ColorSpaces/Companding/Rec709Companding.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Companding;
-
-/// <summary>
-/// Implements the Rec. 709 companding function.
-/// </summary>
-/// <remarks>
-/// http://en.wikipedia.org/wiki/Rec._709
-/// </remarks>
-public static class Rec709Companding
-{
-    private const float Epsilon = 1 / 0.45F;
-
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Expand(float channel)
-        => channel < 0.081F ? channel / 4.5F : MathF.Pow((channel + 0.099F) / 1.099F, Epsilon);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float Compress(float channel)
-        => channel < 0.018F ? 4.5F * channel : (1.099F * MathF.Pow(channel, 0.45F)) - 0.099F;
-}
diff --git a/src/ImageSharp/ColorSpaces/Companding/SRgbCompanding.cs b/src/ImageSharp/ColorSpaces/Companding/SRgbCompanding.cs
deleted file mode 100644
index 4c3923c88..000000000
--- a/src/ImageSharp/ColorSpaces/Companding/SRgbCompanding.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.Intrinsics;
-using System.Runtime.Intrinsics.X86;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Companding;
-
-/// <summary>
-/// Implements sRGB companding.
-/// </summary>
-/// <remarks>
-/// For more info see:
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_RGB_to_XYZ.html"/>
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_RGB.html"/>
-/// </remarks>
-public static class SRgbCompanding
-{
-    private const int Length = Scale + 2; // 256kb @ 16bit precision.
-    private const int Scale = (1 << 16) - 1;
-
-    private static readonly Lazy<float[]> LazyCompressTable = new(
-        () =>
-        {
-            float[] result = new float[Length];
-
-            for (int i = 0; i < result.Length; i++)
-            {
-                double d = (double)i / Scale;
-                if (d <= (0.04045 / 12.92))
-                {
-                    d *= 12.92;
-                }
-                else
-                {
-                    d = (1.055 * Math.Pow(d, 1.0 / 2.4)) - 0.055;
-                }
-
-                result[i] = (float)d;
-            }
-
-            return result;
-        },
-        true);
-
-    private static readonly Lazy<float[]> LazyExpandTable = new(
-        () =>
-        {
-            float[] result = new float[Length];
-
-            for (int i = 0; i < result.Length; i++)
-            {
-                double d = (double)i / Scale;
-                if (d <= 0.04045)
-                {
-                    d /= 12.92;
-                }
-                else
-                {
-                    d = Math.Pow((d + 0.055) / 1.055, 2.4);
-                }
-
-                result[i] = (float)d;
-            }
-
-            return result;
-        },
-        true);
-
-    private static float[] ExpandTable => LazyExpandTable.Value;
-
-    private static float[] CompressTable => LazyCompressTable.Value;
-
-    /// <summary>
-    /// Expands the companded vectors to their linear equivalents with respect to the energy.
-    /// </summary>
-    /// <param name="vectors">The span of vectors.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static void Expand(Span<Vector4> vectors)
-    {
-        if (Avx2.IsSupported && vectors.Length >= 2)
-        {
-            CompandAvx2(vectors, ExpandTable);
-
-            if (Numerics.Modulo2(vectors.Length) != 0)
-            {
-                // Vector4 fits neatly in pairs. Any overlap has to be equal to 1.
-                Expand(ref MemoryMarshal.GetReference(vectors[^1..]));
-            }
-        }
-        else
-        {
-            CompandScalar(vectors, ExpandTable);
-        }
-    }
-
-    /// <summary>
-    /// Compresses the uncompanded vectors to their nonlinear equivalents with respect to the energy.
-    /// </summary>
-    /// <param name="vectors">The span of vectors.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static unsafe void Compress(Span<Vector4> vectors)
-    {
-        if (Avx2.IsSupported && vectors.Length >= 2)
-        {
-            CompandAvx2(vectors, CompressTable);
-
-            if (Numerics.Modulo2(vectors.Length) != 0)
-            {
-                // Vector4 fits neatly in pairs. Any overlap has to be equal to 1.
-                Compress(ref MemoryMarshal.GetReference(vectors[^1..]));
-            }
-        }
-        else
-        {
-            CompandScalar(vectors, CompressTable);
-        }
-    }
-
-    /// <summary>
-    /// Expands a companded vector to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="vector">The vector.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static void Expand(ref Vector4 vector)
-    {
-        // Alpha is already a linear representation of opacity so we do not want to convert it.
-        vector.X = Expand(vector.X);
-        vector.Y = Expand(vector.Y);
-        vector.Z = Expand(vector.Z);
-    }
-
-    /// <summary>
-    /// Compresses an uncompanded vector (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="vector">The vector.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static void Compress(ref Vector4 vector)
-    {
-        // Alpha is already a linear representation of opacity so we do not want to convert it.
-        vector.X = Compress(vector.X);
-        vector.Y = Compress(vector.Y);
-        vector.Z = Compress(vector.Z);
-    }
-
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static float Expand(float channel)
-        => channel <= 0.04045F ? channel / 12.92F : MathF.Pow((channel + 0.055F) / 1.055F, 2.4F);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent.
-    /// </summary>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static float Compress(float channel)
-        => channel <= 0.0031308F ? 12.92F * channel : (1.055F * MathF.Pow(channel, 0.416666666666667F)) - 0.055F;
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static unsafe void CompandAvx2(Span<Vector4> vectors, float[] table)
-    {
-        fixed (float* tablePointer = &MemoryMarshal.GetArrayDataReference(table))
-        {
-            var scale = Vector256.Create((float)Scale);
-            Vector256<float> zero = Vector256<float>.Zero;
-            var offset = Vector256.Create(1);
-
-            // Divide by 2 as 4 elements per Vector4 and 8 per Vector256<float>
-            ref Vector256<float> vectorsBase = ref Unsafe.As<Vector4, Vector256<float>>(ref MemoryMarshal.GetReference(vectors));
-            ref Vector256<float> vectorsLast = ref Unsafe.Add(ref vectorsBase, (uint)vectors.Length / 2u);
-
-            while (Unsafe.IsAddressLessThan(ref vectorsBase, ref vectorsLast))
-            {
-                Vector256<float> multiplied = Avx.Multiply(scale, vectorsBase);
-                multiplied = Avx.Min(Avx.Max(zero, multiplied), scale);
-
-                Vector256<int> truncated = Avx.ConvertToVector256Int32WithTruncation(multiplied);
-                Vector256<float> truncatedF = Avx.ConvertToVector256Single(truncated);
-
-                Vector256<float> low = Avx2.GatherVector256(tablePointer, truncated, sizeof(float));
-                Vector256<float> high = Avx2.GatherVector256(tablePointer, Avx2.Add(truncated, offset), sizeof(float));
-
-                // Alpha is already a linear representation of opacity so we do not want to convert it.
-                Vector256<float> companded = Numerics.Lerp(low, high, Avx.Subtract(multiplied, truncatedF));
-                vectorsBase = Avx.Blend(companded, vectorsBase, Numerics.BlendAlphaControl);
-                vectorsBase = ref Unsafe.Add(ref vectorsBase, 1);
-            }
-        }
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static unsafe void CompandScalar(Span<Vector4> vectors, float[] table)
-    {
-        fixed (float* tablePointer = &MemoryMarshal.GetArrayDataReference(table))
-        {
-            Vector4 zero = Vector4.Zero;
-            var scale = new Vector4(Scale);
-            ref Vector4 vectorsBase = ref MemoryMarshal.GetReference(vectors);
-            ref Vector4 vectorsLast = ref Unsafe.Add(ref vectorsBase, (uint)vectors.Length);
-
-            while (Unsafe.IsAddressLessThan(ref vectorsBase, ref vectorsLast))
-            {
-                Vector4 multiplied = Numerics.Clamp(vectorsBase * Scale, zero, scale);
-
-                float f0 = multiplied.X;
-                float f1 = multiplied.Y;
-                float f2 = multiplied.Z;
-
-                uint i0 = (uint)f0;
-                uint i1 = (uint)f1;
-                uint i2 = (uint)f2;
-
-                // Alpha is already a linear representation of opacity so we do not want to convert it.
-                vectorsBase.X = Numerics.Lerp(tablePointer[i0], tablePointer[i0 + 1], f0 - (int)i0);
-                vectorsBase.Y = Numerics.Lerp(tablePointer[i1], tablePointer[i1 + 1], f1 - (int)i1);
-                vectorsBase.Z = Numerics.Lerp(tablePointer[i2], tablePointer[i2 + 1], f2 - (int)i2);
-
-                vectorsBase = ref Unsafe.Add(ref vectorsBase, 1);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/CieConstants.cs b/src/ImageSharp/ColorSpaces/Conversion/CieConstants.cs
deleted file mode 100644
index 7c8794404..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/CieConstants.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Constants use for Cie conversion calculations
-/// <see href="http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_Lab.html"/>
-/// </summary>
-internal static class CieConstants
-{
-    /// <summary>
-    /// 216F / 24389F
-    /// </summary>
-    public const float Epsilon = 0.008856452F;
-
-    /// <summary>
-    /// 24389F / 27F
-    /// </summary>
-    public const float Kappa = 903.2963F;
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
deleted file mode 100644
index b4934e44a..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Performs chromatic adaptation on the various color spaces.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs chromatic adaptation of given <see cref="CieXyz"/> color.
-    /// Target white point is <see cref="ColorSpaceConverterOptions.WhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <param name="sourceWhitePoint">The source white point.</param>
-    /// <returns>The adapted color</returns>
-    public CieXyz Adapt(in CieXyz color, in CieXyz sourceWhitePoint) => this.Adapt(color, sourceWhitePoint, this.whitePoint);
-
-    /// <summary>
-    /// Performs chromatic adaptation of given <see cref="CieXyz"/> color.
-    /// Target white point is <see cref="ColorSpaceConverterOptions.WhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <param name="sourceWhitePoint">The source white point.</param>
-    /// <param name="targetWhitePoint">The target white point.</param>
-    /// <returns>The adapted color</returns>
-    public CieXyz Adapt(in CieXyz color, in CieXyz sourceWhitePoint, in CieXyz targetWhitePoint)
-    {
-        if (!this.performChromaticAdaptation || sourceWhitePoint.Equals(targetWhitePoint))
-        {
-            return color;
-        }
-
-        // We know that chromaticAdaption is not null because performChromaticAdaption is checked
-        return this.chromaticAdaptation!.Transform(color, sourceWhitePoint, targetWhitePoint);
-    }
-
-    /// <summary>
-    /// Adapts <see cref="CieLab"/> color from the source white point to white point set in <see cref="ColorSpaceConverterOptions.TargetLabWhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public CieLab Adapt(in CieLab color)
-    {
-        if (!this.performChromaticAdaptation || color.WhitePoint.Equals(this.targetLabWhitePoint))
-        {
-            return color;
-        }
-
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Adapts <see cref="CieLch"/> color from the source white point to white point set in <see cref="ColorSpaceConverterOptions.TargetLabWhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public CieLch Adapt(in CieLch color)
-    {
-        if (!this.performChromaticAdaptation || color.WhitePoint.Equals(this.targetLabWhitePoint))
-        {
-            return color;
-        }
-
-        var labColor = this.ToCieLab(color);
-        return this.ToCieLch(labColor);
-    }
-
-    /// <summary>
-    /// Adapts <see cref="CieLchuv"/> color from the source white point to white point set in <see cref="ColorSpaceConverterOptions.TargetLabWhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public CieLchuv Adapt(in CieLchuv color)
-    {
-        if (!this.performChromaticAdaptation || color.WhitePoint.Equals(this.targetLabWhitePoint))
-        {
-            return color;
-        }
-
-        var luvColor = this.ToCieLuv(color);
-        return this.ToCieLchuv(luvColor);
-    }
-
-    /// <summary>
-    /// Adapts <see cref="CieLuv"/> color from the source white point to white point set in <see cref="ColorSpaceConverterOptions.TargetLuvWhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public CieLuv Adapt(in CieLuv color)
-    {
-        if (!this.performChromaticAdaptation || color.WhitePoint.Equals(this.targetLuvWhitePoint))
-        {
-            return color;
-        }
-
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Adapts <see cref="HunterLab"/> color from the source white point to white point set in <see cref="ColorSpaceConverterOptions.TargetHunterLabWhitePoint"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public HunterLab Adapt(in HunterLab color)
-    {
-        if (!this.performChromaticAdaptation || color.WhitePoint.Equals(this.targetHunterLabWhitePoint))
-        {
-            return color;
-        }
-
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Adapts a <see cref="LinearRgb"/> color from the source working space to working space set in <see cref="ColorSpaceConverterOptions.TargetRgbWorkingSpace"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public LinearRgb Adapt(in LinearRgb color)
-    {
-        if (!this.performChromaticAdaptation || color.WorkingSpace.Equals(this.targetRgbWorkingSpace))
-        {
-            return color;
-        }
-
-        // Conversion to XYZ
-        LinearRgbToCieXyzConverter converterToXYZ = GetLinearRgbToCieXyzConverter(color.WorkingSpace);
-        CieXyz unadapted = converterToXYZ.Convert(color);
-
-        // Adaptation
-        // We know that chromaticAdaption is not null because performChromaticAdaption is checked
-        CieXyz adapted = this.chromaticAdaptation!.Transform(unadapted, color.WorkingSpace.WhitePoint, this.targetRgbWorkingSpace.WhitePoint);
-
-        // Conversion back to RGB
-        return this.cieXyzToLinearRgbConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Adapts an <see cref="Rgb"/> color from the source working space to working space set in <see cref="ColorSpaceConverterOptions.TargetRgbWorkingSpace"/>.
-    /// </summary>
-    /// <param name="color">The color to adapt</param>
-    /// <returns>The adapted color</returns>
-    public Rgb Adapt(in Rgb color)
-    {
-        if (!this.performChromaticAdaptation)
-        {
-            return color;
-        }
-
-        var linearInput = ToLinearRgb(color);
-        LinearRgb linearOutput = this.Adapt(linearInput);
-        return ToRgb(linearOutput);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
deleted file mode 100644
index 54667ca2a..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieLab"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in CieLch color)
-    {
-        // Conversion (preserving white point)
-        CieLab unadapted = CieLchToCieLabConverter.Convert(color);
-
-        return this.Adapt(unadapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="CieLab"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in CieXyz color)
-    {
-        CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetLabWhitePoint);
-
-        return this.cieXyzToCieLabConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLab"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieLab"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in Cmyk color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in Hsl color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in Hsv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in LinearRgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in Rgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieLab"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLab ToCieLab(in YCbCr color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLab(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
deleted file mode 100644
index 9949b5d91..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieLch"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="CieLch"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in CieLab color)
-    {
-        CieLab adapted = this.Adapt(color);
-
-        return CieLabToCieLchConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in CieLchuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in CieLuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in CieXyy color)
-    {
-        var xyzColor = ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="CieLch"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in CieXyz color)
-    {
-        var labColor = this.ToCieLab(color);
-
-        return this.ToCieLch(labColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in Cmyk color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in Hsl color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in Hsv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in HunterLab color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in LinearRgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in Lms color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in Rgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLch"/></returns>
-    public CieLch ToCieLch(in YCbCr color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLch(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLch"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieLch> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLch destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLch dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLch(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs
deleted file mode 100644
index 4b856d118..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieLchuv"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="CieLchuv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in CieLuv color)
-    {
-        CieLuv adapted = this.Adapt(color);
-
-        return CieLuvToCieLchuvConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in CieXyz color)
-    {
-        CieLuv luvColor = this.ToCieLuv(color);
-
-        return this.ToCieLchuv(luvColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in Cmyk color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in Hsl color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLchuv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in Hsv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in LinearRgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in Rgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLchuv"/></returns>
-    public CieLchuv ToCieLchuv(in YCbCr color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLchuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLchuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieLchuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLchuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLchuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLchuv(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
deleted file mode 100644
index 2e8029f64..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieLuv"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLab"/></returns>
-    public CieLuv ToCieLuv(in CieLchuv color)
-    {
-        // Conversion (preserving white point)
-        CieLuv unadapted = CieLchuvToCieLuvConverter.Convert(color);
-
-        // Adaptation
-        return this.Adapt(unadapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in CieXyz color)
-    {
-        // Adaptation
-        CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetLuvWhitePoint);
-
-        // Conversion
-        return this.cieXyzToCieLuvConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in Cmyk color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieLuv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in Hsl color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in Hsv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in LinearRgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in Rgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieLuv"/></returns>
-    public CieLuv ToCieLuv(in YCbCr color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToCieLuv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieLuv"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieLuv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieLuv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieLuv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieLuv(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
deleted file mode 100644
index 13b2a225c..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieXyy"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public static CieXyy ToCieXyy(in CieXyz color) => CieXyzAndCieXyyConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<CieXyz> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in Cmyk color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(Hsl color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in Hsv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in LinearRgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in Rgb color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyy"/></returns>
-    public CieXyy ToCieXyy(in YCbCr color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return ToCieXyy(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieXyy"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieXyy> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyy destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyy dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyy(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
deleted file mode 100644
index 2212ca2e5..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Collections.Concurrent;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="CieXyz"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    private static readonly ConcurrentDictionary<RgbWorkingSpace, LinearRgbToCieXyzConverter> ConverterCache = new();
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in CieLab color)
-    {
-        // Conversion
-        CieXyz unadapted = CieLabToCieXyzConverter.Convert(color);
-
-        // Adaptation
-        return this.Adapt(unadapted, color.WhitePoint);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in CieLch color)
-    {
-        // Conversion to Lab
-        CieLab labColor = CieLchToCieLabConverter.Convert(color);
-
-        // Conversion to XYZ (incl. adaptation)
-        return this.ToCieXyz(labColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in CieLchuv color)
-    {
-        // Conversion to Luv
-        CieLuv luvColor = CieLchuvToCieLuvConverter.Convert(color);
-
-        // Conversion to XYZ (incl. adaptation)
-        return this.ToCieXyz(luvColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="CieXyz"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in CieLuv color)
-    {
-        // Conversion
-        CieXyz unadapted = CieLuvToCieXyzConverter.Convert(color);
-
-        // Adaptation
-        return this.Adapt(unadapted, color.WhitePoint);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public static CieXyz ToCieXyz(in CieXyy color)
-
-        // Conversion
-        => CieXyzAndCieXyyConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<CieXyy> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in Cmyk color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return this.ToCieXyz(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in Hsl color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return this.ToCieXyz(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in Hsv color)
-    {
-        // Conversion
-        Rgb rgb = ToRgb(color);
-
-        return this.ToCieXyz(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in HunterLab color)
-    {
-        CieXyz unadapted = HunterLabToCieXyzConverter.Convert(color);
-
-        return this.Adapt(unadapted, color.WhitePoint);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in LinearRgb color)
-    {
-        // Conversion
-        LinearRgbToCieXyzConverter converter = GetLinearRgbToCieXyzConverter(color.WorkingSpace);
-        CieXyz unadapted = converter.Convert(color);
-
-        return this.Adapt(unadapted, color.WorkingSpace.WhitePoint);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in Lms color)
-        => this.cieXyzAndLmsConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="CieXyz"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="CieXyz"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in Rgb color)
-    {
-        // Conversion
-        LinearRgb linear = RgbToLinearRgbConverter.Convert(color);
-        return this.ToCieXyz(linear);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="CieXyz"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="CieXyz"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    public CieXyz ToCieXyz(in YCbCr color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return this.ToCieXyz(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="CieXyz"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<CieXyz> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCieXyz(sp);
-        }
-    }
-
-    /// <summary>
-    /// Gets the correct converter for the given rgb working space.
-    /// </summary>
-    /// <param name="workingSpace">The source working space</param>
-    /// <returns>The <see cref="LinearRgbToCieXyzConverter"/></returns>
-    private static LinearRgbToCieXyzConverter GetLinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
-        => ConverterCache.GetOrAdd(workingSpace, (key) => new LinearRgbToCieXyzConverter(key));
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
deleted file mode 100644
index ea9a5d734..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="Cmyk"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in CieXyz color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return CmykAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public static Cmyk ToCmyk(in Hsl color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return CmykAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsl> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public static Cmyk ToCmyk(in Hsv color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return CmykAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsv> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public static Cmyk ToCmyk(in LinearRgb color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return CmykAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<LinearRgb> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToCmyk(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors,</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public static Cmyk ToCmyk(in Rgb color) => CmykAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Cmyk"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Rgb> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToCmyk(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Cmyk"/></returns>
-    public Cmyk ToCmyk(in YCbCr color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return CmykAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Cmyk"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<Cmyk> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Cmyk destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Cmyk dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToCmyk(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
deleted file mode 100644
index 67ec16291..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="Hsl"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in CieXyz color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return HslAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public static Hsl ToHsl(in Cmyk color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HslAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Cmyk> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public static Hsl ToHsl(in Hsv color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HslAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsv> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public static Hsl ToHsl(in LinearRgb color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HslAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<LinearRgb> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsl(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="Hsl"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public static Hsl ToHsl(in Rgb color) => HslAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Rgb> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsl(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsl"/></returns>
-    public Hsl ToHsl(in YCbCr color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return HslAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Hsl"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<Hsl> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsl destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsl dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsl(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
deleted file mode 100644
index 47ee42dc5..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="Hsv"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in CieXyz color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return HsvAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public static Hsv ToHsv(in Cmyk color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HsvAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Cmyk> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public static Hsv ToHsv(in Hsl color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HsvAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public static void Convert(ReadOnlySpan<Hsl> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public static Hsv ToHsv(in LinearRgb color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return HsvAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<LinearRgb> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToHsv(xyzColor);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public static Hsv ToHsv(in Rgb color) => HsvAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Rgb> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToHsv(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Hsv"/></returns>
-    public Hsv ToHsv(in YCbCr color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return HsvAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Hsv"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<Hsv> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Hsv destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Hsv dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHsv(sp);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs
deleted file mode 100644
index 060402776..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="HunterLab"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="HunterLab"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<HunterLab> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref HunterLab destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref HunterLab dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToHunterLab(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieLab color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieLch color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieLchuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieLuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieXyy color)
-    {
-        var xyzColor = ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in CieXyz color)
-    {
-        CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetHunterLabWhitePoint);
-
-        return this.cieXyzToHunterLabConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in Cmyk color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in Hsl color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in Hsv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in LinearRgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in Lms color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="HunterLab"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in Rgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="HunterLab"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="HunterLab"/></returns>
-    public HunterLab ToHunterLab(in YCbCr color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToHunterLab(xyzColor);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
deleted file mode 100644
index fd385a15b..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="LinearRgb"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public static void Convert(ReadOnlySpan<Cmyk> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public static void Convert(ReadOnlySpan<Hsl> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public static void Convert(ReadOnlySpan<Hsv> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Rgb> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<LinearRgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref LinearRgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref LinearRgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLinearRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="LinearRgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in CieXyz color)
-    {
-        // Adaptation
-        CieXyz adapted = this.Adapt(color, this.whitePoint, this.targetRgbWorkingSpace.WhitePoint);
-
-        // Conversion
-        return this.cieXyzToLinearRgbConverter.Convert(adapted);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public static LinearRgb ToLinearRgb(in Cmyk color)
-    {
-        Rgb rgb = ToRgb(color);
-        return ToLinearRgb(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public static LinearRgb ToLinearRgb(in Hsl color)
-    {
-        Rgb rgb = ToRgb(color);
-        return ToLinearRgb(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public static LinearRgb ToLinearRgb(in Hsv color)
-    {
-        Rgb rgb = ToRgb(color);
-        return ToLinearRgb(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToLinearRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="LinearRgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public static LinearRgb ToLinearRgb(in Rgb color)
-        => RgbToLinearRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="LinearRgb"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="LinearRgb"/></returns>
-    public LinearRgb ToLinearRgb(in YCbCr color)
-    {
-        Rgb rgb = this.ToRgb(color);
-        return ToLinearRgb(rgb);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
deleted file mode 100644
index 56f61ef80..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
+++ /dev/null
@@ -1,425 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="Lms"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Cmyk> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsl> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Hsv> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<LinearRgb> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Rgb> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Lms"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<Lms> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Lms destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Lms dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToLms(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieLab color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieLch color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieLchuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieLuv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieXyy color)
-    {
-        var xyzColor = ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in CieXyz color) => this.cieXyzAndLmsConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in Cmyk color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in Hsl color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in Hsv color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in HunterLab color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in LinearRgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in Rgb color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="Lms"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Lms"/></returns>
-    public Lms ToLms(in YCbCr color)
-    {
-        var xyzColor = this.ToCieXyz(color);
-        return this.ToLms(xyzColor);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
deleted file mode 100644
index 080e1fc4b..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="Rgb"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLchuv"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLchuv> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLchuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLchuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Cmyk> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsv> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsl> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<LinearRgb> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="YCbCr"/> into <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<YCbCr> source, Span<Rgb> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref YCbCr sourceRef = ref MemoryMarshal.GetReference(source);
-        ref Rgb destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref YCbCr sp = ref Unsafe.Add(ref sourceRef, i);
-            ref Rgb dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToRgb(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLchuv"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieLchuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in CieXyz color)
-    {
-        // Conversion
-        LinearRgb linear = this.ToLinearRgb(color);
-
-        // Compand
-        return ToRgb(linear);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public static Rgb ToRgb(in Cmyk color) => CmykAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public static Rgb ToRgb(in Hsv color) => HsvAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public static Rgb ToRgb(in Hsl color) => HslAndRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public static Rgb ToRgb(in LinearRgb color) => LinearRgbToRgbConverter.Convert(color);
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-        return this.ToRgb(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="YCbCr"/> into a <see cref="Rgb"/>
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="Rgb"/></returns>
-    public Rgb ToRgb(in YCbCr color)
-    {
-        // Conversion
-        Rgb rgb = YCbCrAndRgbConverter.Convert(color);
-
-        // Adaptation
-        return this.Adapt(rgb);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
deleted file mode 100644
index da8e046ff..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <content>
-/// Allows conversion to <see cref="YCbCr"/>.
-/// </content>
-public partial class ColorSpaceConverter
-{
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLab"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLab> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLch"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    public void Convert(ReadOnlySpan<CieLch> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLch sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLch sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieLuv"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieLuv> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieLuv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieLuv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyy"/> into <see cref="YCbCr"/>
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyy> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyy sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyy sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="CieXyz"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<CieXyz> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Cmyk"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Cmyk> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Cmyk sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Cmyk sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsl"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsl> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsl sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsl sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Hsv"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Hsv> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Hsv sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Hsv sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="HunterLab"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<HunterLab> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref HunterLab sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref HunterLab sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="LinearRgb"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<LinearRgb> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref LinearRgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref LinearRgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Lms"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public void Convert(ReadOnlySpan<Lms> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Lms sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Lms sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = this.ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Performs the bulk conversion from <see cref="Rgb"/> into <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="source">The span to the source colors</param>
-    /// <param name="destination">The span to the destination colors</param>
-    public static void Convert(ReadOnlySpan<Rgb> source, Span<YCbCr> destination)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        ref Rgb sourceRef = ref MemoryMarshal.GetReference(source);
-        ref YCbCr destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref Rgb sp = ref Unsafe.Add(ref sourceRef, i);
-            ref YCbCr dp = ref Unsafe.Add(ref destRef, i);
-            dp = ToYCbCr(sp);
-        }
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLab"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in CieLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLch"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in CieLch color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieLuv"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in CieLuv color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyy"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in CieXyy color)
-    {
-        CieXyz xyzColor = ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="CieXyz"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in CieXyz color)
-    {
-        Rgb rgb = this.ToRgb(color);
-
-        return YCbCrAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Cmyk"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public static YCbCr ToYCbCr(in Cmyk color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return YCbCrAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsl"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public static YCbCr ToYCbCr(in Hsl color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return YCbCrAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Hsv"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public static YCbCr ToYCbCr(in Hsv color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return YCbCrAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="HunterLab"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in HunterLab color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="LinearRgb"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public static YCbCr ToYCbCr(in LinearRgb color)
-    {
-        Rgb rgb = ToRgb(color);
-
-        return YCbCrAndRgbConverter.Convert(rgb);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Lms"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public YCbCr ToYCbCr(in Lms color)
-    {
-        CieXyz xyzColor = this.ToCieXyz(color);
-
-        return this.ToYCbCr(xyzColor);
-    }
-
-    /// <summary>
-    /// Converts a <see cref="Rgb"/> into a <see cref="YCbCr"/>.
-    /// </summary>
-    /// <param name="color">The color to convert.</param>
-    /// <returns>The <see cref="YCbCr"/></returns>
-    public static YCbCr ToYCbCr(in Rgb color) => YCbCrAndRgbConverter.Convert(color);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs
deleted file mode 100644
index b5e3162e6..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Provides methods to allow the conversion of color values between different color spaces.
-/// </summary>
-public partial class ColorSpaceConverter
-{
-    // Options.
-    private static readonly ColorSpaceConverterOptions DefaultOptions = new();
-    private readonly Matrix4x4 lmsAdaptationMatrix;
-    private readonly CieXyz whitePoint;
-    private readonly CieXyz targetLuvWhitePoint;
-    private readonly CieXyz targetLabWhitePoint;
-    private readonly CieXyz targetHunterLabWhitePoint;
-    private readonly RgbWorkingSpace targetRgbWorkingSpace;
-    private readonly IChromaticAdaptation? chromaticAdaptation;
-    private readonly bool performChromaticAdaptation;
-    private readonly CieXyzAndLmsConverter cieXyzAndLmsConverter;
-    private readonly CieXyzToCieLabConverter cieXyzToCieLabConverter;
-    private readonly CieXyzToCieLuvConverter cieXyzToCieLuvConverter;
-    private readonly CieXyzToHunterLabConverter cieXyzToHunterLabConverter;
-    private readonly CieXyzToLinearRgbConverter cieXyzToLinearRgbConverter;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ColorSpaceConverter"/> class.
-    /// </summary>
-    public ColorSpaceConverter()
-      : this(DefaultOptions)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ColorSpaceConverter"/> class.
-    /// </summary>
-    /// <param name="options">The configuration options.</param>
-    public ColorSpaceConverter(ColorSpaceConverterOptions options)
-    {
-        Guard.NotNull(options, nameof(options));
-        this.whitePoint = options.WhitePoint;
-        this.targetLuvWhitePoint = options.TargetLuvWhitePoint;
-        this.targetLabWhitePoint = options.TargetLabWhitePoint;
-        this.targetHunterLabWhitePoint = options.TargetHunterLabWhitePoint;
-        this.targetRgbWorkingSpace = options.TargetRgbWorkingSpace;
-        this.chromaticAdaptation = options.ChromaticAdaptation;
-        this.performChromaticAdaptation = this.chromaticAdaptation != null;
-        this.lmsAdaptationMatrix = options.LmsAdaptationMatrix;
-
-        this.cieXyzAndLmsConverter = new CieXyzAndLmsConverter(this.lmsAdaptationMatrix);
-        this.cieXyzToCieLabConverter = new CieXyzToCieLabConverter(this.targetLabWhitePoint);
-        this.cieXyzToCieLuvConverter = new CieXyzToCieLuvConverter(this.targetLuvWhitePoint);
-        this.cieXyzToHunterLabConverter = new CieXyzToHunterLabConverter(this.targetHunterLabWhitePoint);
-        this.cieXyzToLinearRgbConverter = new CieXyzToLinearRgbConverter(this.targetRgbWorkingSpace);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverterOptions.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverterOptions.cs
deleted file mode 100644
index 9f576de72..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverterOptions.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Configuration options for the <see cref="ColorSpaceConverter"/> class.
-/// </summary>
-public class ColorSpaceConverterOptions
-{
-    /// <summary>
-    /// Gets or sets the white point used for chromatic adaptation in conversions from/to XYZ color space.
-    /// When <value>default</value>, no adaptation will be performed.
-    /// Defaults to: <see cref="CieLuv.DefaultWhitePoint"/>.
-    /// </summary>
-    public CieXyz WhitePoint { get; set; } = CieLuv.DefaultWhitePoint;
-
-    /// <summary>
-    /// Gets or sets the white point used *when creating* Luv/LChuv colors. (Luv/LChuv colors on the input already contain the white point information)
-    /// Defaults to: <see cref="CieLuv.DefaultWhitePoint"/>.
-    /// </summary>
-    public CieXyz TargetLuvWhitePoint { get; set; } = CieLuv.DefaultWhitePoint;
-
-    /// <summary>
-    /// Gets or sets the white point used *when creating* Lab/LChab colors. (Lab/LChab colors on the input already contain the white point information)
-    /// Defaults to: <see cref="CieLab.DefaultWhitePoint"/>.
-    /// </summary>
-    public CieXyz TargetLabWhitePoint { get; set; } = CieLab.DefaultWhitePoint;
-
-    /// <summary>
-    /// Gets or sets the white point used *when creating* HunterLab colors. (HunterLab colors on the input already contain the white point information)
-    /// Defaults to: <see cref="HunterLab.DefaultWhitePoint"/>.
-    /// </summary>
-    public CieXyz TargetHunterLabWhitePoint { get; set; } = HunterLab.DefaultWhitePoint;
-
-    /// <summary>
-    /// Gets or sets the target working space used *when creating* RGB colors. (RGB colors on the input already contain the working space information)
-    /// Defaults to: <see cref="Rgb.DefaultWorkingSpace"/>.
-    /// </summary>
-    public RgbWorkingSpace TargetRgbWorkingSpace { get; set; } = Rgb.DefaultWorkingSpace;
-
-    /// <summary>
-    /// Gets or sets the chromatic adaptation method used. When <value>null</value>, no adaptation will be performed.
-    /// </summary>
-    public IChromaticAdaptation? ChromaticAdaptation { get; set; } = new VonKriesChromaticAdaptation();
-
-    /// <summary>
-    /// Gets or sets transformation matrix used in conversion to and from <see cref="Lms"/>.
-    /// </summary>
-    public Matrix4x4 LmsAdaptationMatrix { get; set; } = CieXyzAndLmsConverter.DefaultTransformationMatrix;
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyChromaticityCoordinates.cs
deleted file mode 100644
index 2cc785d53..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyChromaticityCoordinates.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-// ReSharper disable CompareOfFloatsByEqualityOperator
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Represents the coordinates of CIEXY chromaticity space.
-/// </summary>
-public readonly struct CieXyChromaticityCoordinates : IEquatable<CieXyChromaticityCoordinates>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyChromaticityCoordinates"/> struct.
-    /// </summary>
-    /// <param name="x">Chromaticity coordinate x (usually from 0 to 1)</param>
-    /// <param name="y">Chromaticity coordinate y (usually from 0 to 1)</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyChromaticityCoordinates(float x, float y)
-    {
-        this.X = x;
-        this.Y = y;
-    }
-
-    /// <summary>
-    /// Gets the chromaticity X-coordinate.
-    /// </summary>
-    /// <remarks>
-    /// Ranges usually from 0 to 1.
-    /// </remarks>
-    public readonly float X { get; }
-
-    /// <summary>
-    /// Gets the chromaticity Y-coordinate
-    /// </summary>
-    /// <remarks>
-    /// Ranges usually from 0 to 1.
-    /// </remarks>
-    public readonly float Y { get; }
-
-    /// <summary>
-    /// Compares two <see cref="CieXyChromaticityCoordinates"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyChromaticityCoordinates"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyChromaticityCoordinates"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right)
-        => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="CieXyChromaticityCoordinates"/> objects for inequality
-    /// </summary>
-    /// <param name="left">The <see cref="CieXyChromaticityCoordinates"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="CieXyChromaticityCoordinates"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(CieXyChromaticityCoordinates left, CieXyChromaticityCoordinates right)
-        => !left.Equals(right);
-
-    /// <inheritdoc />
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode()
-        => HashCode.Combine(this.X, this.Y);
-
-    /// <inheritdoc/>
-    public override string ToString()
-        => FormattableString.Invariant($"CieXyChromaticityCoordinates({this.X:#0.##}, {this.Y:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj)
-        => obj is CieXyChromaticityCoordinates other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(CieXyChromaticityCoordinates other)
-        => this.X.Equals(other.X) && this.Y.Equals(other.Y);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs
deleted file mode 100644
index f16ce7b0f..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CIeLchToCieLabConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLch"/> to <see cref="CieLab"/>.
-/// </summary>
-internal static class CieLchToCieLabConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLch"/> input to an instance of <see cref="CieLab"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieLab Convert(in CieLch input)
-    {
-        // Conversion algorithm described here:
-        // https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC
-        float l = input.L, c = input.C, hDegrees = input.H;
-        float hRadians = GeometryUtilities.DegreeToRadian(hDegrees);
-
-        float a = c * MathF.Cos(hRadians);
-        float b = c * MathF.Sin(hRadians);
-
-        return new CieLab(l, a, b, input.WhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieLchConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieLchConverter.cs
deleted file mode 100644
index 4eeb7695e..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieLchConverter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLab"/> to <see cref="CieLch"/>.
-/// </summary>
-internal static class CieLabToCieLchConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLab"/> input to an instance of <see cref="CieLch"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieLch Convert(in CieLab input)
-    {
-        // Conversion algorithm described here:
-        // https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC
-        float l = input.L, a = input.A, b = input.B;
-        float c = MathF.Sqrt((a * a) + (b * b));
-        float hRadians = MathF.Atan2(b, a);
-        float hDegrees = GeometryUtilities.RadianToDegree(hRadians);
-
-        // Wrap the angle round at 360.
-        hDegrees %= 360;
-
-        // Make sure it's not negative.
-        while (hDegrees < 0)
-        {
-            hDegrees += 360;
-        }
-
-        return new CieLch(l, c, hDegrees, input.WhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieXyzConverter.cs
deleted file mode 100644
index b02ad0000..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLabToCieXyzConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLab"/> to <see cref="CieXyz"/>.
-/// </summary>
-internal static class CieLabToCieXyzConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLab"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieXyz Convert(in CieLab input)
-    {
-        // Conversion algorithm described here: http://www.brucelindbloom.com/index.html?Eqn_Lab_to_XYZ.html
-        float l = input.L, a = input.A, b = input.B;
-        float fy = (l + 16) / 116F;
-        float fx = (a / 500F) + fy;
-        float fz = fy - (b / 200F);
-
-        float fx3 = Numerics.Pow3(fx);
-        float fz3 = Numerics.Pow3(fz);
-
-        float xr = fx3 > CieConstants.Epsilon ? fx3 : ((116F * fx) - 16F) / CieConstants.Kappa;
-        float yr = l > CieConstants.Kappa * CieConstants.Epsilon ? Numerics.Pow3((l + 16F) / 116F) : l / CieConstants.Kappa;
-        float zr = fz3 > CieConstants.Epsilon ? fz3 : ((116F * fz) - 16F) / CieConstants.Kappa;
-
-        Vector3 wxyz = new(input.WhitePoint.X, input.WhitePoint.Y, input.WhitePoint.Z);
-
-        // Avoids XYZ coordinates out range (restricted by 0 and XYZ reference white)
-        Vector3 xyzr = Vector3.Clamp(new Vector3(xr, yr, zr), Vector3.Zero, Vector3.One);
-
-        Vector3 xyz = xyzr * wxyz;
-        return new CieXyz(xyz);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLchuvToCieLuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLchuvToCieLuvConverter.cs
deleted file mode 100644
index 9a1e79da4..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLchuvToCieLuvConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLch"/> to <see cref="CieLab"/>.
-/// </summary>
-internal static class CieLchuvToCieLuvConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLchuv"/> input to an instance of <see cref="CieLuv"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieLuv Convert(in CieLchuv input)
-    {
-        // Conversion algorithm described here:
-        // https://en.wikipedia.org/wiki/CIELUV#Cylindrical_representation_.28CIELCH.29
-        float l = input.L, c = input.C, hDegrees = input.H;
-        float hRadians = GeometryUtilities.DegreeToRadian(hDegrees);
-
-        float u = c * MathF.Cos(hRadians);
-        float v = c * MathF.Sin(hRadians);
-
-        return new CieLuv(l, u, v, input.WhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieLchuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieLchuvConverter.cs
deleted file mode 100644
index 4756bab82..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieLchuvConverter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLab"/> to <see cref="CieLch"/>.
-/// </summary>
-internal static class CieLuvToCieLchuvConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLuv"/> input to an instance of <see cref="CieLchuv"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieLchuv Convert(in CieLuv input)
-    {
-        // Conversion algorithm described here:
-        // https://en.wikipedia.org/wiki/CIELUV#Cylindrical_representation_.28CIELCH.29
-        float l = input.L, a = input.U, b = input.V;
-        float c = MathF.Sqrt((a * a) + (b * b));
-        float hRadians = MathF.Atan2(b, a);
-        float hDegrees = GeometryUtilities.RadianToDegree(hRadians);
-
-        // Wrap the angle round at 360.
-        hDegrees %= 360;
-
-        // Make sure it's not negative.
-        while (hDegrees < 0)
-        {
-            hDegrees += 360;
-        }
-
-        return new CieLchuv(l, c, hDegrees, input.WhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieXyzConverter.cs
deleted file mode 100644
index 404c4e824..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieLuvToCieXyzConverter.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieLuv"/> to <see cref="CieXyz"/>.
-/// </summary>
-internal static class CieLuvToCieXyzConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieLuv"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    public static CieXyz Convert(in CieLuv input)
-    {
-        // Conversion algorithm described here: http://www.brucelindbloom.com/index.html?Eqn_Luv_to_XYZ.html
-        float l = input.L, u = input.U, v = input.V;
-
-        float u0 = ComputeU0(input.WhitePoint);
-        float v0 = ComputeV0(input.WhitePoint);
-
-        float y = l > CieConstants.Kappa * CieConstants.Epsilon
-                    ? Numerics.Pow3((l + 16) / 116)
-                    : l / CieConstants.Kappa;
-
-        float a = ((52 * l / (u + (13 * l * u0))) - 1) / 3;
-        float b = -5 * y;
-        const float c = -0.3333333F;
-        float d = y * ((39 * l / (v + (13 * l * v0))) - 5);
-
-        float x = (d - b) / (a - c);
-        float z = (x * a) + b;
-
-        if (float.IsNaN(x) || x < 0)
-        {
-            x = 0;
-        }
-
-        if (float.IsNaN(y) || y < 0)
-        {
-            y = 0;
-        }
-
-        if (float.IsNaN(z) || z < 0)
-        {
-            z = 0;
-        }
-
-        return new CieXyz(x, y, z);
-    }
-
-    /// <summary>
-    /// Calculates the blue-yellow chromacity based on the given whitepoint.
-    /// </summary>
-    /// <param name="input">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    private static float ComputeU0(in CieXyz input)
-        => (4 * input.X) / (input.X + (15 * input.Y) + (3 * input.Z));
-
-    /// <summary>
-    /// Calculates the red-green chromacity based on the given whitepoint.
-    /// </summary>
-    /// <param name="input">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    private static float ComputeV0(in CieXyz input)
-        => (9 * input.Y) / (input.X + (15 * input.Y) + (3 * input.Z));
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndCieXyyConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndCieXyyConverter.cs
deleted file mode 100644
index 4cc443cf7..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndCieXyyConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between CIE XYZ and CIE xyY.
-/// <see href="http://www.brucelindbloom.com/"/> for formulas.
-/// </summary>
-internal static class CieXyzAndCieXyyConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="CieXyy"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieXyy Convert(in CieXyz input)
-    {
-        float x = input.X / (input.X + input.Y + input.Z);
-        float y = input.Y / (input.X + input.Y + input.Z);
-
-        if (float.IsNaN(x) || float.IsNaN(y))
-        {
-            return new CieXyy(0, 0, input.Y);
-        }
-
-        return new CieXyy(x, y, input.Y);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyy"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieXyz Convert(in CieXyy input)
-    {
-        if (MathF.Abs(input.Y) < Constants.Epsilon)
-        {
-            return new CieXyz(0, 0, input.Yl);
-        }
-
-        float x = (input.X * input.Yl) / input.Y;
-        float y = input.Yl;
-        float z = ((1 - input.X - input.Y) * y) / input.Y;
-
-        return new CieXyz(x, y, z);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndHunterLabConverterBase.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndHunterLabConverterBase.cs
deleted file mode 100644
index ba221108f..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndHunterLabConverterBase.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// The base class for converting between <see cref="HunterLab"/> and <see cref="CieXyz"/> color spaces.
-/// </summary>
-internal abstract class CieXyzAndHunterLabConverterBase
-{
-    /// <summary>
-    /// Returns the Ka coefficient that depends upon the whitepoint illuminant.
-    /// </summary>
-    /// <param name="whitePoint">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float ComputeKa(CieXyz whitePoint)
-    {
-        if (whitePoint.Equals(Illuminants.C))
-        {
-            return 175F;
-        }
-
-        return 100F * (175F / 198.04F) * (whitePoint.X + whitePoint.Y);
-    }
-
-    /// <summary>
-    /// Returns the Kb coefficient that depends upon the whitepoint illuminant.
-    /// </summary>
-    /// <param name="whitePoint">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static float ComputeKb(CieXyz whitePoint)
-    {
-        if (whitePoint == Illuminants.C)
-        {
-            return 70F;
-        }
-
-        return 100F * (70F / 218.11F) * (whitePoint.Y + whitePoint.Z);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndLmsConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndLmsConverter.cs
deleted file mode 100644
index b5f8a70b6..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzAndLmsConverter.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="CieXyz"/> and <see cref="Lms"/>
-/// </summary>
-internal sealed class CieXyzAndLmsConverter
-{
-    /// <summary>
-    /// Default transformation matrix used, when no other is set. (Bradford)
-    /// <see cref="LmsAdaptationMatrix"/>
-    /// </summary>
-    public static readonly Matrix4x4 DefaultTransformationMatrix = LmsAdaptationMatrix.Bradford;
-
-    private Matrix4x4 inverseTransformationMatrix;
-    private Matrix4x4 transformationMatrix;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzAndLmsConverter"/> class.
-    /// </summary>
-    public CieXyzAndLmsConverter()
-        : this(DefaultTransformationMatrix)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzAndLmsConverter"/> class.
-    /// </summary>
-    /// <param name="transformationMatrix">
-    /// Definition of the cone response domain (see <see cref="LmsAdaptationMatrix"/>),
-    /// if not set <see cref="DefaultTransformationMatrix"/> will be used.
-    /// </param>
-    public CieXyzAndLmsConverter(Matrix4x4 transformationMatrix)
-    {
-        this.transformationMatrix = transformationMatrix;
-        Matrix4x4.Invert(this.transformationMatrix, out this.inverseTransformationMatrix);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="Lms"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Lms Convert(in CieXyz input)
-    {
-        Vector3 vector = Vector3.Transform(input.ToVector3(), this.transformationMatrix);
-
-        return new Lms(vector);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="Lms"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyz Convert(in Lms input)
-    {
-        Vector3 vector = Vector3.Transform(input.ToVector3(), this.inverseTransformationMatrix);
-
-        return new CieXyz(vector);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLabConverter.cs
deleted file mode 100644
index 0ce6e3c9f..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLabConverter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieXyz"/> to <see cref="CieLab"/>.
-/// </summary>
-internal sealed class CieXyzToCieLabConverter
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToCieLabConverter"/> class.
-    /// </summary>
-    public CieXyzToCieLabConverter()
-        : this(CieLab.DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToCieLabConverter"/> class.
-    /// </summary>
-    /// <param name="labWhitePoint">The target reference lab white point</param>
-    public CieXyzToCieLabConverter(CieXyz labWhitePoint) => this.LabWhitePoint = labWhitePoint;
-
-    /// <summary>
-    /// Gets the target reference whitepoint. When not set, <see cref="CieLab.DefaultWhitePoint"/> is used.
-    /// </summary>
-    public CieXyz LabWhitePoint { get; }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="CieLab"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieLab Convert(in CieXyz input)
-    {
-        // Conversion algorithm described here: http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_Lab.html
-        float wx = this.LabWhitePoint.X, wy = this.LabWhitePoint.Y, wz = this.LabWhitePoint.Z;
-
-        float xr = input.X / wx, yr = input.Y / wy, zr = input.Z / wz;
-
-        const float inv116 = 1 / 116F;
-
-        float fx = xr > CieConstants.Epsilon ? MathF.Pow(xr, 0.3333333F) : ((CieConstants.Kappa * xr) + 16F) * inv116;
-        float fy = yr > CieConstants.Epsilon ? MathF.Pow(yr, 0.3333333F) : ((CieConstants.Kappa * yr) + 16F) * inv116;
-        float fz = zr > CieConstants.Epsilon ? MathF.Pow(zr, 0.3333333F) : ((CieConstants.Kappa * zr) + 16F) * inv116;
-
-        float l = (116F * fy) - 16F;
-        float a = 500F * (fx - fy);
-        float b = 200F * (fy - fz);
-
-        return new CieLab(l, a, b, this.LabWhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLuvConverter.cs
deleted file mode 100644
index 1e17ae54f..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToCieLuvConverter.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Converts from <see cref="CieXyz"/> to <see cref="CieLuv"/>.
-/// </summary>
-internal sealed class CieXyzToCieLuvConverter
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToCieLuvConverter"/> class.
-    /// </summary>
-    public CieXyzToCieLuvConverter()
-        : this(CieLuv.DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToCieLuvConverter"/> class.
-    /// </summary>
-    /// <param name="luvWhitePoint">The target reference luv white point</param>
-    public CieXyzToCieLuvConverter(CieXyz luvWhitePoint) => this.LuvWhitePoint = luvWhitePoint;
-
-    /// <summary>
-    /// Gets the target reference whitepoint. When not set, <see cref="CieLuv.DefaultWhitePoint"/> is used.
-    /// </summary>
-    public CieXyz LuvWhitePoint { get; }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="CieLuv"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    public CieLuv Convert(in CieXyz input)
-    {
-        // Conversion algorithm described here: http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_Luv.html
-        float yr = input.Y / this.LuvWhitePoint.Y;
-        float up = ComputeUp(input);
-        float vp = ComputeVp(input);
-        float upr = ComputeUp(this.LuvWhitePoint);
-        float vpr = ComputeVp(this.LuvWhitePoint);
-
-        float l = yr > CieConstants.Epsilon ? ((116 * MathF.Pow(yr, 0.3333333F)) - 16F) : (CieConstants.Kappa * yr);
-
-        if (float.IsNaN(l) || l < 0)
-        {
-            l = 0;
-        }
-
-        float u = 13 * l * (up - upr);
-        float v = 13 * l * (vp - vpr);
-
-        if (float.IsNaN(u))
-        {
-            u = 0;
-        }
-
-        if (float.IsNaN(v))
-        {
-            v = 0;
-        }
-
-        return new CieLuv(l, u, v, this.LuvWhitePoint);
-    }
-
-    /// <summary>
-    /// Calculates the blue-yellow chromacity based on the given whitepoint.
-    /// </summary>
-    /// <param name="input">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static float ComputeUp(in CieXyz input)
-        => (4 * input.X) / (input.X + (15 * input.Y) + (3 * input.Z));
-
-    /// <summary>
-    /// Calculates the red-green chromacity based on the given whitepoint.
-    /// </summary>
-    /// <param name="input">The whitepoint</param>
-    /// <returns>The <see cref="float"/></returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    private static float ComputeVp(in CieXyz input)
-       => (9 * input.Y) / (input.X + (15 * input.Y) + (3 * input.Z));
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToHunterLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToHunterLabConverter.cs
deleted file mode 100644
index dab953a74..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToHunterLabConverter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="CieXyz"/> and <see cref="HunterLab"/>
-/// </summary>
-internal sealed class CieXyzToHunterLabConverter : CieXyzAndHunterLabConverterBase
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToHunterLabConverter"/> class.
-    /// </summary>
-    public CieXyzToHunterLabConverter()
-        : this(HunterLab.DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToHunterLabConverter"/> class.
-    /// </summary>
-    /// <param name="labWhitePoint">The hunter Lab white point.</param>
-    public CieXyzToHunterLabConverter(CieXyz labWhitePoint) => this.HunterLabWhitePoint = labWhitePoint;
-
-    /// <summary>
-    /// Gets the target reference white. When not set, <see cref="HunterLab.DefaultWhitePoint"/> is used.
-    /// </summary>
-    public CieXyz HunterLabWhitePoint { get; }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="HunterLab"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public HunterLab Convert(in CieXyz input)
-    {
-        // Conversion algorithm described here: http://en.wikipedia.org/wiki/Lab_color_space#Hunter_Lab
-        float x = input.X, y = input.Y, z = input.Z;
-        float xn = this.HunterLabWhitePoint.X, yn = this.HunterLabWhitePoint.Y, zn = this.HunterLabWhitePoint.Z;
-
-        float ka = ComputeKa(this.HunterLabWhitePoint);
-        float kb = ComputeKb(this.HunterLabWhitePoint);
-
-        float yByYn = y / yn;
-        float sqrtYbyYn = MathF.Sqrt(yByYn);
-        float l = 100 * sqrtYbyYn;
-        float a = ka * (((x / xn) - yByYn) / sqrtYbyYn);
-        float b = kb * ((yByYn - (z / zn)) / sqrtYbyYn);
-
-        if (float.IsNaN(a))
-        {
-            a = 0;
-        }
-
-        if (float.IsNaN(b))
-        {
-            b = 0;
-        }
-
-        return new HunterLab(l, a, b, this.HunterLabWhitePoint);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToLinearRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToLinearRgbConverter.cs
deleted file mode 100644
index 4d15cb5d5..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CieXyzToLinearRgbConverter.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="CieXyz"/> and <see cref="LinearRgb"/>
-/// </summary>
-internal sealed class CieXyzToLinearRgbConverter : LinearRgbAndCieXyzConverterBase
-{
-    private readonly Matrix4x4 conversionMatrix;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToLinearRgbConverter"/> class.
-    /// </summary>
-    public CieXyzToLinearRgbConverter()
-        : this(Rgb.DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CieXyzToLinearRgbConverter"/> class.
-    /// </summary>
-    /// <param name="workingSpace">The target working space.</param>
-    public CieXyzToLinearRgbConverter(RgbWorkingSpace workingSpace)
-    {
-        this.TargetWorkingSpace = workingSpace;
-
-        // Gets the inverted Rgb -> Xyz matrix
-        Matrix4x4.Invert(GetRgbToCieXyzMatrix(workingSpace), out Matrix4x4 inverted);
-
-        this.conversionMatrix = inverted;
-    }
-
-    /// <summary>
-    /// Gets the target working space.
-    /// </summary>
-    public RgbWorkingSpace TargetWorkingSpace { get; }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="CieXyz"/> input to an instance of <see cref="LinearRgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public LinearRgb Convert(in CieXyz input)
-    {
-        var vector = Vector3.Transform(input.ToVector3(), this.conversionMatrix);
-
-        return new LinearRgb(vector, this.TargetWorkingSpace);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CmykAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CmykAndRgbConverter.cs
deleted file mode 100644
index 07ca1c7e4..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/CmykAndRgbConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="Cmyk"/> and <see cref="Rgb"/>.
-/// </summary>
-internal static class CmykAndRgbConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="Cmyk"/> input to an instance of <see cref="Rgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Rgb Convert(in Cmyk input)
-    {
-        Vector3 rgb = (Vector3.One - new Vector3(input.C, input.M, input.Y)) * (Vector3.One - new Vector3(input.K));
-        return new Rgb(rgb);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="Cmyk"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Cmyk Convert(in Rgb input)
-    {
-        // To CMY
-        Vector3 cmy = Vector3.One - input.ToVector3();
-
-        // To CMYK
-        Vector3 k = new(MathF.Min(cmy.X, MathF.Min(cmy.Y, cmy.Z)));
-
-        if (MathF.Abs(k.X - 1F) < Constants.Epsilon)
-        {
-            return new Cmyk(0, 0, 0, 1F);
-        }
-
-        cmy = (cmy - k) / (Vector3.One - k);
-
-        return new Cmyk(cmy.X, cmy.Y, cmy.Z, k.X);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HslAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HslAndRgbConverter.cs
deleted file mode 100644
index 24aecc3c4..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HslAndRgbConverter.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between HSL and Rgb
-/// See <see href="http://www.poynton.com/PDFs/coloureq.pdf"/> for formulas.
-/// </summary>
-internal static class HslAndRgbConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="Hsl"/> input to an instance of <see cref="Rgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Rgb Convert(in Hsl input)
-    {
-        float rangedH = input.H / 360F;
-        float r = 0;
-        float g = 0;
-        float b = 0;
-        float s = input.S;
-        float l = input.L;
-
-        if (MathF.Abs(l) > Constants.Epsilon)
-        {
-            if (MathF.Abs(s) < Constants.Epsilon)
-            {
-                r = g = b = l;
-            }
-            else
-            {
-                float temp2 = (l < .5F) ? l * (1F + s) : l + s - (l * s);
-                float temp1 = (2F * l) - temp2;
-
-                r = GetColorComponent(temp1, temp2, rangedH + 0.3333333F);
-                g = GetColorComponent(temp1, temp2, rangedH);
-                b = GetColorComponent(temp1, temp2, rangedH - 0.3333333F);
-            }
-        }
-
-        return new Rgb(r, g, b);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="Hsl"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Hsl Convert(in Rgb input)
-    {
-        float r = input.R;
-        float g = input.G;
-        float b = input.B;
-
-        float max = MathF.Max(r, MathF.Max(g, b));
-        float min = MathF.Min(r, MathF.Min(g, b));
-        float chroma = max - min;
-        float h = 0F;
-        float s = 0F;
-        float l = (max + min) / 2F;
-
-        if (MathF.Abs(chroma) < Constants.Epsilon)
-        {
-            return new Hsl(0F, s, l);
-        }
-
-        if (MathF.Abs(r - max) < Constants.Epsilon)
-        {
-            h = (g - b) / chroma;
-        }
-        else if (MathF.Abs(g - max) < Constants.Epsilon)
-        {
-            h = 2F + ((b - r) / chroma);
-        }
-        else if (MathF.Abs(b - max) < Constants.Epsilon)
-        {
-            h = 4F + ((r - g) / chroma);
-        }
-
-        h *= 60F;
-        if (h < 0F)
-        {
-            h += 360F;
-        }
-
-        if (l <= .5F)
-        {
-            s = chroma / (max + min);
-        }
-        else
-        {
-            s = chroma / (2F - max - min);
-        }
-
-        return new Hsl(h, s, l);
-    }
-
-    /// <summary>
-    /// Gets the color component from the given values.
-    /// </summary>
-    /// <param name="first">The first value.</param>
-    /// <param name="second">The second value.</param>
-    /// <param name="third">The third value.</param>
-    /// <returns>
-    /// The <see cref="float"/>.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    private static float GetColorComponent(float first, float second, float third)
-    {
-        third = MoveIntoRange(third);
-        if (third < 0.1666667F)
-        {
-            return first + ((second - first) * 6F * third);
-        }
-
-        if (third < .5F)
-        {
-            return second;
-        }
-
-        if (third < 0.6666667F)
-        {
-            return first + ((second - first) * (0.6666667F - third) * 6F);
-        }
-
-        return first;
-    }
-
-    /// <summary>
-    /// Moves the specific value within the acceptable range for
-    /// conversion.
-    /// <remarks>Used for converting <see cref="Hsl"/> colors to this type.</remarks>
-    /// </summary>
-    /// <param name="value">The value to shift.</param>
-    /// <returns>
-    /// The <see cref="float"/>.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    private static float MoveIntoRange(float value)
-    {
-        if (value < 0F)
-        {
-            value++;
-        }
-        else if (value > 1F)
-        {
-            value--;
-        }
-
-        return value;
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HsvAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HsvAndRgbConverter.cs
deleted file mode 100644
index 527357617..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HsvAndRgbConverter.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between HSV and Rgb
-/// See <see href="http://www.poynton.com/PDFs/coloureq.pdf"/> for formulas.
-/// </summary>
-internal static class HsvAndRgbConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="Hsv"/> input to an instance of <see cref="Rgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Rgb Convert(in Hsv input)
-    {
-        float s = input.S;
-        float v = input.V;
-
-        if (MathF.Abs(s) < Constants.Epsilon)
-        {
-            return new Rgb(v, v, v);
-        }
-
-        float h = (MathF.Abs(input.H - 360) < Constants.Epsilon) ? 0 : input.H / 60;
-        int i = (int)Math.Truncate(h);
-        float f = h - i;
-
-        float p = v * (1F - s);
-        float q = v * (1F - (s * f));
-        float t = v * (1F - (s * (1F - f)));
-
-        float r, g, b;
-        switch (i)
-        {
-            case 0:
-                r = v;
-                g = t;
-                b = p;
-                break;
-
-            case 1:
-                r = q;
-                g = v;
-                b = p;
-                break;
-
-            case 2:
-                r = p;
-                g = v;
-                b = t;
-                break;
-
-            case 3:
-                r = p;
-                g = q;
-                b = v;
-                break;
-
-            case 4:
-                r = t;
-                g = p;
-                b = v;
-                break;
-
-            default:
-                r = v;
-                g = p;
-                b = q;
-                break;
-        }
-
-        return new Rgb(r, g, b);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="Hsv"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Hsv Convert(in Rgb input)
-    {
-        float r = input.R;
-        float g = input.G;
-        float b = input.B;
-
-        float max = MathF.Max(r, MathF.Max(g, b));
-        float min = MathF.Min(r, MathF.Min(g, b));
-        float chroma = max - min;
-        float h = 0;
-        float s = 0;
-        float v = max;
-
-        if (MathF.Abs(chroma) < Constants.Epsilon)
-        {
-            return new Hsv(0, s, v);
-        }
-
-        if (MathF.Abs(r - max) < Constants.Epsilon)
-        {
-            h = (g - b) / chroma;
-        }
-        else if (MathF.Abs(g - max) < Constants.Epsilon)
-        {
-            h = 2 + ((b - r) / chroma);
-        }
-        else if (MathF.Abs(b - max) < Constants.Epsilon)
-        {
-            h = 4 + ((r - g) / chroma);
-        }
-
-        h *= 60;
-        if (h < 0.0)
-        {
-            h += 360;
-        }
-
-        s = chroma / v;
-
-        return new Hsv(h, s, v);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HunterLabToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HunterLabToCieXyzConverter.cs
deleted file mode 100644
index 3930e8dc2..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/HunterLabToCieXyzConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="HunterLab"/> and <see cref="CieXyz"/>
-/// </summary>
-internal sealed class HunterLabToCieXyzConverter : CieXyzAndHunterLabConverterBase
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="HunterLab"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static CieXyz Convert(in HunterLab input)
-    {
-        // Conversion algorithm described here: http://en.wikipedia.org/wiki/Lab_color_space#Hunter_Lab
-        float l = input.L, a = input.A, b = input.B;
-        float xn = input.WhitePoint.X, yn = input.WhitePoint.Y, zn = input.WhitePoint.Z;
-
-        float ka = ComputeKa(input.WhitePoint);
-        float kb = ComputeKb(input.WhitePoint);
-
-        float pow = Numerics.Pow2(l / 100F);
-        float sqrtPow = MathF.Sqrt(pow);
-        float y = pow * yn;
-
-        float x = (((a / ka) * sqrtPow) + pow) * xn;
-        float z = (((b / kb) * sqrtPow) - pow) * (-zn);
-
-        return new CieXyz(x, y, z);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbAndCieXyzConverterBase.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbAndCieXyzConverterBase.cs
deleted file mode 100644
index 27391fc80..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbAndCieXyzConverterBase.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Provides base methods for converting between <see cref="LinearRgb"/> and <see cref="CieXyz"/> color spaces.
-/// </summary>
-internal abstract class LinearRgbAndCieXyzConverterBase
-{
-    /// <summary>
-    /// Returns the correct matrix to convert between the Rgb and CieXyz color space.
-    /// </summary>
-    /// <param name="workingSpace">The Rgb working space.</param>
-    /// <returns>The <see cref="Matrix4x4"/> based on the chromaticity and working space.</returns>
-    public static Matrix4x4 GetRgbToCieXyzMatrix(RgbWorkingSpace workingSpace)
-    {
-        DebugGuard.NotNull(workingSpace, nameof(workingSpace));
-        RgbPrimariesChromaticityCoordinates chromaticity = workingSpace.ChromaticityCoordinates;
-
-        float xr = chromaticity.R.X;
-        float xg = chromaticity.G.X;
-        float xb = chromaticity.B.X;
-        float yr = chromaticity.R.Y;
-        float yg = chromaticity.G.Y;
-        float yb = chromaticity.B.Y;
-
-        float mXr = xr / yr;
-        float mZr = (1 - xr - yr) / yr;
-
-        float mXg = xg / yg;
-        float mZg = (1 - xg - yg) / yg;
-
-        float mXb = xb / yb;
-        float mZb = (1 - xb - yb) / yb;
-
-        Matrix4x4 xyzMatrix = new()
-        {
-            M11 = mXr,
-            M21 = mXg,
-            M31 = mXb,
-            M12 = 1F,
-            M22 = 1F,
-            M32 = 1F,
-            M13 = mZr,
-            M23 = mZg,
-            M33 = mZb,
-            M44 = 1F
-        };
-
-        Matrix4x4.Invert(xyzMatrix, out Matrix4x4 inverseXyzMatrix);
-
-        Vector3 vector = Vector3.Transform(workingSpace.WhitePoint.ToVector3(), inverseXyzMatrix);
-
-        // Use transposed Rows/Columns
-        // TODO: Is there a built in method for this multiplication?
-        return new Matrix4x4
-        {
-            M11 = vector.X * mXr,
-            M21 = vector.Y * mXg,
-            M31 = vector.Z * mXb,
-            M12 = vector.X * 1,
-            M22 = vector.Y * 1,
-            M32 = vector.Z * 1,
-            M13 = vector.X * mZr,
-            M23 = vector.Y * mZg,
-            M33 = vector.Z * mZb,
-            M44 = 1F
-        };
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToCieXyzConverter.cs
deleted file mode 100644
index 091cab993..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToCieXyzConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="LinearRgb"/> and <see cref="CieXyz"/>
-/// </summary>
-internal sealed class LinearRgbToCieXyzConverter : LinearRgbAndCieXyzConverterBase
-{
-    private readonly Matrix4x4 conversionMatrix;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgbToCieXyzConverter"/> class.
-    /// </summary>
-    public LinearRgbToCieXyzConverter()
-        : this(Rgb.DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgbToCieXyzConverter"/> class.
-    /// </summary>
-    /// <param name="workingSpace">The target working space.</param>
-    public LinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
-    {
-        this.SourceWorkingSpace = workingSpace;
-        this.conversionMatrix = GetRgbToCieXyzMatrix(workingSpace);
-    }
-
-    /// <summary>
-    /// Gets the source working space
-    /// </summary>
-    public RgbWorkingSpace SourceWorkingSpace { get; }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="LinearRgb"/> input to an instance of <see cref="CieXyz"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public CieXyz Convert(in LinearRgb input)
-    {
-        DebugGuard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
-
-        Vector3 vector = Vector3.Transform(input.ToVector3(), this.conversionMatrix);
-        return new CieXyz(vector);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToRgbConverter.cs
deleted file mode 100644
index d41e7f74d..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/LinearRgbToRgbConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="LinearRgb"/> and <see cref="Rgb"/>.
-/// </summary>
-internal static class LinearRgbToRgbConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="LinearRgb"/> input to an instance of <see cref="Rgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Rgb Convert(in LinearRgb input) =>
-        new(
-            r: input.WorkingSpace.Compress(input.R),
-            g: input.WorkingSpace.Compress(input.G),
-            b: input.WorkingSpace.Compress(input.B),
-            workingSpace: input.WorkingSpace);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/RgbToLinearRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/RgbToLinearRgbConverter.cs
deleted file mode 100644
index c63bbae3d..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/RgbToLinearRgbConverter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between Rgb and LinearRgb.
-/// </summary>
-internal static class RgbToLinearRgbConverter
-{
-    /// <summary>
-    /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="LinearRgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static LinearRgb Convert(in Rgb input)
-        => new(
-            r: input.WorkingSpace.Expand(input.R),
-            g: input.WorkingSpace.Expand(input.G),
-            b: input.WorkingSpace.Expand(input.B),
-            workingSpace: input.WorkingSpace);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/YCbCrAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/YCbCrAndRgbConverter.cs
deleted file mode 100644
index eda55ec4c..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Converters/YCbCrAndRgbConverter.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Color converter between <see cref="YCbCr"/> and <see cref="Rgb"/>
-/// See <see href="https://en.wikipedia.org/wiki/YCbCr#JPEG_conversion"/> for formulas.
-/// </summary>
-internal static class YCbCrAndRgbConverter
-{
-    private static readonly Vector3 MaxBytes = new(255F);
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="YCbCr"/> input to an instance of <see cref="Rgb"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static Rgb Convert(in YCbCr input)
-    {
-        float y = input.Y;
-        float cb = input.Cb - 128F;
-        float cr = input.Cr - 128F;
-
-        float r = MathF.Round(y + (1.402F * cr), MidpointRounding.AwayFromZero);
-        float g = MathF.Round(y - (0.344136F * cb) - (0.714136F * cr), MidpointRounding.AwayFromZero);
-        float b = MathF.Round(y + (1.772F * cb), MidpointRounding.AwayFromZero);
-
-        return new Rgb(new Vector3(r, g, b) / MaxBytes);
-    }
-
-    /// <summary>
-    /// Performs the conversion from the <see cref="Rgb"/> input to an instance of <see cref="YCbCr"/> type.
-    /// </summary>
-    /// <param name="input">The input color instance.</param>
-    /// <returns>The converted result.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static YCbCr Convert(in Rgb input)
-    {
-        Vector3 rgb = input.ToVector3() * MaxBytes;
-        float r = rgb.X;
-        float g = rgb.Y;
-        float b = rgb.Z;
-
-        float y = (0.299F * r) + (0.587F * g) + (0.114F * b);
-        float cb = 128F + ((-0.168736F * r) - (0.331264F * g) + (0.5F * b));
-        float cr = 128F + ((0.5F * r) - (0.418688F * g) - (0.081312F * b));
-
-        return new YCbCr(y, cb, cr);
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/IChromaticAdaptation.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/IChromaticAdaptation.cs
deleted file mode 100644
index 3b6abb041..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/IChromaticAdaptation.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Chromatic adaptation.
-/// A linear transformation of a source color (XS, YS, ZS) into a destination color (XD, YD, ZD) by a linear transformation [M]
-/// which is dependent on the source reference white (XWS, YWS, ZWS) and the destination reference white (XWD, YWD, ZWD).
-/// </summary>
-public interface IChromaticAdaptation
-{
-    /// <summary>
-    /// Performs a linear transformation of a source color in to the destination color.
-    /// </summary>
-    /// <remarks>Doesn't crop the resulting color space coordinates (e. g. allows negative values for XYZ coordinates).</remarks>
-    /// <param name="source">The source color.</param>
-    /// <param name="sourceWhitePoint">The source white point.</param>
-    /// <param name="destinationWhitePoint">The destination white point.</param>
-    /// <returns>The <see cref="CieXyz"/></returns>
-    CieXyz Transform(in CieXyz source, in CieXyz sourceWhitePoint, in CieXyz destinationWhitePoint);
-
-    /// <summary>
-    /// Performs a bulk linear transformation of a source color in to the destination color.
-    /// </summary>
-    /// <remarks>Doesn't crop the resulting color space coordinates (e. g. allows negative values for XYZ coordinates).</remarks>
-    /// <param name="source">The span to the source colors.</param>
-    /// <param name="destination">The span to the destination colors.</param>
-    /// <param name="sourceWhitePoint">The source white point.</param>
-    /// <param name="destinationWhitePoint">The destination white point.</param>
-    void Transform(
-        ReadOnlySpan<CieXyz> source,
-        Span<CieXyz> destination,
-        CieXyz sourceWhitePoint,
-        in CieXyz destinationWhitePoint);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/LmsAdaptationMatrix.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/LmsAdaptationMatrix.cs
deleted file mode 100644
index 80bd160e8..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/LmsAdaptationMatrix.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Matrices used for transformation from <see cref="CieXyz"/> to <see cref="Lms"/>, defining the cone response domain.
-/// Used in <see cref="IChromaticAdaptation"/>
-/// </summary>
-/// <remarks>
-/// Matrix data obtained from:
-/// Two New von Kries Based Chromatic Adaptation Transforms Found by Numerical Optimization
-/// S. Bianco, R. Schettini
-/// DISCo, Department of Informatics, Systems and Communication, University of Milan-Bicocca, viale Sarca 336, 20126 Milan, Italy
-/// https://web.stanford.edu/~sujason/ColorBalancing/Papers/Two%20New%20von%20Kries%20Based%20Chromatic%20Adaptation.pdf
-/// </remarks>
-public static class LmsAdaptationMatrix
-{
-    /// <summary>
-    /// Von Kries chromatic adaptation transform matrix (Hunt-Pointer-Estevez adjusted for D65)
-    /// </summary>
-    public static readonly Matrix4x4 VonKriesHPEAdjusted
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 0.40024F,
-            M12 = 0.7076F,
-            M13 = -0.08081F,
-            M21 = -0.2263F,
-            M22 = 1.16532F,
-            M23 = 0.0457F,
-            M31 = 0,
-            M32 = 0,
-            M33 = 0.91822F,
-            M44 = 1F // Important for inverse transforms.
-        });
-
-    /// <summary>
-    /// Von Kries chromatic adaptation transform matrix (Hunt-Pointer-Estevez for equal energy)
-    /// </summary>
-    public static readonly Matrix4x4 VonKriesHPE
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 0.3897F,
-            M12 = 0.6890F,
-            M13 = -0.0787F,
-            M21 = -0.2298F,
-            M22 = 1.1834F,
-            M23 = 0.0464F,
-            M31 = 0,
-            M32 = 0,
-            M33 = 1F,
-            M44 = 1F
-        });
-
-    /// <summary>
-    /// XYZ scaling chromatic adaptation transform matrix
-    /// </summary>
-    public static readonly Matrix4x4 XyzScaling = Matrix4x4.Transpose(Matrix4x4.Identity);
-
-    /// <summary>
-    /// Bradford chromatic adaptation transform matrix (used in CMCCAT97)
-    /// </summary>
-    public static readonly Matrix4x4 Bradford
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 0.8951F,
-            M12 = 0.2664F,
-            M13 = -0.1614F,
-            M21 = -0.7502F,
-            M22 = 1.7135F,
-            M23 = 0.0367F,
-            M31 = 0.0389F,
-            M32 = -0.0685F,
-            M33 = 1.0296F,
-            M44 = 1F
-        });
-
-    /// <summary>
-    /// Spectral sharpening and the Bradford transform
-    /// </summary>
-    public static readonly Matrix4x4 BradfordSharp
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 1.2694F,
-            M12 = -0.0988F,
-            M13 = -0.1706F,
-            M21 = -0.8364F,
-            M22 = 1.8006F,
-            M23 = 0.0357F,
-            M31 = 0.0297F,
-            M32 = -0.0315F,
-            M33 = 1.0018F,
-            M44 = 1F
-        });
-
-    /// <summary>
-    /// CMCCAT2000 (fitted from all available color data sets)
-    /// </summary>
-    public static readonly Matrix4x4 CMCCAT2000
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 0.7982F,
-            M12 = 0.3389F,
-            M13 = -0.1371F,
-            M21 = -0.5918F,
-            M22 = 1.5512F,
-            M23 = 0.0406F,
-            M31 = 0.0008F,
-            M32 = 0.239F,
-            M33 = 0.9753F,
-            M44 = 1F
-        });
-
-    /// <summary>
-    /// CAT02 (optimized for minimizing CIELAB differences)
-    /// </summary>
-    public static readonly Matrix4x4 CAT02
-        = Matrix4x4.Transpose(new Matrix4x4
-        {
-            M11 = 0.7328F,
-            M12 = 0.4296F,
-            M13 = -0.1624F,
-            M21 = -0.7036F,
-            M22 = 1.6975F,
-            M23 = 0.0061F,
-            M31 = 0.0030F,
-            M32 = 0.0136F,
-            M33 = 0.9834F,
-            M44 = 1F
-        });
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/RGBPrimariesChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/RGBPrimariesChromaticityCoordinates.cs
deleted file mode 100644
index 625e6c551..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/RGBPrimariesChromaticityCoordinates.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Represents the chromaticity coordinates of RGB primaries.
-/// One of the specifiers of <see cref="RgbWorkingSpace"/>.
-/// </summary>
-public readonly struct RgbPrimariesChromaticityCoordinates : IEquatable<RgbPrimariesChromaticityCoordinates>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RgbPrimariesChromaticityCoordinates"/> struct.
-    /// </summary>
-    /// <param name="r">The chromaticity coordinates of the red channel.</param>
-    /// <param name="g">The chromaticity coordinates of the green channel.</param>
-    /// <param name="b">The chromaticity coordinates of the blue channel.</param>
-    public RgbPrimariesChromaticityCoordinates(CieXyChromaticityCoordinates r, CieXyChromaticityCoordinates g, CieXyChromaticityCoordinates b)
-    {
-        this.R = r;
-        this.G = g;
-        this.B = b;
-    }
-
-    /// <summary>
-    /// Gets the chromaticity coordinates of the red channel.
-    /// </summary>
-    public CieXyChromaticityCoordinates R { get; }
-
-    /// <summary>
-    /// Gets the chromaticity coordinates of the green channel.
-    /// </summary>
-    public CieXyChromaticityCoordinates G { get; }
-
-    /// <summary>
-    /// Gets the chromaticity coordinates of the blue channel.
-    /// </summary>
-    public CieXyChromaticityCoordinates B { get; }
-
-    /// <summary>
-    /// Compares two <see cref="RgbPrimariesChromaticityCoordinates"/> objects for equality.
-    /// </summary>
-    /// <param name="left">
-    /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the left side of the operand.
-    /// </param>
-    /// <param name="right">
-    /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the right side of the operand.
-    /// </param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator ==(RgbPrimariesChromaticityCoordinates left, RgbPrimariesChromaticityCoordinates right)
-    {
-        return left.Equals(right);
-    }
-
-    /// <summary>
-    /// Compares two <see cref="RgbPrimariesChromaticityCoordinates"/> objects for inequality
-    /// </summary>
-    /// <param name="left">
-    /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the left side of the operand.
-    /// </param>
-    /// <param name="right">
-    /// The <see cref="RgbPrimariesChromaticityCoordinates"/> on the right side of the operand.
-    /// </param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator !=(RgbPrimariesChromaticityCoordinates left, RgbPrimariesChromaticityCoordinates right)
-    {
-        return !left.Equals(right);
-    }
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj)
-    {
-        return obj is RgbPrimariesChromaticityCoordinates other && this.Equals(other);
-    }
-
-    /// <inheritdoc/>
-    public bool Equals(RgbPrimariesChromaticityCoordinates other)
-    {
-        return this.R.Equals(other.R) && this.G.Equals(other.G) && this.B.Equals(other.B);
-    }
-
-    /// <inheritdoc />
-    public override int GetHashCode() => HashCode.Combine(this.R, this.G, this.B);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/VonKriesChromaticAdaptation.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/VonKriesChromaticAdaptation.cs
deleted file mode 100644
index 8f33e59f5..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/VonKriesChromaticAdaptation.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Implementation of the Von Kries chromatic adaptation model.
-/// </summary>
-/// <remarks>
-/// Transformation described here:
-/// http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html
-/// </remarks>
-public sealed class VonKriesChromaticAdaptation : IChromaticAdaptation
-{
-    private readonly CieXyzAndLmsConverter converter;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VonKriesChromaticAdaptation"/> class.
-    /// </summary>
-    public VonKriesChromaticAdaptation()
-        : this(new CieXyzAndLmsConverter())
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VonKriesChromaticAdaptation"/> class.
-    /// </summary>
-    /// <param name="transformationMatrix">
-    /// The transformation matrix used for the conversion (definition of the cone response domain).
-    /// <see cref="LmsAdaptationMatrix"/>
-    /// </param>
-    public VonKriesChromaticAdaptation(Matrix4x4 transformationMatrix)
-        : this(new CieXyzAndLmsConverter(transformationMatrix))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="VonKriesChromaticAdaptation"/> class.
-    /// </summary>
-    /// <param name="converter">The color converter</param>
-    internal VonKriesChromaticAdaptation(CieXyzAndLmsConverter converter) => this.converter = converter;
-
-    /// <inheritdoc/>
-    public CieXyz Transform(in CieXyz source, in CieXyz sourceWhitePoint, in CieXyz destinationWhitePoint)
-    {
-        if (sourceWhitePoint.Equals(destinationWhitePoint))
-        {
-            return source;
-        }
-
-        Lms sourceColorLms = this.converter.Convert(source);
-        Lms sourceWhitePointLms = this.converter.Convert(sourceWhitePoint);
-        Lms targetWhitePointLms = this.converter.Convert(destinationWhitePoint);
-
-        Vector3 vector = targetWhitePointLms.ToVector3() / sourceWhitePointLms.ToVector3();
-        var targetColorLms = new Lms(Vector3.Multiply(vector, sourceColorLms.ToVector3()));
-
-        return this.converter.Convert(targetColorLms);
-    }
-
-    /// <inheritdoc/>
-    public void Transform(
-        ReadOnlySpan<CieXyz> source,
-        Span<CieXyz> destination,
-        CieXyz sourceWhitePoint,
-        in CieXyz destinationWhitePoint)
-    {
-        Guard.DestinationShouldNotBeTooShort(source, destination, nameof(destination));
-        int count = source.Length;
-
-        if (sourceWhitePoint.Equals(destinationWhitePoint))
-        {
-            source.CopyTo(destination[..count]);
-            return;
-        }
-
-        ref CieXyz sourceRef = ref MemoryMarshal.GetReference(source);
-        ref CieXyz destRef = ref MemoryMarshal.GetReference(destination);
-
-        for (nuint i = 0; i < (uint)count; i++)
-        {
-            ref CieXyz sp = ref Unsafe.Add(ref sourceRef, i);
-            ref CieXyz dp = ref Unsafe.Add(ref destRef, i);
-
-            Lms sourceColorLms = this.converter.Convert(sp);
-            Lms sourceWhitePointLms = this.converter.Convert(sourceWhitePoint);
-            Lms targetWhitePointLms = this.converter.Convert(destinationWhitePoint);
-
-            Vector3 vector = targetWhitePointLms.ToVector3() / sourceWhitePointLms.ToVector3();
-            var targetColorLms = new Lms(Vector3.Multiply(vector, sourceColorLms.ToVector3()));
-
-            dp = this.converter.Convert(targetColorLms);
-        }
-    }
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/GammaWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/GammaWorkingSpace.cs
deleted file mode 100644
index e95f1f2b4..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/GammaWorkingSpace.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// The gamma working space.
-/// </summary>
-public sealed class GammaWorkingSpace : RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GammaWorkingSpace" /> class.
-    /// </summary>
-    /// <param name="gamma">The gamma value.</param>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    public GammaWorkingSpace(float gamma, CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-        : base(referenceWhite, chromaticityCoordinates) => this.Gamma = gamma;
-
-    /// <summary>
-    /// Gets the gamma value.
-    /// </summary>
-    public float Gamma { get; }
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Compress(float channel) => GammaCompanding.Compress(channel, this.Gamma);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Expand(float channel) => GammaCompanding.Expand(channel, this.Gamma);
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj)
-    {
-        if (obj is null)
-        {
-            return false;
-        }
-
-        if (ReferenceEquals(this, obj))
-        {
-            return true;
-        }
-
-        if (obj is GammaWorkingSpace other)
-        {
-            return this.Gamma.Equals(other.Gamma)
-                && this.WhitePoint.Equals(other.WhitePoint)
-                && this.ChromaticityCoordinates.Equals(other.ChromaticityCoordinates);
-        }
-
-        return false;
-    }
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(
-        this.WhitePoint,
-        this.ChromaticityCoordinates,
-        this.Gamma);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/LWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/LWorkingSpace.cs
deleted file mode 100644
index 199f6c8d8..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/LWorkingSpace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// L* working space.
-/// </summary>
-public sealed class LWorkingSpace : RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LWorkingSpace" /> class.
-    /// </summary>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    public LWorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-        : base(referenceWhite, chromaticityCoordinates)
-    {
-    }
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Compress(float channel) => LCompanding.Compress(channel);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Expand(float channel) => LCompanding.Expand(channel);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec2020WorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec2020WorkingSpace.cs
deleted file mode 100644
index 52cc0f95a..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec2020WorkingSpace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Rec. 2020 (ITU-R Recommendation BT.2020F) working space.
-/// </summary>
-public sealed class Rec2020WorkingSpace : RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rec2020WorkingSpace" /> class.
-    /// </summary>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    public Rec2020WorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-        : base(referenceWhite, chromaticityCoordinates)
-    {
-    }
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Compress(float channel) => Rec2020Companding.Compress(channel);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Expand(float channel) => Rec2020Companding.Expand(channel);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec709WorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec709WorkingSpace.cs
deleted file mode 100644
index c030e9102..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/Rec709WorkingSpace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Rec. 709 (ITU-R Recommendation BT.709) working space.
-/// </summary>
-public sealed class Rec709WorkingSpace : RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rec709WorkingSpace" /> class.
-    /// </summary>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    public Rec709WorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-        : base(referenceWhite, chromaticityCoordinates)
-    {
-    }
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Compress(float channel) => Rec709Companding.Compress(channel);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Expand(float channel) => Rec709Companding.Expand(channel);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/RgbWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/RgbWorkingSpace.cs
deleted file mode 100644
index dd1dc62a8..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/RgbWorkingSpace.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// Base class for all implementations of <see cref="RgbWorkingSpace"/>.
-/// </summary>
-public abstract class RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RgbWorkingSpace"/> class.
-    /// </summary>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    protected RgbWorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-    {
-        this.WhitePoint = referenceWhite;
-        this.ChromaticityCoordinates = chromaticityCoordinates;
-    }
-
-    /// <summary>
-    /// Gets the reference white point
-    /// </summary>
-    public CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Gets the chromaticity of the rgb primaries.
-    /// </summary>
-    public RgbPrimariesChromaticityCoordinates ChromaticityCoordinates { get; }
-
-    /// <summary>
-    /// Expands a companded channel to its linear equivalent with respect to the energy.
-    /// </summary>
-    /// <remarks>
-    /// For more info see:
-    /// <see href="http://www.brucelindbloom.com/index.html?Eqn_RGB_to_XYZ.html"/>
-    /// </remarks>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the linear channel value.</returns>
-    public abstract float Expand(float channel);
-
-    /// <summary>
-    /// Compresses an uncompanded channel (linear) to its nonlinear equivalent (depends on the RGB color system).
-    /// </summary>
-    /// <remarks>
-    /// For more info see:
-    /// <see href="http://www.brucelindbloom.com/index.html?Eqn_XYZ_to_RGB.html"/>
-    /// </remarks>
-    /// <param name="channel">The channel value.</param>
-    /// <returns>The <see cref="float"/> representing the nonlinear channel value.</returns>
-    public abstract float Compress(float channel);
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj)
-    {
-        if (obj is null)
-        {
-            return false;
-        }
-
-        if (ReferenceEquals(this, obj))
-        {
-            return true;
-        }
-
-        if (obj is RgbWorkingSpace other)
-        {
-            return this.WhitePoint.Equals(other.WhitePoint)
-                && this.ChromaticityCoordinates.Equals(other.ChromaticityCoordinates);
-        }
-
-        return false;
-    }
-
-    /// <inheritdoc/>
-    public override int GetHashCode()
-        => HashCode.Combine(this.WhitePoint, this.ChromaticityCoordinates);
-}
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/SRgbWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/SRgbWorkingSpace.cs
deleted file mode 100644
index 767157f4c..000000000
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/WorkingSpaces/SRgbWorkingSpace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-/// <summary>
-/// The sRgb working space.
-/// </summary>
-public sealed class SRgbWorkingSpace : RgbWorkingSpace
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SRgbWorkingSpace" /> class.
-    /// </summary>
-    /// <param name="referenceWhite">The reference white point.</param>
-    /// <param name="chromaticityCoordinates">The chromaticity of the rgb primaries.</param>
-    public SRgbWorkingSpace(CieXyz referenceWhite, RgbPrimariesChromaticityCoordinates chromaticityCoordinates)
-        : base(referenceWhite, chromaticityCoordinates)
-    {
-    }
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Compress(float channel) => SRgbCompanding.Compress(channel);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override float Expand(float channel) => SRgbCompanding.Expand(channel);
-}
diff --git a/src/ImageSharp/ColorSpaces/Hsl.cs b/src/ImageSharp/ColorSpaces/Hsl.cs
deleted file mode 100644
index cf18c70c7..000000000
--- a/src/ImageSharp/ColorSpaces/Hsl.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents a Hsl (hue, saturation, lightness) color.
-/// </summary>
-public readonly struct Hsl : IEquatable<Hsl>
-{
-    private static readonly Vector3 Min = Vector3.Zero;
-    private static readonly Vector3 Max = new(360, 1, 1);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Hsl"/> struct.
-    /// </summary>
-    /// <param name="h">The h hue component.</param>
-    /// <param name="s">The s saturation component.</param>
-    /// <param name="l">The l value (lightness) component.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Hsl(float h, float s, float l)
-        : this(new Vector3(h, s, l))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Hsl"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the h, s, l components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Hsl(Vector3 vector)
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.H = vector.X;
-        this.S = vector.Y;
-        this.L = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the hue component.
-    /// <remarks>A value ranging between 0 and 360.</remarks>
-    /// </summary>
-    public readonly float H { get; }
-
-    /// <summary>
-    /// Gets the saturation component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float S { get; }
-
-    /// <summary>
-    /// Gets the lightness component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Compares two <see cref="Hsl"/> objects for equality.
-    /// </summary>
-    /// <param name="left">
-    /// The <see cref="Hsl"/> on the left side of the operand.
-    /// </param>
-    /// <param name="right">The <see cref="Hsl"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(Hsl left, Hsl right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="Hsl"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="Hsl"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Hsl"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(Hsl left, Hsl right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.H, this.S, this.L);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"Hsl({this.H:#0.##}, {this.S:#0.##}, {this.L:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Hsl other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(Hsl other)
-        => this.H.Equals(other.H)
-        && this.S.Equals(other.S)
-        && this.L.Equals(other.L);
-}
diff --git a/src/ImageSharp/ColorSpaces/Hsv.cs b/src/ImageSharp/ColorSpaces/Hsv.cs
deleted file mode 100644
index 87c16c0b6..000000000
--- a/src/ImageSharp/ColorSpaces/Hsv.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents a HSV (hue, saturation, value) color. Also known as HSB (hue, saturation, brightness).
-/// </summary>
-public readonly struct Hsv : IEquatable<Hsv>
-{
-    private static readonly Vector3 Min = Vector3.Zero;
-    private static readonly Vector3 Max = new(360, 1, 1);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Hsv"/> struct.
-    /// </summary>
-    /// <param name="h">The h hue component.</param>
-    /// <param name="s">The s saturation component.</param>
-    /// <param name="v">The v value (brightness) component.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Hsv(float h, float s, float v)
-        : this(new Vector3(h, s, v))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Hsv"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the h, s, v components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Hsv(Vector3 vector)
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.H = vector.X;
-        this.S = vector.Y;
-        this.V = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the hue component.
-    /// <remarks>A value ranging between 0 and 360.</remarks>
-    /// </summary>
-    public readonly float H { get; }
-
-    /// <summary>
-    /// Gets the saturation component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float S { get; }
-
-    /// <summary>
-    /// Gets the value (brightness) component.
-    /// <remarks>A value ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float V { get; }
-
-    /// <summary>
-    /// Compares two <see cref="Hsv"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="Hsv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Hsv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(Hsv left, Hsv right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="Hsv"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="Hsv"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Hsv"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(Hsv left, Hsv right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.H, this.S, this.V);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"Hsv({this.H:#0.##}, {this.S:#0.##}, {this.V:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Hsv other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(Hsv other)
-        => this.H.Equals(other.H)
-        && this.S.Equals(other.S)
-        && this.V.Equals(other.V);
-}
diff --git a/src/ImageSharp/ColorSpaces/HunterLab.cs b/src/ImageSharp/ColorSpaces/HunterLab.cs
deleted file mode 100644
index 516574b09..000000000
--- a/src/ImageSharp/ColorSpaces/HunterLab.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an Hunter LAB color.
-/// <see href="https://en.wikipedia.org/wiki/Lab_color_space"/>.
-/// </summary>
-public readonly struct HunterLab : IEquatable<HunterLab>
-{
-    /// <summary>
-    /// D50 standard illuminant.
-    /// Used when reference white is not specified explicitly.
-    /// </summary>
-    public static readonly CieXyz DefaultWhitePoint = Illuminants.C;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HunterLab"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="a">The a (green - magenta) component.</param>
-    /// <param name="b">The b (blue - yellow) component.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public HunterLab(float l, float a, float b)
-        : this(new Vector3(l, a, b), DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HunterLab"/> struct.
-    /// </summary>
-    /// <param name="l">The lightness dimension.</param>
-    /// <param name="a">The a (green - magenta) component.</param>
-    /// <param name="b">The b (blue - yellow) component.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public HunterLab(float l, float a, float b, CieXyz whitePoint)
-        : this(new Vector3(l, a, b), whitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HunterLab"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, a, b components.</param>
-    /// <remarks>Uses <see cref="DefaultWhitePoint"/> as white point.</remarks>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public HunterLab(Vector3 vector)
-        : this(vector, DefaultWhitePoint)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HunterLab"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l a b components.</param>
-    /// <param name="whitePoint">The reference white point. <see cref="Illuminants"/></param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public HunterLab(Vector3 vector, CieXyz whitePoint)
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.L = vector.X;
-        this.A = vector.Y;
-        this.B = vector.Z;
-        this.WhitePoint = whitePoint;
-    }
-
-    /// <summary>
-    /// Gets the lightness dimension.
-    /// <remarks>A value usually ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the a color component.
-    /// <remarks>A value usually ranging from -100 to 100. Negative is green, positive magenta.</remarks>
-    /// </summary>
-    public readonly float A { get; }
-
-    /// <summary>
-    /// Gets the b color component.
-    /// <remarks>A value usually ranging from -100 to 100. Negative is blue, positive is yellow</remarks>
-    /// </summary>
-    public readonly float B { get; }
-
-    /// <summary>
-    /// Gets the reference white point of this color.
-    /// </summary>
-    public readonly CieXyz WhitePoint { get; }
-
-    /// <summary>
-    /// Compares two <see cref="HunterLab"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="HunterLab"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="HunterLab"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator ==(HunterLab left, HunterLab right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="HunterLab"/> objects for inequality
-    /// </summary>
-    /// <param name="left">The <see cref="HunterLab"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="HunterLab"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(HunterLab left, HunterLab right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.L, this.A, this.B, this.WhitePoint);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"HunterLab({this.L:#0.##}, {this.A:#0.##}, {this.B:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is HunterLab other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(HunterLab other)
-        => this.L.Equals(other.L)
-        && this.A.Equals(other.A)
-        && this.B.Equals(other.B)
-        && this.WhitePoint.Equals(other.WhitePoint);
-}
diff --git a/src/ImageSharp/ColorSpaces/Illuminants.cs b/src/ImageSharp/ColorSpaces/Illuminants.cs
deleted file mode 100644
index 7c25305c2..000000000
--- a/src/ImageSharp/ColorSpaces/Illuminants.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// The well known standard illuminants.
-/// Standard illuminants provide a basis for comparing images or colors recorded under different lighting
-/// </summary>
-/// <remarks>
-/// Coefficients taken from: http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html
-/// <br />
-/// Descriptions taken from: http://en.wikipedia.org/wiki/Standard_illuminant
-/// </remarks>
-public static class Illuminants
-{
-    /// <summary>
-    /// Incandescent / Tungsten
-    /// </summary>
-    public static readonly CieXyz A = new CieXyz(1.09850F, 1F, 0.35585F);
-
-    /// <summary>
-    /// Direct sunlight at noon (obsoleteF)
-    /// </summary>
-    public static readonly CieXyz B = new CieXyz(0.99072F, 1F, 0.85223F);
-
-    /// <summary>
-    /// Average / North sky Daylight (obsoleteF)
-    /// </summary>
-    public static readonly CieXyz C = new CieXyz(0.98074F, 1F, 1.18232F);
-
-    /// <summary>
-    /// Horizon Light. ICC profile PCS
-    /// </summary>
-    public static readonly CieXyz D50 = new CieXyz(0.96422F, 1F, 0.82521F);
-
-    /// <summary>
-    /// Mid-morning / Mid-afternoon Daylight
-    /// </summary>
-    public static readonly CieXyz D55 = new CieXyz(0.95682F, 1F, 0.92149F);
-
-    /// <summary>
-    /// Noon Daylight: TelevisionF, sRGB color space
-    /// </summary>
-    public static readonly CieXyz D65 = new CieXyz(0.95047F, 1F, 1.08883F);
-
-    /// <summary>
-    /// North sky Daylight
-    /// </summary>
-    public static readonly CieXyz D75 = new CieXyz(0.94972F, 1F, 1.22638F);
-
-    /// <summary>
-    /// Equal energy
-    /// </summary>
-    public static readonly CieXyz E = new CieXyz(1F, 1F, 1F);
-
-    /// <summary>
-    /// Cool White Fluorescent
-    /// </summary>
-    public static readonly CieXyz F2 = new CieXyz(0.99186F, 1F, 0.67393F);
-
-    /// <summary>
-    /// D65 simulatorF, Daylight simulator
-    /// </summary>
-    public static readonly CieXyz F7 = new CieXyz(0.95041F, 1F, 1.08747F);
-
-    /// <summary>
-    /// Philips TL84F, Ultralume 40
-    /// </summary>
-    public static readonly CieXyz F11 = new CieXyz(1.00962F, 1F, 0.64350F);
-}
diff --git a/src/ImageSharp/ColorSpaces/LinearRgb.cs b/src/ImageSharp/ColorSpaces/LinearRgb.cs
deleted file mode 100644
index 49c7814a0..000000000
--- a/src/ImageSharp/ColorSpaces/LinearRgb.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an linear Rgb color with specified <see cref="RgbWorkingSpace"/> working space
-/// </summary>
-public readonly struct LinearRgb : IEquatable<LinearRgb>
-{
-    private static readonly Vector3 Min = Vector3.Zero;
-    private static readonly Vector3 Max = Vector3.One;
-
-    /// <summary>
-    /// The default LinearRgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgb"/> struct.
-    /// </summary>
-    /// <param name="r">The red component ranging between 0 and 1.</param>
-    /// <param name="g">The green component ranging between 0 and 1.</param>
-    /// <param name="b">The blue component ranging between 0 and 1.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public LinearRgb(float r, float g, float b)
-        : this(r, g, b, DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgb"/> struct.
-    /// </summary>
-    /// <param name="r">The red component ranging between 0 and 1.</param>
-    /// <param name="g">The green component ranging between 0 and 1.</param>
-    /// <param name="b">The blue component ranging between 0 and 1.</param>
-    /// <param name="workingSpace">The rgb working space.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public LinearRgb(float r, float g, float b, RgbWorkingSpace workingSpace)
-        : this(new Vector3(r, g, b), workingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgb"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the r, g, b components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public LinearRgb(Vector3 vector)
-        : this(vector, DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinearRgb"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the r, g, b components.</param>
-    /// <param name="workingSpace">The LinearRgb working space.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public LinearRgb(Vector3 vector, RgbWorkingSpace workingSpace)
-    {
-        // Clamp to 0-1 range.
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.R = vector.X;
-        this.G = vector.Y;
-        this.B = vector.Z;
-        this.WorkingSpace = workingSpace;
-    }
-
-    /// <summary>
-    /// Gets the red component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float R { get; }
-
-    /// <summary>
-    /// Gets the green component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float G { get; }
-
-    /// <summary>
-    /// Gets the blue component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float B { get; }
-
-    /// <summary>
-    /// Gets the LinearRgb color space <seealso cref="RgbWorkingSpaces"/>
-    /// </summary>
-    public readonly RgbWorkingSpace WorkingSpace { get; }
-
-    /// <summary>
-    /// Compares two <see cref="LinearRgb"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="LinearRgb"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="LinearRgb"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(LinearRgb left, LinearRgb right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="LinearRgb"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="LinearRgb"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="LinearRgb"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(LinearRgb left, LinearRgb right) => !left.Equals(right);
-
-    /// <summary>
-    /// Returns a new <see cref="Vector3"/> representing this instance.
-    /// </summary>
-    /// <returns>The <see cref="Vector3"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Vector3 ToVector3() => new(this.R, this.G, this.B);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.R, this.G, this.B);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"LinearRgb({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is LinearRgb other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(LinearRgb other)
-        => this.R.Equals(other.R)
-        && this.G.Equals(other.G)
-        && this.B.Equals(other.B);
-}
diff --git a/src/ImageSharp/ColorSpaces/Lms.cs b/src/ImageSharp/ColorSpaces/Lms.cs
deleted file mode 100644
index 99210ff6e..000000000
--- a/src/ImageSharp/ColorSpaces/Lms.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// LMS is a color space represented by the response of the three types of cones of the human eye,
-/// named after their responsivity (sensitivity) at long, medium and short wavelengths.
-/// <see href="https://en.wikipedia.org/wiki/LMS_color_space"/>
-/// </summary>
-public readonly struct Lms : IEquatable<Lms>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Lms"/> struct.
-    /// </summary>
-    /// <param name="l">L represents the responsivity at long wavelengths.</param>
-    /// <param name="m">M represents the responsivity at medium wavelengths.</param>
-    /// <param name="s">S represents the responsivity at short wavelengths.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Lms(float l, float m, float s)
-        : this(new Vector3(l, m, s))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Lms"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the l, m, s components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Lms(Vector3 vector)
-    {
-        // Not clamping as documentation about this space only indicates "usual" ranges
-        this.L = vector.X;
-        this.M = vector.Y;
-        this.S = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the L long component.
-    /// <remarks>A value usually ranging between -1 and 1.</remarks>
-    /// </summary>
-    public readonly float L { get; }
-
-    /// <summary>
-    /// Gets the M medium component.
-    /// <remarks>A value usually ranging between -1 and 1.</remarks>
-    /// </summary>
-    public readonly float M { get; }
-
-    /// <summary>
-    /// Gets the S short component.
-    /// <remarks>A value usually ranging between -1 and 1.</remarks>
-    /// </summary>
-    public readonly float S { get; }
-
-    /// <summary>
-    /// Compares two <see cref="Lms"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="Lms"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Lms"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(Lms left, Lms right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="Lms"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="Lms"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Lms"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(Lms left, Lms right) => !left.Equals(right);
-
-    /// <summary>
-    /// Returns a new <see cref="Vector3"/> representing this instance.
-    /// </summary>
-    /// <returns>The <see cref="Vector3"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Vector3 ToVector3() => new(this.L, this.M, this.S);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.L, this.M, this.S);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"Lms({this.L:#0.##}, {this.M:#0.##}, {this.S:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Lms other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(Lms other)
-        => this.L.Equals(other.L)
-        && this.M.Equals(other.M)
-        && this.S.Equals(other.S);
-}
diff --git a/src/ImageSharp/ColorSpaces/Rgb.cs b/src/ImageSharp/ColorSpaces/Rgb.cs
deleted file mode 100644
index 55052a710..000000000
--- a/src/ImageSharp/ColorSpaces/Rgb.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an RGB color with specified <see cref="RgbWorkingSpace"/> working space.
-/// </summary>
-public readonly struct Rgb : IEquatable<Rgb>
-{
-    /// <summary>
-    /// The default rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
-
-    private static readonly Vector3 Min = Vector3.Zero;
-    private static readonly Vector3 Max = Vector3.One;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rgb"/> struct.
-    /// </summary>
-    /// <param name="r">The red component ranging between 0 and 1.</param>
-    /// <param name="g">The green component ranging between 0 and 1.</param>
-    /// <param name="b">The blue component ranging between 0 and 1.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Rgb(float r, float g, float b)
-        : this(r, g, b, DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rgb"/> struct.
-    /// </summary>
-    /// <param name="r">The red component ranging between 0 and 1.</param>
-    /// <param name="g">The green component ranging between 0 and 1.</param>
-    /// <param name="b">The blue component ranging between 0 and 1.</param>
-    /// <param name="workingSpace">The rgb working space.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Rgb(float r, float g, float b, RgbWorkingSpace workingSpace)
-        : this(new Vector3(r, g, b), workingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rgb"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the r, g, b components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Rgb(Vector3 vector)
-        : this(vector, DefaultWorkingSpace)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Rgb"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the r, g, b components.</param>
-    /// <param name="workingSpace">The rgb working space.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Rgb(Vector3 vector, RgbWorkingSpace workingSpace)
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.R = vector.X;
-        this.G = vector.Y;
-        this.B = vector.Z;
-        this.WorkingSpace = workingSpace;
-    }
-
-    /// <summary>
-    /// Gets the red component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float R { get; }
-
-    /// <summary>
-    /// Gets the green component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float G { get; }
-
-    /// <summary>
-    /// Gets the blue component.
-    /// <remarks>A value usually ranging between 0 and 1.</remarks>
-    /// </summary>
-    public readonly float B { get; }
-
-    /// <summary>
-    /// Gets the Rgb color space <seealso cref="RgbWorkingSpaces"/>
-    /// </summary>
-    public readonly RgbWorkingSpace WorkingSpace { get; }
-
-    /// <summary>
-    /// Allows the implicit conversion of an instance of <see cref="Rgb24"/> to a
-    /// <see cref="Rgb"/>.
-    /// </summary>
-    /// <param name="color">The instance of <see cref="Rgba32"/> to convert.</param>
-    /// <returns>An instance of <see cref="Rgb"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static implicit operator Rgb(Rgb24 color) => new(color.R / 255F, color.G / 255F, color.B / 255F);
-
-    /// <summary>
-    /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
-    /// <see cref="Rgb"/>.
-    /// </summary>
-    /// <param name="color">The instance of <see cref="Rgba32"/> to convert.</param>
-    /// <returns>An instance of <see cref="Rgb"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static implicit operator Rgb(Rgba32 color) => new(color.R / 255F, color.G / 255F, color.B / 255F);
-
-    /// <summary>
-    /// Compares two <see cref="Rgb"/> objects for equality.
-    /// </summary>
-    /// <param name="left">
-    /// The <see cref="Rgb"/> on the left side of the operand.
-    /// </param>
-    /// <param name="right">
-    /// The <see cref="Rgb"/> on the right side of the operand.
-    /// </param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator ==(Rgb left, Rgb right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="Rgb"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="Rgb"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="Rgb"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(Rgb left, Rgb right) => !left.Equals(right);
-
-    /// <summary>
-    /// Returns a new <see cref="Vector3"/> representing this instance.
-    /// </summary>
-    /// <returns>The <see cref="Vector3"/>.</returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public Vector3 ToVector3() => new(this.R, this.G, this.B);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => HashCode.Combine(this.R, this.G, this.B);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"Rgb({this.R:#0.##}, {this.G:#0.##}, {this.B:#0.##})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is Rgb other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(Rgb other)
-        => this.R.Equals(other.R)
-        && this.G.Equals(other.G)
-        && this.B.Equals(other.B);
-}
diff --git a/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs b/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs
deleted file mode 100644
index 53c8c2cf0..000000000
--- a/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Chromaticity coordinates based on: <see href="http://www.brucelindbloom.com/index.html?WorkingSpaceInfo.html"/>
-/// </summary>
-public static class RgbWorkingSpaces
-{
-    /// <summary>
-    /// sRgb working space.
-    /// </summary>
-    /// <remarks>
-    /// Uses proper companding function, according to:
-    /// <see href="http://www.brucelindbloom.com/index.html?Eqn_Rgb_to_XYZ.html"/>
-    /// </remarks>
-    public static readonly RgbWorkingSpace SRgb = new SRgbWorkingSpace(Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.3000F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
-
-    /// <summary>
-    /// Simplified sRgb working space (uses <see cref="GammaCompanding">gamma companding</see> instead of <see cref="SRgbCompanding"/>).
-    /// See also <see cref="SRgb"/>.
-    /// </summary>
-    public static readonly RgbWorkingSpace SRgbSimplified = new GammaWorkingSpace(2.2F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.3000F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
-
-    /// <summary>
-    /// Rec. 709 (ITU-R Recommendation BT.709) working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace Rec709 = new Rec709WorkingSpace(Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.64F, 0.33F), new CieXyChromaticityCoordinates(0.30F, 0.60F), new CieXyChromaticityCoordinates(0.15F, 0.06F)));
-
-    /// <summary>
-    /// Rec. 2020 (ITU-R Recommendation BT.2020F) working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace Rec2020 = new Rec2020WorkingSpace(Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.708F, 0.292F), new CieXyChromaticityCoordinates(0.170F, 0.797F), new CieXyChromaticityCoordinates(0.131F, 0.046F)));
-
-    /// <summary>
-    /// ECI Rgb v2 working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace ECIRgbv2 = new LWorkingSpace(Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6700F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1400F, 0.0800F)));
-
-    /// <summary>
-    /// Adobe Rgb (1998) working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace AdobeRgb1998 = new GammaWorkingSpace(2.2F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
-
-    /// <summary>
-    /// Apple sRgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace ApplesRgb = new GammaWorkingSpace(1.8F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6250F, 0.3400F), new CieXyChromaticityCoordinates(0.2800F, 0.5950F), new CieXyChromaticityCoordinates(0.1550F, 0.0700F)));
-
-    /// <summary>
-    /// Best Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace BestRgb = new GammaWorkingSpace(2.2F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7347F, 0.2653F), new CieXyChromaticityCoordinates(0.2150F, 0.7750F), new CieXyChromaticityCoordinates(0.1300F, 0.0350F)));
-
-    /// <summary>
-    /// Beta Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace BetaRgb = new GammaWorkingSpace(2.2F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6888F, 0.3112F), new CieXyChromaticityCoordinates(0.1986F, 0.7551F), new CieXyChromaticityCoordinates(0.1265F, 0.0352F)));
-
-    /// <summary>
-    /// Bruce Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace BruceRgb = new GammaWorkingSpace(2.2F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2800F, 0.6500F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
-
-    /// <summary>
-    /// CIE Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace CIERgb = new GammaWorkingSpace(2.2F, Illuminants.E, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7350F, 0.2650F), new CieXyChromaticityCoordinates(0.2740F, 0.7170F), new CieXyChromaticityCoordinates(0.1670F, 0.0090F)));
-
-    /// <summary>
-    /// ColorMatch Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace ColorMatchRgb = new GammaWorkingSpace(1.8F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6300F, 0.3400F), new CieXyChromaticityCoordinates(0.2950F, 0.6050F), new CieXyChromaticityCoordinates(0.1500F, 0.0750F)));
-
-    /// <summary>
-    /// Don Rgb 4 working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace DonRgb4 = new GammaWorkingSpace(2.2F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6960F, 0.3000F), new CieXyChromaticityCoordinates(0.2150F, 0.7650F), new CieXyChromaticityCoordinates(0.1300F, 0.0350F)));
-
-    /// <summary>
-    /// Ekta Space PS5 working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace EktaSpacePS5 = new GammaWorkingSpace(2.2F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6950F, 0.3050F), new CieXyChromaticityCoordinates(0.2600F, 0.7000F), new CieXyChromaticityCoordinates(0.1100F, 0.0050F)));
-
-    /// <summary>
-    /// NTSC Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace NTSCRgb = new GammaWorkingSpace(2.2F, Illuminants.C, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6700F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1400F, 0.0800F)));
-
-    /// <summary>
-    /// PAL/SECAM Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace PALSECAMRgb = new GammaWorkingSpace(2.2F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2900F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
-
-    /// <summary>
-    /// ProPhoto Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace ProPhotoRgb = new GammaWorkingSpace(1.8F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7347F, 0.2653F), new CieXyChromaticityCoordinates(0.1596F, 0.8404F), new CieXyChromaticityCoordinates(0.0366F, 0.0001F)));
-
-    /// <summary>
-    /// SMPTE-C Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace SMPTECRgb = new GammaWorkingSpace(2.2F, Illuminants.D65, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6300F, 0.3400F), new CieXyChromaticityCoordinates(0.3100F, 0.5950F), new CieXyChromaticityCoordinates(0.1550F, 0.0700F)));
-
-    /// <summary>
-    /// Wide Gamut Rgb working space.
-    /// </summary>
-    public static readonly RgbWorkingSpace WideGamutRgb = new GammaWorkingSpace(2.2F, Illuminants.D50, new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7350F, 0.2650F), new CieXyChromaticityCoordinates(0.1150F, 0.8260F), new CieXyChromaticityCoordinates(0.1570F, 0.0180F)));
-}
diff --git a/src/ImageSharp/ColorSpaces/YCbCr.cs b/src/ImageSharp/ColorSpaces/YCbCr.cs
deleted file mode 100644
index acb59388f..000000000
--- a/src/ImageSharp/ColorSpaces/YCbCr.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.ColorSpaces;
-
-/// <summary>
-/// Represents an YCbCr (luminance, blue chroma, red chroma) color as defined in the ITU-T T.871 specification for the JFIF use with Jpeg.
-/// <see href="http://en.wikipedia.org/wiki/YCbCr"/>
-/// <see href="http://www.ijg.org/files/T-REC-T.871-201105-I!!PDF-E.pdf"/>
-/// </summary>
-public readonly struct YCbCr : IEquatable<YCbCr>
-{
-    private static readonly Vector3 Min = Vector3.Zero;
-    private static readonly Vector3 Max = new(255);
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="YCbCr"/> struct.
-    /// </summary>
-    /// <param name="y">The y luminance component.</param>
-    /// <param name="cb">The cb chroma component.</param>
-    /// <param name="cr">The cr chroma component.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public YCbCr(float y, float cb, float cr)
-        : this(new Vector3(y, cb, cr))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="YCbCr"/> struct.
-    /// </summary>
-    /// <param name="vector">The vector representing the y, cb, cr components.</param>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public YCbCr(Vector3 vector)
-    {
-        vector = Vector3.Clamp(vector, Min, Max);
-        this.Y = vector.X;
-        this.Cb = vector.Y;
-        this.Cr = vector.Z;
-    }
-
-    /// <summary>
-    /// Gets the Y luminance component.
-    /// <remarks>A value ranging between 0 and 255.</remarks>
-    /// </summary>
-    public readonly float Y { get; }
-
-    /// <summary>
-    /// Gets the Cb chroma component.
-    /// <remarks>A value ranging between 0 and 255.</remarks>
-    /// </summary>
-    public readonly float Cb { get; }
-
-    /// <summary>
-    /// Gets the Cr chroma component.
-    /// <remarks>A value ranging between 0 and 255.</remarks>
-    /// </summary>
-    public readonly float Cr { get; }
-
-    /// <summary>
-    /// Compares two <see cref="YCbCr"/> objects for equality.
-    /// </summary>
-    /// <param name="left">The <see cref="YCbCr"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="YCbCr"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    public static bool operator ==(YCbCr left, YCbCr right) => left.Equals(right);
-
-    /// <summary>
-    /// Compares two <see cref="YCbCr"/> objects for inequality.
-    /// </summary>
-    /// <param name="left">The <see cref="YCbCr"/> on the left side of the operand.</param>
-    /// <param name="right">The <see cref="YCbCr"/> on the right side of the operand.</param>
-    /// <returns>
-    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-    /// </returns>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public static bool operator !=(YCbCr left, YCbCr right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public override int GetHashCode() => HashCode.Combine(this.Y, this.Cb, this.Cr);
-
-    /// <inheritdoc/>
-    public override string ToString() => FormattableString.Invariant($"YCbCr({this.Y}, {this.Cb}, {this.Cr})");
-
-    /// <inheritdoc/>
-    public override bool Equals(object? obj) => obj is YCbCr other && this.Equals(other);
-
-    /// <inheritdoc/>
-    [MethodImpl(InliningOptions.ShortMethod)]
-    public bool Equals(YCbCr other)
-        => this.Y.Equals(other.Y)
-        && this.Cb.Equals(other.Cb)
-        && this.Cr.Equals(other.Cr);
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLabTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLabTests.cs
deleted file mode 100644
index 52cb63d21..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieLabTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieLab"/> struct.
-/// </summary>
-public class CieLabTests
-{
-    [Fact]
-    public void CieLabConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float a = -64F;
-        const float b = 87F;
-        var cieLab = new CieLab(l, a, b);
-
-        Assert.Equal(l, cieLab.L);
-        Assert.Equal(a, cieLab.A);
-        Assert.Equal(b, cieLab.B);
-    }
-
-    [Fact]
-    public void CieLabEquality()
-    {
-        var x = default(CieLab);
-        var y = new CieLab(Vector3.One);
-
-        Assert.True(default(CieLab) == default(CieLab));
-        Assert.True(new CieLab(1, 0, 1) != default(CieLab));
-        Assert.False(new CieLab(1, 0, 1) == default(CieLab));
-        Assert.Equal(default(CieLab), default(CieLab));
-        Assert.Equal(new CieLab(1, 0, 1), new CieLab(1, 0, 1));
-        Assert.Equal(new CieLab(Vector3.One), new CieLab(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(new CieLab(1, 0, 1) == default(CieLab));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLchTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLchTests.cs
deleted file mode 100644
index 83e4d8a59..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieLchTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieLch"/> struct.
-/// </summary>
-public class CieLchTests
-{
-    [Fact]
-    public void CieLchConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float c = 64F;
-        const float h = 287F;
-        var cieLch = new CieLch(l, c, h);
-
-        Assert.Equal(l, cieLch.L);
-        Assert.Equal(c, cieLch.C);
-        Assert.Equal(h, cieLch.H);
-    }
-
-    [Fact]
-    public void CieLchEquality()
-    {
-        var x = default(CieLch);
-        var y = new CieLch(Vector3.One);
-
-        Assert.True(default(CieLch) == default(CieLch));
-        Assert.False(default(CieLch) != default(CieLch));
-        Assert.Equal(default(CieLch), default(CieLch));
-        Assert.Equal(new CieLch(1, 0, 1), new CieLch(1, 0, 1));
-        Assert.Equal(new CieLch(Vector3.One), new CieLch(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLchuvTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLchuvTests.cs
deleted file mode 100644
index f6c68aae9..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieLchuvTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieLchuv"/> struct.
-/// </summary>
-public class CieLchuvTests
-{
-    [Fact]
-    public void CieLchuvConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float c = 64F;
-        const float h = 287F;
-        var cieLchuv = new CieLchuv(l, c, h);
-
-        Assert.Equal(l, cieLchuv.L);
-        Assert.Equal(c, cieLchuv.C);
-        Assert.Equal(h, cieLchuv.H);
-    }
-
-    [Fact]
-    public void CieLchuvEquality()
-    {
-        var x = default(CieLchuv);
-        var y = new CieLchuv(Vector3.One);
-
-        Assert.True(default(CieLchuv) == default(CieLchuv));
-        Assert.False(default(CieLchuv) != default(CieLchuv));
-        Assert.Equal(default(CieLchuv), default(CieLchuv));
-        Assert.Equal(new CieLchuv(1, 0, 1), new CieLchuv(1, 0, 1));
-        Assert.Equal(new CieLchuv(Vector3.One), new CieLchuv(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLuvTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieLuvTests.cs
deleted file mode 100644
index 0ebf1bdea..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieLuvTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieLuv"/> struct.
-/// </summary>
-public class CieLuvTests
-{
-    [Fact]
-    public void CieLuvConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float c = -64F;
-        const float h = 87F;
-        var cieLuv = new CieLuv(l, c, h);
-
-        Assert.Equal(l, cieLuv.L);
-        Assert.Equal(c, cieLuv.U);
-        Assert.Equal(h, cieLuv.V);
-    }
-
-    [Fact]
-    public void CieLuvEquality()
-    {
-        var x = default(CieLuv);
-        var y = new CieLuv(Vector3.One);
-
-        Assert.True(default(CieLuv) == default(CieLuv));
-        Assert.False(default(CieLuv) != default(CieLuv));
-        Assert.Equal(default(CieLuv), default(CieLuv));
-        Assert.Equal(new CieLuv(1, 0, 1), new CieLuv(1, 0, 1));
-        Assert.Equal(new CieLuv(Vector3.One), new CieLuv(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyChromaticityCoordinatesTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyChromaticityCoordinatesTests.cs
deleted file mode 100644
index 061d6c432..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyChromaticityCoordinatesTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieXyChromaticityCoordinates"/> struct.
-/// </summary>
-public class CieXyChromaticityCoordinatesTests
-{
-    [Fact]
-    public void CieXyChromaticityCoordinatesConstructorAssignsFields()
-    {
-        const float x = .75F;
-        const float y = .64F;
-        var coordinates = new CieXyChromaticityCoordinates(x, y);
-
-        Assert.Equal(x, coordinates.X);
-        Assert.Equal(y, coordinates.Y);
-    }
-
-    [Fact]
-    public void CieXyChromaticityCoordinatesEquality()
-    {
-        var x = default(CieXyChromaticityCoordinates);
-        var y = new CieXyChromaticityCoordinates(1, 1);
-
-        Assert.True(default(CieXyChromaticityCoordinates) == default(CieXyChromaticityCoordinates));
-        Assert.True(new CieXyChromaticityCoordinates(1, 0) != default(CieXyChromaticityCoordinates));
-        Assert.False(new CieXyChromaticityCoordinates(1, 0) == default(CieXyChromaticityCoordinates));
-        Assert.Equal(default(CieXyChromaticityCoordinates), default(CieXyChromaticityCoordinates));
-        Assert.Equal(new CieXyChromaticityCoordinates(1, 0), new CieXyChromaticityCoordinates(1, 0));
-        Assert.Equal(new CieXyChromaticityCoordinates(1, 1), new CieXyChromaticityCoordinates(1, 1));
-        Assert.False(x.Equals(y));
-        Assert.False(new CieXyChromaticityCoordinates(1, 0) == default(CieXyChromaticityCoordinates));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyyTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyyTests.cs
deleted file mode 100644
index f1eb12640..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyyTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieXyy"/> struct.
-/// </summary>
-public class CieXyyTests
-{
-    [Fact]
-    public void CieXyyConstructorAssignsFields()
-    {
-        const float x = 75F;
-        const float y = 64F;
-        const float yl = 287F;
-        var cieXyy = new CieXyy(x, y, yl);
-
-        Assert.Equal(x, cieXyy.X);
-        Assert.Equal(y, cieXyy.Y);
-        Assert.Equal(y, cieXyy.Y);
-    }
-
-    [Fact]
-    public void CieXyyEquality()
-    {
-        var x = default(CieXyy);
-        var y = new CieXyy(Vector3.One);
-
-        Assert.True(default(CieXyy) == default(CieXyy));
-        Assert.False(default(CieXyy) != default(CieXyy));
-        Assert.Equal(default(CieXyy), default(CieXyy));
-        Assert.Equal(new CieXyy(1, 0, 1), new CieXyy(1, 0, 1));
-        Assert.Equal(new CieXyy(Vector3.One), new CieXyy(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzTests.cs b/tests/ImageSharp.Tests/Colorspaces/CieXyzTests.cs
deleted file mode 100644
index 6de961cf1..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="CieXyz"/> struct.
-/// </summary>
-public class CieXyzTests
-{
-    [Fact]
-    public void CieXyzConstructorAssignsFields()
-    {
-        const float x = 75F;
-        const float y = 64F;
-        const float z = 287F;
-        var cieXyz = new CieXyz(x, y, z);
-
-        Assert.Equal(x, cieXyz.X);
-        Assert.Equal(y, cieXyz.Y);
-        Assert.Equal(z, cieXyz.Z);
-    }
-
-    [Fact]
-    public void CieXyzEquality()
-    {
-        var x = default(CieXyz);
-        var y = new CieXyz(Vector3.One);
-
-        Assert.True(default(CieXyz) == default(CieXyz));
-        Assert.False(default(CieXyz) != default(CieXyz));
-        Assert.Equal(default(CieXyz), default(CieXyz));
-        Assert.Equal(new CieXyz(1, 0, 1), new CieXyz(1, 0, 1));
-        Assert.Equal(new CieXyz(Vector3.One), new CieXyz(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/CmykTests.cs b/tests/ImageSharp.Tests/Colorspaces/CmykTests.cs
deleted file mode 100644
index b4e55ed24..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/CmykTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="Cmyk"/> struct.
-/// </summary>
-public class CmykTests
-{
-    [Fact]
-    public void CmykConstructorAssignsFields()
-    {
-        const float c = .75F;
-        const float m = .64F;
-        const float y = .87F;
-        const float k = .334F;
-        var cmyk = new Cmyk(c, m, y, k);
-
-        Assert.Equal(c, cmyk.C);
-        Assert.Equal(m, cmyk.M);
-        Assert.Equal(y, cmyk.Y);
-        Assert.Equal(k, cmyk.K);
-    }
-
-    [Fact]
-    public void CmykEquality()
-    {
-        var x = default(Cmyk);
-        var y = new Cmyk(Vector4.One);
-
-        Assert.True(default(Cmyk) == default(Cmyk));
-        Assert.False(default(Cmyk) != default(Cmyk));
-        Assert.Equal(default(Cmyk), default(Cmyk));
-        Assert.Equal(new Cmyk(1, 0, 1, 0), new Cmyk(1, 0, 1, 0));
-        Assert.Equal(new Cmyk(Vector4.One), new Cmyk(Vector4.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Companding/CompandingTests.cs b/tests/ImageSharp.Tests/Colorspaces/Companding/CompandingTests.cs
deleted file mode 100644
index 3fb359890..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Companding/CompandingTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces.Companding;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Companding;
-
-/// <summary>
-/// Tests various companding algorithms. Expanded numbers are hand calculated from formulas online.
-/// </summary>
-public class CompandingTests
-{
-    private static readonly ApproximateFloatComparer FloatComparer = new ApproximateFloatComparer(.00001F);
-
-    [Fact]
-    public void Rec2020Companding_IsCorrect()
-    {
-        const float input = .667F;
-        float e = Rec2020Companding.Expand(input);
-        float c = Rec2020Companding.Compress(e);
-        CompandingIsCorrectImpl(e, c, .4484759F, input);
-    }
-
-    [Fact]
-    public void Rec709Companding_IsCorrect()
-    {
-        const float input = .667F;
-        float e = Rec709Companding.Expand(input);
-        float c = Rec709Companding.Compress(e);
-        CompandingIsCorrectImpl(e, c, .4483577F, input);
-    }
-
-    [Fact]
-    public void SRgbCompanding_IsCorrect()
-    {
-        const float input = .667F;
-        float e = SRgbCompanding.Expand(input);
-        float c = SRgbCompanding.Compress(e);
-        CompandingIsCorrectImpl(e, c, .40242353F, input);
-    }
-
-    [Theory]
-    [InlineData(0)]
-    [InlineData(1)]
-    [InlineData(30)]
-    public void SRgbCompanding_Expand_VectorSpan(int length)
-    {
-        var rnd = new Random(42);
-        Vector4[] source = rnd.GenerateRandomVectorArray(length, 0, 1);
-        var expected = new Vector4[source.Length];
-
-        for (int i = 0; i < source.Length; i++)
-        {
-            Vector4 s = source[i];
-            ref Vector4 e = ref expected[i];
-            SRgbCompanding.Expand(ref s);
-            e = s;
-        }
-
-        SRgbCompanding.Expand(source);
-
-        Assert.Equal(expected, source, new ApproximateFloatComparer(1e-6f));
-    }
-
-    [Theory]
-    [InlineData(0)]
-    [InlineData(1)]
-    [InlineData(30)]
-    public void SRgbCompanding_Compress_VectorSpan(int length)
-    {
-        var rnd = new Random(42);
-        Vector4[] source = rnd.GenerateRandomVectorArray(length, 0, 1);
-        var expected = new Vector4[source.Length];
-
-        for (int i = 0; i < source.Length; i++)
-        {
-            Vector4 s = source[i];
-            ref Vector4 e = ref expected[i];
-            SRgbCompanding.Compress(ref s);
-            e = s;
-        }
-
-        SRgbCompanding.Compress(source);
-
-        Assert.Equal(expected, source, new ApproximateFloatComparer(1e-6f));
-    }
-
-    [Fact]
-    public void GammaCompanding_IsCorrect()
-    {
-        const float gamma = 2.2F;
-        const float input = .667F;
-        float e = GammaCompanding.Expand(input, gamma);
-        float c = GammaCompanding.Compress(e, gamma);
-        CompandingIsCorrectImpl(e, c, .41027668F, input);
-    }
-
-    [Fact]
-    public void LCompanding_IsCorrect()
-    {
-        const float input = .667F;
-        float e = LCompanding.Expand(input);
-        float c = LCompanding.Compress(e);
-        CompandingIsCorrectImpl(e, c, .36236193F, input);
-    }
-
-    private static void CompandingIsCorrectImpl(float e, float c, float expanded, float compressed)
-    {
-        Assert.Equal(expanded, e, FloatComparer);
-        Assert.Equal(compressed, c, FloatComparer);
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs
deleted file mode 100644
index d66a73b5a..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Allows the approximate comparison of colorspace component values.
-/// </summary>
-internal readonly struct ApproximateColorSpaceComparer :
-    IEqualityComparer<Rgb>,
-    IEqualityComparer<LinearRgb>,
-    IEqualityComparer<CieLab>,
-    IEqualityComparer<CieLch>,
-    IEqualityComparer<CieLchuv>,
-    IEqualityComparer<CieLuv>,
-    IEqualityComparer<CieXyz>,
-    IEqualityComparer<CieXyy>,
-    IEqualityComparer<Cmyk>,
-    IEqualityComparer<HunterLab>,
-    IEqualityComparer<Hsl>,
-    IEqualityComparer<Hsv>,
-    IEqualityComparer<Lms>,
-    IEqualityComparer<YCbCr>,
-    IEqualityComparer<CieXyChromaticityCoordinates>,
-    IEqualityComparer<RgbPrimariesChromaticityCoordinates>,
-    IEqualityComparer<GammaWorkingSpace>,
-    IEqualityComparer<RgbWorkingSpace>
-{
-    private readonly float epsilon;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApproximateColorSpaceComparer"/> class.
-    /// </summary>
-    /// <param name="epsilon">The comparison error difference epsilon to use.</param>
-    public ApproximateColorSpaceComparer(float epsilon = 1F) => this.epsilon = epsilon;
-
-    /// <inheritdoc/>
-    public bool Equals(Rgb x, Rgb y)
-    {
-        return this.Equals(x.R, y.R)
-         && this.Equals(x.G, y.G)
-         && this.Equals(x.B, y.B);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(Rgb obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(LinearRgb x, LinearRgb y)
-    {
-        return this.Equals(x.R, y.R)
-         && this.Equals(x.G, y.G)
-         && this.Equals(x.B, y.B);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(LinearRgb obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieLab x, CieLab y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.A, y.A)
-         && this.Equals(x.B, y.B);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieLab obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieLch x, CieLch y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.C, y.C)
-         && this.Equals(x.H, y.H);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieLch obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieLchuv x, CieLchuv y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.C, y.C)
-         && this.Equals(x.H, y.H);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieLchuv obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieLuv x, CieLuv y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.U, y.U)
-         && this.Equals(x.V, y.V);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieLuv obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieXyz x, CieXyz y)
-    {
-        return this.Equals(x.X, y.X)
-         && this.Equals(x.Y, y.Y)
-         && this.Equals(x.Z, y.Z);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieXyz obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieXyy x, CieXyy y)
-    {
-        return this.Equals(x.X, y.X)
-         && this.Equals(x.Y, y.Y)
-         && this.Equals(x.Yl, y.Yl);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieXyy obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(Cmyk x, Cmyk y)
-    {
-        return this.Equals(x.C, y.C)
-         && this.Equals(x.M, y.M)
-         && this.Equals(x.Y, y.Y)
-         && this.Equals(x.K, y.K);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(Cmyk obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(HunterLab x, HunterLab y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.A, y.A)
-         && this.Equals(x.B, y.B);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(HunterLab obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(Hsl x, Hsl y)
-    {
-        return this.Equals(x.H, y.H)
-         && this.Equals(x.S, y.S)
-         && this.Equals(x.L, y.L);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(Hsl obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(Hsv x, Hsv y)
-    {
-        return this.Equals(x.H, y.H)
-         && this.Equals(x.S, y.S)
-         && this.Equals(x.V, y.V);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(Hsv obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(Lms x, Lms y)
-    {
-        return this.Equals(x.L, y.L)
-         && this.Equals(x.M, y.M)
-         && this.Equals(x.S, y.S);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(Lms obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(YCbCr x, YCbCr y)
-    {
-        return this.Equals(x.Y, y.Y)
-         && this.Equals(x.Cb, y.Cb)
-         && this.Equals(x.Cr, y.Cr);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(YCbCr obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(CieXyChromaticityCoordinates x, CieXyChromaticityCoordinates y) => this.Equals(x.X, y.X) && this.Equals(x.Y, y.Y);
-
-    /// <inheritdoc/>
-    public int GetHashCode(CieXyChromaticityCoordinates obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(RgbPrimariesChromaticityCoordinates x, RgbPrimariesChromaticityCoordinates y) => this.Equals(x.R, y.R) && this.Equals(x.G, y.G) && this.Equals(x.B, y.B);
-
-    /// <inheritdoc/>
-    public int GetHashCode(RgbPrimariesChromaticityCoordinates obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(GammaWorkingSpace x, GammaWorkingSpace y)
-    {
-        if (x is GammaWorkingSpace g1 && y is GammaWorkingSpace g2)
-        {
-            return this.Equals(g1.Gamma, g2.Gamma)
-                && this.Equals(g1.WhitePoint, g2.WhitePoint)
-                && this.Equals(g1.ChromaticityCoordinates, g2.ChromaticityCoordinates);
-        }
-
-        return false;
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(GammaWorkingSpace obj) => obj.GetHashCode();
-
-    /// <inheritdoc/>
-    public bool Equals(RgbWorkingSpace x, RgbWorkingSpace y)
-    {
-        return this.Equals(x.WhitePoint, y.WhitePoint)
-            && this.Equals(x.ChromaticityCoordinates, y.ChromaticityCoordinates);
-    }
-
-    /// <inheritdoc/>
-    public int GetHashCode(RgbWorkingSpace obj) => obj.GetHashCode();
-
-    private bool Equals(float x, float y)
-    {
-        float d = x - y;
-        return d >= -this.epsilon && d <= this.epsilon;
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs
deleted file mode 100644
index d71f0fa5e..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="CieLch"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieLabAndCieLchConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(54.2917, 106.8391, 40.8526, 54.2917, 80.8125, 69.8851)]
-    [InlineData(100, 0, 0, 100, 0, 0)]
-    [InlineData(100, 50, 180, 100, -50, 0)]
-    [InlineData(10, 36.0555, 56.3099, 10, 20, 30)]
-    [InlineData(10, 36.0555, 123.6901, 10, -20, 30)]
-    [InlineData(10, 36.0555, 303.6901, 10, 20, -30)]
-    [InlineData(10, 36.0555, 236.3099, 10, -20, -30)]
-    public void Convert_Lch_to_Lab(float l, float c, float h, float l2, float a, float b)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new CieLab(l2, a, b);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(54.2917, 80.8125, 69.8851, 54.2917, 106.8391, 40.8526)]
-    [InlineData(100, 0, 0, 100, 0, 0)]
-    [InlineData(100, -50, 0, 100, 50, 180)]
-    [InlineData(10, 20, 30, 10, 36.0555, 56.3099)]
-    [InlineData(10, -20, 30, 10, 36.0555, 123.6901)]
-    [InlineData(10, 20, -30, 10, 36.0555, 303.6901)]
-    [InlineData(10, -20, -30, 10, 36.0555, 236.3099)]
-    public void Convert_Lab_to_Lch(float l, float a, float b, float l2, float c, float h)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new CieLch(l2, c, h);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchuvConversionTests.cs
deleted file mode 100644
index d8378217e..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchuvConversionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="CieLchuv"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieLabAndCieLchuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLchuv"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(30.66194, 200, 352.7564, 31.95653, 116.8745, 2.388602)]
-    public void Convert_Lchuv_to_Lab(float l, float c, float h, float l2, float a, float b)
-    {
-        // Arrange
-        var input = new CieLchuv(l, c, h);
-        var expected = new CieLab(l2, a, b);
-
-        Span<CieLchuv> inputSpan = new CieLchuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="CieLchuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 30.66194, 200, 352.7564)]
-    public void Convert_Lab_to_Lchuv(float l, float a, float b, float l2, float c, float h)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new CieLchuv(l2, c, h);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLchuv> actualSpan = new CieLchuv[5];
-
-        // Act
-        var actual = Converter.ToCieLchuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLuvConversionTests.cs
deleted file mode 100644
index 220ef4f22..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLuvConversionTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="CieLuv"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieLabAndCieLuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(10, 36.0555, 303.6901, 10.0151367, -23.9644356, 17.0226)]
-    public void Convert_CieLuv_to_CieLab(float l, float u, float v, float l2, float a, float b)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new CieLab(l2, a, b);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(10.0151367, -23.9644356, 17.0226, 10.0000038, -12.830183, 15.1829338)]
-    public void Convert_CieLab_to_CieLuv(float l, float a, float b, float l2, float u, float v)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new CieLuv(l2, u, v);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieXyyConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieXyyConversionTests.cs
deleted file mode 100644
index 49ea4502f..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieXyyConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="CieXyy"/> conversions.
-/// </summary>
-public class CieLabAndCieXyyConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.8644734, 0.06098868, 0.06509002, 36.05552, 275.6228, 10.01517)]
-    public void Convert_CieXyy_to_CieLab(float x, float y, float yl, float l, float a, float b)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new CieLab(l, a, b);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 0.8644734, 0.06098868, 0.06509002)]
-    public void Convert_CieLab_to_CieXyy(float l, float a, float b, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCmykConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCmykConversionTests.cs
deleted file mode 100644
index 7f9470e20..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCmykConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="Cmyk"/> conversions.
-/// </summary>
-public class CieLabAndCmykConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 1, 0, 0, 0)]
-    [InlineData(0, 1, 0.6156551, 5.960464E-08, 55.063, 82.54871, 23.16506)]
-    public void Convert_Cmyk_to_CieLab(float c, float m, float y, float k, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new CieLab(l, a, b);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0, 1)]
-    [InlineData(36.0555, 303.6901, 10.01514, 0, 1, 0.6156551, 5.960464E-08)]
-    public void Convert_CieLab_to_Cmyk(float l, float a, float b, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHslConversionTests.cs
deleted file mode 100644
index 1af6a9315..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHslConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CieLabAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(336.9393, 1, 0.5, 55.063, 82.54868, 23.16508)]
-    public void Convert_Hsl_to_CieLab(float h, float s, float ll, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Hsl(h, s, ll);
-        var expected = new CieLab(l, a, b);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 336.9393, 1, 0.5)]
-    public void Convert_CieLab_to_Hsl(float l, float a, float b, float h, float s, float ll)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new Hsl(h, s, ll);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = Converter.ToHsl(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHsvConversionTests.cs
deleted file mode 100644
index c7c3ad19b..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHsvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CieLabAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(336.9393, 1, 0.9999999, 55.063, 82.54871, 23.16504)]
-    public void Convert_Hsv_to_CieLab(float h, float s, float v, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v);
-        var expected = new CieLab(l, a, b);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 336.9393, 1, 0.9999999)]
-    public void Convert_CieLab_to_Hsv(float l, float a, float b, float h, float s, float v)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new Hsv(h, s, v);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = Converter.ToHsv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHunterLabConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHunterLabConversionTests.cs
deleted file mode 100644
index 81fff6e14..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndHunterLabConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-public class CieLabAndHunterLabConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(27.51646, 556.9392, -0.03974226, 36.05554, 275.6227, 10.01519)]
-    public void Convert_HunterLab_to_CieLab(float l2, float a2, float b2, float l, float a, float b)
-    {
-        // Arrange
-        var input = new HunterLab(l2, a2, b2);
-        var expected = new CieLab(l, a, b);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 27.51646, 556.9392, -0.03974226)]
-    public void Convert_CieLab_to_HunterLab(float l, float a, float b, float l2, float a2, float b2)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new HunterLab(l2, a2, b2);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = Converter.ToHunterLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLinearRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLinearRgbConversionTests.cs
deleted file mode 100644
index 68547d8a2..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLinearRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="LinearRgb"/> conversions.
-/// </summary>
-public class CieLabAndLinearRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="LinearRgb"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 0, 0.1221596, 55.063, 82.54871, 23.16505)]
-    public void Convert_LinearRgb_to_CieLab(float r, float g, float b2, float l, float a, float b)
-    {
-        // Arrange
-        var input = new LinearRgb(r, g, b2);
-        var expected = new CieLab(l, a, b);
-
-        Span<LinearRgb> inputSpan = new LinearRgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="LinearRgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 1, 0, 0.1221596)]
-    public void Convert_CieLab_to_LinearRgb(float l, float a, float b, float r, float g, float b2)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new LinearRgb(r, g, b2);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<LinearRgb> actualSpan = new LinearRgb[5];
-
-        // Act
-        var actual = Converter.ToLinearRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLmsConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLmsConversionTests.cs
deleted file mode 100644
index 2918b6f62..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndLmsConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="Lms"/> conversions.
-/// </summary>
-public class CieLabAndLmsConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Lms"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.8303261, -0.5776886, 0.1133359, 36.05553, 275.6228, 10.01518)]
-    public void Convert_Lms_to_CieLab(float l2, float m, float s, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Lms(l2, m, s);
-        var expected = new CieLab(l, a, b);
-
-        Span<Lms> inputSpan = new Lms[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 0.8303261, -0.5776886, 0.1133359)]
-    public void Convert_CieLab_to_Lms(float l, float a, float b, float l2, float m, float s)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new Lms(l2, m, s);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<Lms> actualSpan = new Lms[5];
-
-        // Act
-        var actual = Converter.ToLms(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndRgbConversionTests.cs
deleted file mode 100644
index 3acf695d1..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="Rgb"/> conversions.
-/// </summary>
-public class CieLabAndRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.9999999, 0, 0.384345, 55.063, 82.54871, 23.16505)]
-    public void Convert_Rgb_to_CieLab(float r, float g, float b2, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b2);
-        var expected = new CieLab(l, a, b);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 303.6901, 10.01514, 0.9999999, 0, 0.384345)]
-    public void Convert_CieLab_to_Rgb(float l, float a, float b, float r, float g, float b2)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new Rgb(r, g, b2);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = Converter.ToRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndYCbCrConversionTests.cs
deleted file mode 100644
index f13e989a8..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLab"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CieLabAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 128, 128, 0, 0, 0)]
-    [InlineData(87.4179, 133.9763, 247.5308, 55.06287, 82.54838, 23.1697)]
-    public void Convert_YCbCr_to_CieLab(float y, float cb, float cr, float l, float a, float b)
-    {
-        // Arrange
-        var input = new YCbCr(y, cb, cr);
-        var expected = new CieLab(l, a, b);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = Converter.ToCieLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(36.0555, 303.6901, 10.01514, 87.4179, 133.9763, 247.5308)]
-    public void Convert_CieLab_to_YCbCr(float l, float a, float b, float y, float cb, float cr)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b);
-        var expected = new YCbCr(y, cb, cr);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = Converter.ToYCbCr(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieLuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieLuvConversionTests.cs
deleted file mode 100644
index b50d47aeb..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieLuvConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="CieLuv"/> conversions.
-/// </summary>
-public class CieLchAndCieLuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 34.89777, 187.6642, -7.181467)]
-    public void Convert_CieLch_to_CieLuv(float l, float c, float h, float l2, float u, float v)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new CieLuv(l2, u, v);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(34.89777, 187.6642, -7.181467, 36.05552, 103.6901, 10.01514)]
-    public void Convert_CieLuv_to_CieLch(float l2, float u, float v, float l, float c, float h)
-    {
-        // Arrange
-        var input = new CieLuv(l2, u, v);
-        var expected = new CieLch(l, c, h);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieXyyConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieXyyConversionTests.cs
deleted file mode 100644
index 93f082886..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndCieXyyConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="CieXyy"/> conversions.
-/// </summary>
-public class CieLchAndCieXyyConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0.6529307, 0.2147411, 0.08447381)]
-    public void Convert_CieLch_to_CieXyy(float l, float c, float h, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.6529307, 0.2147411, 0.08447381, 36.05552, 103.6901, 10.01515)]
-    public void Convert_CieXyy_to_CieLch(float x, float y, float yl, float l, float c, float h)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new CieLch(l, c, h);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHslConversionTests.cs
deleted file mode 100644
index 0bc76562b..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHslConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CieLchAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 341.959, 1, 0.4207301)]
-    public void Convert_CieLch_to_Hsl(float l, float c, float h, float h2, float s, float l2)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new Hsl(h2, s, l2);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = Converter.ToHsl(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(341.959, 1, 0.4207301, 46.13444, 78.0637, 22.90503)]
-    public void Convert_Hsl_to_CieLch(float h2, float s, float l2, float l, float c, float h)
-    {
-        // Arrange
-        var input = new Hsl(h2, s, l2);
-        var expected = new CieLch(l, c, h);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHsvConversionTests.cs
deleted file mode 100644
index bb28c0394..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHsvConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CieLchAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 341.959, 1, 0.8414602)]
-    public void Convert_CieLch_to_Hsv(float l, float c, float h, float h2, float s, float v)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new Hsv(h2, s, v);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = Converter.ToHsv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(341.959, 1, 0.8414602, 46.13444, 78.0637, 22.90501)]
-    public void Convert_Hsv_to_CieLch(float h2, float s, float v, float l, float c, float h)
-    {
-        // Arrange
-        var input = new Hsv(h2, s, v);
-        var expected = new CieLch(l, c, h);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHunterLabConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHunterLabConversionTests.cs
deleted file mode 100644
index 9892ac8f5..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndHunterLabConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-public class CieLchAndHunterLabConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 29.41358, 106.6302, 9.102425)]
-    public void Convert_CieLch_to_HunterLab(float l, float c, float h, float l2, float a, float b)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new HunterLab(l2, a, b);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = Converter.ToHunterLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(29.41358, 106.6302, 9.102425, 36.05551, 103.6901, 10.01515)]
-    public void Convert_HunterLab_to_CieLch(float l2, float a, float b, float l, float c, float h)
-    {
-        // Arrange
-        var input = new HunterLab(l2, a, b);
-        var expected = new CieLch(l, c, h);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLinearRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLinearRgbConversionTests.cs
deleted file mode 100644
index 3ecfadf11..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLinearRgbConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="LinearRgb"/> conversions.
-/// </summary>
-public class CieLchAndLinearRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="LinearRgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0.6765013, 0, 0.05209038)]
-    public void Convert_CieLch_to_LinearRgb(float l, float c, float h, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new LinearRgb(r, g, b);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<LinearRgb> actualSpan = new LinearRgb[5];
-
-        // Act
-        var actual = Converter.ToLinearRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="LinearRgb"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.6765013, 0, 0.05209038, 46.13445, 78.06367, 22.90504)]
-    public void Convert_LinearRgb_to_CieLch(float r, float g, float b, float l, float c, float h)
-    {
-        // Arrange
-        var input = new LinearRgb(r, g, b);
-        var expected = new CieLch(l, c, h);
-
-        Span<LinearRgb> inputSpan = new LinearRgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLmsConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLmsConversionTests.cs
deleted file mode 100644
index 7a1939121..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndLmsConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="Lms"/> conversions.
-/// </summary>
-public class CieLchAndLmsConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0.2440057, -0.04603009, 0.05780027)]
-    public void Convert_CieLch_to_Lms(float l, float c, float h, float l2, float m, float s)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new Lms(l2, m, s);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<Lms> actualSpan = new Lms[5];
-
-        // Act
-        var actual = Converter.ToLms(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Lms"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.2440057, -0.04603009, 0.05780027, 36.05552, 103.6901, 10.01515)]
-    public void Convert_Lms_to_CieLch(float l2, float m, float s, float l, float c, float h)
-    {
-        // Arrange
-        var input = new Lms(l2, m, s);
-        var expected = new CieLch(l, c, h);
-
-        Span<Lms> inputSpan = new Lms[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndRgbConversionTests.cs
deleted file mode 100644
index 013e79534..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndRgbConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="Rgb"/> conversions.
-/// </summary>
-public class CieLchAndRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0.8414602, 0, 0.2530123)]
-    public void Convert_CieLch_to_Rgb(float l, float c, float h, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new Rgb(r, g, b);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = Converter.ToRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.8414602, 0, 0.2530123, 46.13444, 78.0637, 22.90503)]
-    public void Convert_Rgb_to_CieLch(float r, float g, float b, float l, float c, float h)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new CieLch(l, c, h);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndYCbCrConversionTests.cs
deleted file mode 100644
index bcde97102..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLch"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CieLchAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(36.0555, 103.6901, 10.01514, 71.5122, 124.053, 230.0401)]
-    public void Convert_CieLch_to_YCbCr(float l, float c, float h, float y, float cb, float cr)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new YCbCr(y, cb, cr);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = Converter.ToYCbCr(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(71.5122, 124.053, 230.0401, 46.23178, 78.1114, 22.7662)]
-    public void Convert_YCbCr_to_CieLch(float y, float cb, float cr, float l, float c, float h)
-    {
-        // Arrange
-        var input = new YCbCr(y, cb, cr);
-        var expected = new CieLch(l, c, h);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLchConversionTests.cs
deleted file mode 100644
index 1098de91e..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLchConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLchuv"/>-<see cref="CieLch"/> conversions.
-/// </summary>
-public class CieLchuvAndCieLchConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="CieLchuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.73742, 64.79149, 30.1786, 36.0555, 103.6901, 10.01513)]
-    public void Convert_CieLch_to_CieLchuv(float l2, float c2, float h2, float l, float c, float h)
-    {
-        // Arrange
-        var input = new CieLch(l2, c2, h2);
-        var expected = new CieLchuv(l, c, h);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<CieLchuv> actualSpan = new CieLchuv[5];
-
-        // Act
-        var actual = Converter.ToCieLchuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLchuv"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(36.0555, 103.6901, 10.01514, 36.73742, 64.79149, 30.1786)]
-    public void Convert_CieLchuv_to_CieLch(float l, float c, float h, float l2, float c2, float h2)
-    {
-        // Arrange
-        var input = new CieLchuv(l, c, h);
-        var expected = new CieLch(l2, c2, h2);
-
-        Span<CieLchuv> inputSpan = new CieLchuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLuvConversionTests.cs
deleted file mode 100644
index ba3bc9e79..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCieLuvConversionTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="CieLchuv"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieLchuvAndCieLuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLchuv"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(54.2917, 106.8391, 40.8526, 54.2917, 80.8125, 69.8851)]
-    [InlineData(100, 0, 0, 100, 0, 0)]
-    [InlineData(100, 50, 180, 100, -50, 0)]
-    [InlineData(10, 36.0555, 56.3099, 10, 20, 30)]
-    [InlineData(10, 36.0555, 123.6901, 10, -20, 30)]
-    [InlineData(10, 36.0555, 303.6901, 10, 20, -30)]
-    [InlineData(10, 36.0555, 236.3099, 10, -20, -30)]
-    public void Convert_CieLchuv_to_CieLuv(float l, float c, float h, float l2, float u, float v)
-    {
-        // Arrange
-        var input = new CieLchuv(l, c, h);
-        var expected = new CieLuv(l2, u, v);
-
-        Span<CieLchuv> inputSpan = new CieLchuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="CieLchuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(54.2917, 80.8125, 69.8851, 54.2917, 106.8391, 40.8526)]
-    [InlineData(100, 0, 0, 100, 0, 0)]
-    [InlineData(100, -50, 0, 100, 50, 180)]
-    [InlineData(10, 20, 30, 10, 36.0555, 56.3099)]
-    [InlineData(10, -20, 30, 10, 36.0555, 123.6901)]
-    [InlineData(10, 20, -30, 10, 36.0555, 303.6901)]
-    [InlineData(10, -20, -30, 10, 36.0555, 236.3099)]
-    [InlineData(37.3511, 24.1720, 16.0684, 37.3511, 29.0255, 33.6141)]
-    public void Convert_CieLuv_to_CieLchuv(float l, float u, float v, float l2, float c, float h)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new CieLchuv(l2, c, h);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLchuv> actualSpan = new CieLchuv[5];
-
-        // Act
-        var actual = Converter.ToCieLchuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCmykConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCmykConversionTests.cs
deleted file mode 100644
index 176a0e217..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLchuvAndCmykConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLchuv"/>-<see cref="Cmyk"/> conversions.
-/// </summary>
-public class CieLchuvAndCmykConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieLchuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 1, 0, 0, 0)]
-    [InlineData(0, 0.8576171, 0.7693201, 0.3440427, 36.0555, 103.6901, 10.01514)]
-    public void Convert_Cmyk_to_CieLchuv(float c2, float m, float y, float k, float l, float c, float h)
-    {
-        // Arrange
-        var input = new Cmyk(c2, m, y, k);
-        var expected = new CieLchuv(l, c, h);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieLchuv> actualSpan = new CieLchuv[5];
-
-        // Act
-        var actual = Converter.ToCieLchuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLchuv"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0, 1)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0, 0.8576171, 0.7693201, 0.3440427)]
-    public void Convert_CieLchuv_to_Cmyk(float l, float c, float h, float c2, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieLchuv(l, c, h);
-        var expected = new Cmyk(c2, m, y, k);
-
-        Span<CieLchuv> inputSpan = new CieLchuv[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieXyyConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieXyyConversionTests.cs
deleted file mode 100644
index e32cc6ebf..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieXyyConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="CieXyy"/> conversions.
-/// </summary>
-public class CieLuvAndCieXyyConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 103.6901, 10.01514, 0.5646762, 0.2932749, 0.09037033)]
-    public void Convert_CieLuv_to_CieXyy(float l, float u, float v, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.5646762, 0.2932749, 0.09037033, 36.0555, 103.6901, 10.01514)]
-    public void Convert_CieXyy_to_CieLuv(float x, float y, float yl, float l, float u, float v)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new CieLuv(l, u, v);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHslConversionTests.cs
deleted file mode 100644
index 95f07465a..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHslConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CieLuvAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 347.3767, 0.7115612, 0.3765343)]
-    public void Convert_CieLuv_to_Hsl(float l, float u, float v, float h, float s, float l2)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new Hsl(h, s, l2);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = Converter.ToHsl(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(347.3767, 0.7115612, 0.3765343, 36.0555, 93.69012, 10.01514)]
-    public void Convert_Hsl_to_CieLuv(float h, float s, float l2, float l, float u, float v)
-    {
-        // Arrange
-        var input = new Hsl(h, s, l2);
-        var expected = new CieLuv(l, u, v);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHsvConversionTests.cs
deleted file mode 100644
index ddb90f0ef..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHsvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CieLuvAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 347.3767, 0.8314762, 0.6444615)]
-    public void Convert_CieLuv_to_Hsv(float l, float u, float v, float h, float s, float v2)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new Hsv(h, s, v2);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = Converter.ToHsv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(347.3767, 0.8314762, 0.6444615, 36.0555, 93.69012, 10.01514)]
-    public void Convert_Hsv_to_CieLuv(float h, float s, float v2, float l, float u, float v)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v2);
-        var expected = new CieLuv(l, u, v);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHunterLabConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHunterLabConversionTests.cs
deleted file mode 100644
index 38449e4b7..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndHunterLabConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-public class CieLuvAndHunterLabConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 30.19531, 46.4312, 11.16259)]
-    public void Convert_CieLuv_to_HunterLab(float l, float u, float v, float l2, float a, float b)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new HunterLab(l2, a, b);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = Converter.ToHunterLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(30.19531, 46.4312, 11.16259, 36.0555, 93.6901, 10.01514)]
-    public void Convert_HunterLab_to_CieLuv(float l2, float a, float b, float l, float u, float v)
-    {
-        // Arrange
-        var input = new HunterLab(l2, a, b);
-        var expected = new CieLuv(l, u, v);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLinearRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLinearRgbConversionTests.cs
deleted file mode 100644
index f3bd93604..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLinearRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="LinearRgb"/> conversions.
-/// </summary>
-public class CieLuvAndLinearRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="LinearRgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 0.3729299, 0.01141088, 0.04014909)]
-    public void Convert_CieLuv_to_LinearRgb(float l, float u, float v, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new LinearRgb(r, g, b);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<LinearRgb> actualSpan = new LinearRgb[5];
-
-        // Act
-        var actual = Converter.ToLinearRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="LinearRgb"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.3729299, 0.01141088, 0.04014909, 36.0555, 93.6901, 10.01511)]
-    public void Convert_LinearRgb_to_CieLuv(float r, float g, float b, float l, float u, float v)
-    {
-        // Arrange
-        var input = new LinearRgb(r, g, b);
-        var expected = new CieLuv(l, u, v);
-
-        Span<LinearRgb> inputSpan = new LinearRgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLmsConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLmsConversionTests.cs
deleted file mode 100644
index ac90a7ba4..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndLmsConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="Lms"/> conversions.
-/// </summary>
-public class CieLuvAndLmsConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 0.164352, 0.03267485, 0.0483408)]
-    public void Convert_CieLuv_to_Lms(float l, float u, float v, float l2, float m, float s)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new Lms(l2, m, s);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<Lms> actualSpan = new Lms[5];
-
-        // Act
-        var actual = Converter.ToLms(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Lms"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.164352, 0.03267485, 0.0483408, 36.0555, 93.69009, 10.01514)]
-    public void Convert_Lms_to_CieLuv(float l2, float m, float s, float l, float u, float v)
-    {
-        // Arrange
-        var input = new Lms(l2, m, s);
-        var expected = new CieLuv(l, u, v);
-
-        Span<Lms> inputSpan = new Lms[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndRgbConversionTests.cs
deleted file mode 100644
index b2e308fce..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="Rgb"/> conversions.
-/// </summary>
-public class CieLuvAndRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(36.0555, 93.6901, 10.01514, 0.6444615, 0.1086071, 0.2213444)]
-    public void Convert_CieLuv_to_Rgb(float l, float u, float v, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new Rgb(r, g, b);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = Converter.ToRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.6444615, 0.1086071, 0.2213444, 36.0555, 93.69012, 10.01514)]
-    public void Convert_Rgb_to_CieLuv(float r, float g, float b, float l, float u, float v)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new CieLuv(l, u, v);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndYCbCrConversionTests.cs
deleted file mode 100644
index f7c6372b1..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieLuv"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CieLuvAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(36.0555, 93.6901, 10.01514, 71.8283, 119.3174, 193.9839)]
-    public void Convert_CieLuv_to_YCbCr(float l, float u, float v, float y, float cb, float cr)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new YCbCr(y, cb, cr);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = Converter.ToYCbCr(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 128, 128, 0, 0, 0)]
-    [InlineData(71.8283, 119.3174, 193.9839, 36.00565, 93.44593, 10.2234)]
-    public void Convert_YCbCr_to_CieLuv(float y, float cb, float cr, float l, float u, float v)
-    {
-        // Arrange
-        var input = new YCbCr(y, cb, cr);
-        var expected = new CieLuv(l, u, v);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHslConversionTests.cs
deleted file mode 100644
index bae914002..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHslConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CieXyyAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.211263)]
-    public void Convert_CieXyy_to_Hsl(float x, float y, float yl, float h, float s, float l)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new Hsl(h, s, l);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = Converter.ToHsl(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(120, 1, 0.211263, 0.3, 0.6, 0.1067051)]
-    public void Convert_Hsl_to_CieXyy(float h, float s, float l, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Hsl(h, s, l);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        CieXyy actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHsvConversionTests.cs
deleted file mode 100644
index 7de91cc32..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHsvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CieXyyAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.4225259)]
-    public void Convert_CieXyy_to_Hsv(float x, float y, float yl, float h, float s, float v)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new Hsv(h, s, v);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = Converter.ToHsv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(120, 1, 0.4225259, 0.3, 0.6, 0.1067051)]
-    public void Convert_Hsv_to_CieXyy(float h, float s, float v, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHunterLabConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHunterLabConversionTests.cs
deleted file mode 100644
index 40b58b704..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndHunterLabConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-public class CieXyyAndHunterLabConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 31.46263, -32.81796, 28.64938)]
-    public void Convert_CieXyy_to_HunterLab(float x, float y, float yl, float l, float a, float b)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new HunterLab(l, a, b);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = Converter.ToHunterLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(31.46263, -32.81796, 28.64938, 0.3605552, 0.9369011, 0.1001514)]
-    public void Convert_HunterLab_to_CieXyy(float l, float a, float b, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new HunterLab(l, a, b);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        CieXyy actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLinearRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLinearRgbConversionTests.cs
deleted file mode 100644
index 062f54abc..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLinearRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="LinearRgb"/> conversions.
-/// </summary>
-public class CieXyyAndLinearRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="LinearRgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 0, 0.1492062, 0)]
-    public void Convert_CieXyy_to_LinearRgb(float x, float y, float yl, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new LinearRgb(r, g, b);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<LinearRgb> actualSpan = new LinearRgb[5];
-
-        // Act
-        var actual = Converter.ToLinearRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="LinearRgb"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 0.1492062, 0, 0.3, 0.6, 0.1067051)]
-    public void Convert_LinearRgb_to_CieXyy(float r, float g, float b, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new LinearRgb(r, g, b);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<LinearRgb> inputSpan = new LinearRgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLmsConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLmsConversionTests.cs
deleted file mode 100644
index 8e9cbc5ff..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndLmsConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="Lms"/> conversions.
-/// </summary>
-public class CieXyyAndLmsConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 0.06631134, 0.1415282, -0.03809926)]
-    public void Convert_CieXyy_to_Lms(float x, float y, float yl, float l, float m, float s)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new Lms(l, m, s);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<Lms> actualSpan = new Lms[5];
-
-        // Act
-        var actual = Converter.ToLms(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Lms"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.06631134, 0.1415282, -0.03809926, 0.360555, 0.9369009, 0.1001514)]
-    public void Convert_Lms_to_CieXyy(float l, float m, float s, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Lms(l, m, s);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<Lms> inputSpan = new Lms[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        CieXyy actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndRgbConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndRgbConversionTests.cs
deleted file mode 100644
index 0a7cd6842..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndRgbConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="Rgb"/> conversions.
-/// </summary>
-public class CieXyyAndRgbConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 0, 0.4225259, 0)]
-    public void Convert_CieXyy_to_Rgb(float x, float y, float yl, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new Rgb(r, g, b);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = Converter.ToRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 0.4225259, 0, 0.3, 0.6, 0.1067051)]
-    public void Convert_Rgb_to_CieXyy(float r, float g, float b, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        CieXyy actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndYCbCrConversionTests.cs
deleted file mode 100644
index efacebcf1..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyyAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyy"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CieXyyAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 63.24579, 92.30826, 82.88884)]
-    public void Convert_CieXyy_to_YCbCr(float x, float y, float yl, float y2, float cb, float cr)
-    {
-        // Arrange
-        var input = new CieXyy(x, y, yl);
-        var expected = new YCbCr(y2, cb, cr);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = Converter.ToYCbCr(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 128, 128, 0, 0, 0)]
-    [InlineData(63.24579, 92.30826, 82.88884, 0.3, 0.6, 0.1072441)]
-    public void Convert_YCbCr_to_CieXyy(float y2, float cb, float cr, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new YCbCr(y2, cb, cr);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        CieXyy actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs
deleted file mode 100644
index 3ea4228e5..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieLab"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieXyzAndCieLabConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLab"/> to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(100, 0, 0, 0.95047, 1, 1.08883)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 431.0345, 0, 0.95047, 0, 0)]
-    [InlineData(100, -431.0345, 172.4138, 0, 1, 0)]
-    [InlineData(0, 0, -172.4138, 0, 0, 1.08883)]
-    [InlineData(45.6398, 39.8753, 35.2091, 0.216938, 0.150041, 0.048850)]
-    [InlineData(77.1234, -40.1235, 78.1120, 0.358530, 0.517372, 0.076273)]
-    [InlineData(10, -400, 20, 0, 0.011260, 0)]
-    public void Convert_Lab_to_Xyz(float l, float a, float b, float x, float y, float z)
-    {
-        // Arrange
-        var input = new CieLab(l, a, b, Illuminants.D65);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<CieLab> inputSpan = new CieLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>) to <see cref="CieLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.95047, 1, 1.08883, 100, 0, 0)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.95047, 0, 0, 0, 431.0345, 0)]
-    [InlineData(0, 1, 0, 100, -431.0345, 172.4138)]
-    [InlineData(0, 0, 1.08883, 0, 0, -172.4138)]
-    [InlineData(0.216938, 0.150041, 0.048850, 45.6398, 39.8753, 35.2091)]
-    public void Convert_Xyz_to_Lab(float x, float y, float z, float l, float a, float b)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieLab(l, a, b);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieLab> actualSpan = new CieLab[5];
-
-        // Act
-        var actual = converter.ToCieLab(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchConversionTests.cs
deleted file mode 100644
index 698c9add6..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieLch"/> conversions.
-/// </summary>
-public class CieXyzAndCieLchConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.360555, 0.936901, 0.1001514, 97.50815, 155.8035, 139.323)]
-    public void Convert_CieXyz_to_CieLch(float x, float y, float yl, float l, float c, float h)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, yl);
-        var expected = new CieLch(l, c, h);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(97.50815, 155.8035, 139.323, 0.3605551, 0.936901, 0.1001514)]
-    public void Convert_CieLch_to_CieXyz(float l, float c, float h, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new CieLch(l, c, h);
-        var expected = new CieXyz(x, y, yl);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        CieXyz actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchuvConversionTests.cs
deleted file mode 100644
index a4caf4c85..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLchuvConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieLchuv"/> conversions.
-/// </summary>
-public class CieXyzAndCieLchuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="CieLchuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.360555, 0.936901, 0.1001514, 97.50697, 183.3831, 133.6321)]
-    public void Convert_CieXyz_to_CieLchuv(float x, float y, float yl, float l, float c, float h)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, yl);
-        var expected = new CieLchuv(l, c, h);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieLchuv> actualSpan = new CieLchuv[5];
-
-        // Act
-        var actual = Converter.ToCieLchuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLchuv"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(97.50697, 183.3831, 133.6321, 0.360555, 0.936901, 0.1001515)]
-    public void Convert_CieLchuv_to_CieXyz(float l, float c, float h, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new CieLchuv(l, c, h);
-        var expected = new CieXyz(x, y, yl);
-
-        Span<CieLchuv> inputSpan = new CieLchuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        CieXyz actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs
deleted file mode 100644
index 9e3381b40..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieLuv"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieXyzAndCieLuvConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 100, 50, 0, 0, 0)]
-    [InlineData(0.1, 100, 50, 0.000493, 0.000111, 0)]
-    [InlineData(70.0000, 86.3525, 2.8240, 0.569310, 0.407494, 0.365843)]
-    [InlineData(10.0000, -1.2345, -10.0000, 0.012191, 0.011260, 0.025939)]
-    [InlineData(100, 0, 0, 0.950470, 1.000000, 1.088830)]
-    [InlineData(1, 1, 1, 0.001255, 0.001107, 0.000137)]
-    public void Convert_Luv_to_Xyz(float l, float u, float v, float x, float y, float z)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v, Illuminants.D65);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>) to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.000493, 0.000111, 0, 0.1003, 0.9332, -0.0070)]
-    [InlineData(0.569310, 0.407494, 0.365843, 70.0000, 86.3524, 2.8240)]
-    [InlineData(0.012191, 0.011260, 0.025939, 9.9998, -1.2343, -9.9999)]
-    [InlineData(0.950470, 1.000000, 1.088830, 100, 0, 0)]
-    [InlineData(0.001255, 0.001107, 0.000137, 0.9999, 0.9998, 1.0004)]
-    public void Convert_Xyz_to_Luv(float x, float y, float z, float l, float u, float v)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieLuv(l, u, v);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = converter.ToCieLuv(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs
deleted file mode 100644
index 5ef5c4d21..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieXyy"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieXyzAndCieXyyConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    [Theory]
-    [InlineData(0.436075, 0.222504, 0.013932, 0.648427, 0.330856, 0.222504)]
-    [InlineData(0.964220, 1.000000, 0.825210, 0.345669, 0.358496, 1.000000)]
-    [InlineData(0.434119, 0.356820, 0.369447, 0.374116, 0.307501, 0.356820)]
-    [InlineData(0, 0, 0, 0.538842, 0.000000, 0.000000)]
-    public void Convert_xyY_to_XYZ(float xyzX, float xyzY, float xyzZ, float x, float y, float yl)
-    {
-        var input = new CieXyy(x, y, yl);
-        var expected = new CieXyz(xyzX, xyzY, xyzZ);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToCieXyz(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    [Theory]
-    [InlineData(0.436075, 0.222504, 0.013932, 0.648427, 0.330856, 0.222504)]
-    [InlineData(0.964220, 1.000000, 0.825210, 0.345669, 0.358496, 1.000000)]
-    [InlineData(0.434119, 0.356820, 0.369447, 0.374116, 0.307501, 0.356820)]
-    [InlineData(0.231809, 0, 0.077528, 0.749374, 0.000000, 0.000000)]
-    public void Convert_XYZ_to_xyY(float xyzX, float xyzY, float xyzZ, float x, float y, float yl)
-    {
-        var input = new CieXyz(xyzX, xyzY, xyzZ);
-        var expected = new CieXyy(x, y, yl);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToCieXyy(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHslConversionTests.cs
deleted file mode 100644
index 634d03a50..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHslConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CieXyzAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.5)]
-    public void Convert_CieXyz_to_Hsl(float x, float y, float yl, float h, float s, float l)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, yl);
-        var expected = new Hsl(h, s, l);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = Converter.ToHsl(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(120, 1, 0.5, 0.3575761, 0.7151522, 0.119192)]
-    public void Convert_Hsl_to_CieXyz(float h, float s, float l, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Hsl(h, s, l);
-        var expected = new CieXyz(x, y, yl);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHsvConversionTests.cs
deleted file mode 100644
index ccedd7b75..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHsvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CieXyzAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 120, 1, 0.9999999)]
-    public void Convert_CieXyz_to_Hsv(float x, float y, float yl, float h, float s, float v)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, yl);
-        var expected = new Hsv(h, s, v);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = Converter.ToHsv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(120, 1, 0.9999999, 0.3575761, 0.7151522, 0.119192)]
-    public void Convert_Hsv_to_CieXyz(float h, float s, float v, float x, float y, float yl)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v);
-        var expected = new CieXyz(x, y, yl);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        CieXyz actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs
deleted file mode 100644
index af7087ba2..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class CieXyzAndHunterLabConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieXyz"/> (<see cref="Illuminants.C"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(100, 0, 0, 0.98074, 1, 1.18232)] // C white point is HunterLab 100, 0, 0
-    public void Convert_HunterLab_to_Xyz(float l, float a, float b, float x, float y, float z)
-    {
-        // Arrange
-        var input = new HunterLab(l, a, b);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.C };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(100, 0, 0, 0.95047, 1, 1.08883)] // D65 white point is HunerLab 100, 0, 0 (adaptation to C performed)
-    public void Convert_HunterLab_to_Xyz_D65(float l, float a, float b, float x, float y, float z)
-    {
-        // Arrange
-        var input = new HunterLab(l, a, b);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>) to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.95047, 1, 1.08883, 100, 0, 0)] // D65 white point is HunterLab 100, 0, 0 (adaptation to C performed)
-    public void Convert_Xyz_D65_to_HunterLab(float x, float y, float z, float l, float a, float b)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new HunterLab(l, a, b);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = converter.ToHunterLab(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs
deleted file mode 100644
index 33bdc6e93..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="Lms"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using original colorful library.
-/// </remarks>
-public class CieXyzAndLmsConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>) to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.941428535, 1.040417467, 1.089532651, 0.95047, 1, 1.08883)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.850765697, -0.713042594, 0.036973283, 0.95047, 0, 0)]
-    [InlineData(0.2664, 1.7135, -0.0685, 0, 1, 0)]
-    [InlineData(-0.175737162, 0.039960061, 1.121059368, 0, 0, 1.08883)]
-    [InlineData(0.2262677362, 0.0961411609, 0.0484570397, 0.216938, 0.150041, 0.048850)]
-    public void Convert_Lms_to_CieXyz(float l, float m, float s, float x, float y, float z)
-    {
-        // Arrange
-        var input = new Lms(l, m, s);
-        var converter = new ColorSpaceConverter();
-        var expected = new CieXyz(x, y, z);
-
-        Span<Lms> inputSpan = new Lms[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>) to <see cref="Lms"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.95047, 1, 1.08883, 0.941428535, 1.040417467, 1.089532651)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.95047, 0, 0, 0.850765697, -0.713042594, 0.036973283)]
-    [InlineData(0, 1, 0, 0.2664, 1.7135, -0.0685)]
-    [InlineData(0, 0, 1.08883, -0.175737162, 0.039960061, 1.121059368)]
-    [InlineData(0.216938, 0.150041, 0.048850, 0.2262677362, 0.0961411609, 0.0484570397)]
-    public void Convert_CieXyz_to_Lms(float x, float y, float z, float l, float m, float s)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var converter = new ColorSpaceConverter();
-        var expected = new Lms(l, m, s);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Lms> actualSpan = new Lms[5];
-
-        // Act
-        var actual = converter.ToLms(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndYCbCrConversionTests.cs
deleted file mode 100644
index ba67e605a..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CieXyzAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(0.360555, 0.936901, 0.1001514, 149.685, 43.52769, 21.23457)]
-    public void Convert_CieXyz_to_YCbCr(float x, float y, float z, float y2, float cb, float cr)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var expected = new YCbCr(y2, cb, cr);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = Converter.ToYCbCr(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 128, 128, 0, 0, 0)]
-    [InlineData(149.685, 43.52769, 21.23457, 0.3575761, 0.7151522, 0.119192)]
-    public void Convert_YCbCr_to_CieXyz(float y2, float cb, float cr, float x, float y, float z)
-    {
-        // Arrange
-        var input = new YCbCr(y2, cb, cr);
-        var expected = new CieXyz(x, y, z);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        CieXyz actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLchConversionTests.cs
deleted file mode 100644
index 9def3e1b2..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLchConversionTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="CieLch"/> conversions.
-/// </summary>
-public class CmykAndCieLchConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieLch"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 62.85025, 64.77041, 118.2425)]
-    public void Convert_Cmyk_to_CieLch(float c, float m, float y, float k, float l, float c2, float h)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new CieLch(l, c2, h);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieLch> actualSpan = new CieLch[5];
-
-        // Act
-        var actual = Converter.ToCieLch(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLch"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(100, 3.81656E-05, 218.6598, 0, 1.192093E-07, 0, 5.960464E-08)]
-    [InlineData(62.85025, 64.77041, 118.2425, 0.286581, 0, 0.7975187, 0.34983)]
-    public void Convert_CieLch_to_Cmyk(float l, float c2, float h, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieLch(l, c2, h);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<CieLch> inputSpan = new CieLch[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLuvConversionTests.cs
deleted file mode 100644
index 9ae0fb711..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieLuvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="CieLuv"/> conversions.
-/// </summary>
-public class CmykAndCieLuvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieLuv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 100, -1.937151E-05, 0)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 62.66017, -24.01712, 68.29556)]
-    public void Convert_Cmyk_to_CieLuv(float c, float m, float y, float k, float l, float u, float v)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new CieLuv(l, u, v);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieLuv> actualSpan = new CieLuv[5];
-
-        // Act
-        var actual = Converter.ToCieLuv(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieLuv"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(100, -1.937151E-05, 0, 3.576279E-07, 0, 0, 5.960464E-08)]
-    [InlineData(62.66017, -24.01712, 68.29556, 0.2865804, 0, 0.7975189, 0.3498302)]
-    public void Convert_CieLuv_to_Cmyk(float l, float u, float v, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieLuv(l, u, v);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<CieLuv> inputSpan = new CieLuv[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyyConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyyConversionTests.cs
deleted file mode 100644
index 270db9d20..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyyConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="CieXyy"/> conversions.
-/// </summary>
-public class CmykAndCieXyyConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieXyy"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0.3127266, 0.3290231, 1)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 0.3628971, 0.5289949, 0.3118104)]
-    public void Convert_Cmyk_to_CieXyy(float c, float m, float y, float k, float x, float y2, float yl)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new CieXyy(x, y2, yl);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyy> actualSpan = new CieXyy[5];
-
-        // Act
-        var actual = Converter.ToCieXyy(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyy"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.3127266, 0.3290231, 1, 0, 0, 0, 5.960464E-08)]
-    [InlineData(0.3628971, 0.5289949, 0.3118104, 0.2865805, 0, 0.7975187, 0.3498302)]
-    public void Convert_CieXyy_to_Cmyk(float x, float y2, float yl, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieXyy(x, y2, yl);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<CieXyy> inputSpan = new CieXyy[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyzConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyzConversionTests.cs
deleted file mode 100644
index 972948c71..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndCieXyzConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="CieXyz"/> conversions.
-/// </summary>
-public class CmykAndCieXyzConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="CieXyz"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0.9504699, 1, 1.08883)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 0.2139058, 0.3118104, 0.0637231)]
-    public void Convert_Cmyk_to_CieXyz(float c, float m, float y, float k, float x, float y2, float z)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new CieXyz(x, y2, z);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = Converter.ToCieXyz(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0.9504699, 1, 1.08883, 1.192093E-07, 0, 0, 5.960464E-08)]
-    [InlineData(0.2139058, 0.3118104, 0.0637231, 0.2865805, 0, 0.7975187, 0.3498302)]
-    public void Convert_CieXyz_to_Cmyk(float x, float y2, float z, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new CieXyz(x, y2, z);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHslConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHslConversionTests.cs
deleted file mode 100644
index 2b00942ac..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHslConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-public class CmykAndHslConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0, 1)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 81.56041, 0.6632275, 0.3909085)]
-    public void Convert_Cmyk_to_Hsl(float c, float m, float y, float k, float h, float s, float l)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new Hsl(h, s, l);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToHsl(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 1, 0, 0, 0, 0)]
-    [InlineData(81.56041, 0.6632275, 0.3909085, 0.2865805, 0, 0.7975187, 0.3498302)]
-    public void Convert_Hsl_to_Cmyk(float h, float s, float l, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new Hsl(h, s, l);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToCmyk(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHsvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHsvConversionTests.cs
deleted file mode 100644
index f158fb5f9..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHsvConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-public class CmykAndHsvConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0, 1)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 81.56041, 0.7975187, 0.6501698)]
-    public void Convert_Cmyk_to_Hsv(float c, float m, float y, float k, float h, float s, float v)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new Hsv(h, s, v);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToHsv(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 1, 0, 0, 0, 0)]
-    [InlineData(81.56041, 0.7975187, 0.6501698, 0.2865805, 0, 0.7975187, 0.3498302)]
-    public void Convert_Hsv_to_Cmyk(float h, float s, float v, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToCmyk(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHunterLabConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHunterLabConversionTests.cs
deleted file mode 100644
index 9832a0d71..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndHunterLabConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="HunterLab"/> conversions.
-/// </summary>
-public class CmykAndHunterLabConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="HunterLab"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 99.99999, 0, -1.66893E-05)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 55.66742, -27.21679, 31.73834)]
-    public void Convert_Cmyk_to_HunterLab(float c, float m, float y, float k, float l, float a, float b)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new HunterLab(l, a, b);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<HunterLab> actualSpan = new HunterLab[5];
-
-        // Act
-        var actual = Converter.ToHunterLab(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="HunterLab"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(99.99999, 0, -1.66893E-05, 1.192093E-07, 1.192093E-07, 0, 5.960464E-08)]
-    [InlineData(55.66742, -27.21679, 31.73834, 0.2865806, 0, 0.7975186, 0.3498301)]
-    public void Convert_HunterLab_to_Cmyk(float l, float a, float b, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new HunterLab(l, a, b);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<HunterLab> inputSpan = new HunterLab[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndYCbCrConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndYCbCrConversionTests.cs
deleted file mode 100644
index 1e8bc52e2..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/CmykAndYCbCrConversionTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Cmyk"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-public class CmykAndYCbCrConversionTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0002F);
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 255, 128, 128)]
-    [InlineData(0.360555, 0.1036901, 0.818514, 0.274615, 136.5134, 69.90555, 114.9948)]
-    public void Convert_Cmyk_to_YCbCr(float c, float m, float y, float k, float y2, float cb, float cr)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new YCbCr(y2, cb, cr);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToYCbCr(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(255, 128, 128, 0, 0, 0, 5.960464E-08)]
-    [InlineData(136.5134, 69.90555, 114.9948, 0.2891567, 0, 0.7951807, 0.3490196)]
-    public void Convert_YCbCr_to_Cmyk(float y2, float cb, float cr, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new YCbCr(y2, cb, cr);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = Converter.ToCmyk(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs
deleted file mode 100644
index bbebf96b3..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="M:ColorSpaceConverter.Adapt" /> methods.
-/// Test data generated using:
-/// <see cref="http://www.brucelindbloom.com/index.html?ChromAdaptCalc.html"/>
-/// <see cref="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </summary>
-public class ColorConverterAdaptTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 1, 1, 1, 1, 1)]
-    [InlineData(0.206162, 0.260277, 0.746717, 0.220000, 0.130000, 0.780000)]
-    public void Adapt_RGB_WideGamutRGB_To_sRGB(float r1, float g1, float b1, float r2, float g2, float b2)
-    {
-        // Arrange
-        var input = new Rgb(r1, g1, b1, RgbWorkingSpaces.WideGamutRgb);
-        var expected = new Rgb(r2, g2, b2, RgbWorkingSpaces.SRgb);
-        var options = new ColorSpaceConverterOptions { TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        Rgb actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected.WorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 1, 1, 1, 1, 1)]
-    [InlineData(0.220000, 0.130000, 0.780000, 0.206162, 0.260277, 0.746717)]
-    public void Adapt_RGB_SRGB_To_WideGamutRGB(float r1, float g1, float b1, float r2, float g2, float b2)
-    {
-        // Arrange
-        var input = new Rgb(r1, g1, b1, RgbWorkingSpaces.SRgb);
-        var expected = new Rgb(r2, g2, b2, RgbWorkingSpaces.WideGamutRgb);
-        var options = new ColorSpaceConverterOptions { TargetRgbWorkingSpace = RgbWorkingSpaces.WideGamutRgb };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        Rgb actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected.WorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(22, 33, 1, 22.269869, 32.841164, 1.633926)]
-    public void Adapt_Lab_D65_To_D50(float l1, float a1, float b1, float l2, float a2, float b2)
-    {
-        // Arrange
-        var input = new CieLab(l1, a1, b1, Illuminants.D65);
-        var expected = new CieLab(l2, a2, b2);
-        var options = new ColorSpaceConverterOptions { TargetLabWhitePoint = Illuminants.D50 };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        CieLab actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.5, 0.5, 0.5, 0.510286, 0.501489, 0.378970)]
-    public void Adapt_Xyz_D65_To_D50_Bradford(float x1, float y1, float z1, float x2, float y2, float z2)
-    {
-        // Arrange
-        var input = new CieXyz(x1, y1, z1);
-        var expected = new CieXyz(x2, y2, z2);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D50 };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        CieXyz actual = converter.Adapt(input, Illuminants.D65);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.5, 0.5, 0.5, 0.507233, 0.500000, 0.378943)]
-    public void Adapt_Xyz_D65_To_D50_XyzScaling(float x1, float y1, float z1, float x2, float y2, float z2)
-    {
-        // Arrange
-        var input = new CieXyz(x1, y1, z1);
-        var expected = new CieXyz(x2, y2, z2);
-        var options = new ColorSpaceConverterOptions
-        {
-            ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XyzScaling),
-            WhitePoint = Illuminants.D50
-        };
-
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        CieXyz actual = converter.Adapt(input, Illuminants.D65);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(22, 33, 1, 22.1090755, 32.2102661, 1.153463)]
-    public void Adapt_HunterLab_D65_To_D50(float l1, float a1, float b1, float l2, float a2, float b2)
-    {
-        // Arrange
-        var input = new HunterLab(l1, a1, b1, Illuminants.D65);
-        var expected = new HunterLab(l2, a2, b2);
-        var options = new ColorSpaceConverterOptions { TargetLabWhitePoint = Illuminants.D50 };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        HunterLab actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(22, 33, 1, 22, 33, 0.9999999)]
-    public void Adapt_CieLchuv_D65_To_D50_XyzScaling(float l1, float c1, float h1, float l2, float c2, float h2)
-    {
-        // Arrange
-        var input = new CieLchuv(l1, c1, h1, Illuminants.D65);
-        var expected = new CieLchuv(l2, c2, h2);
-        var options = new ColorSpaceConverterOptions
-        {
-            ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XyzScaling),
-            TargetLabWhitePoint = Illuminants.D50
-        };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        CieLchuv actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-
-    [Theory]
-    [InlineData(22, 33, 1, 22, 33, 0.9999999)]
-    public void Adapt_CieLch_D65_To_D50_XyzScaling(float l1, float c1, float h1, float l2, float c2, float h2)
-    {
-        // Arrange
-        var input = new CieLch(l1, c1, h1, Illuminants.D65);
-        var expected = new CieLch(l2, c2, h2);
-        var options = new ColorSpaceConverterOptions
-        {
-            ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XyzScaling),
-            TargetLabWhitePoint = Illuminants.D50
-        };
-        var converter = new ColorSpaceConverter(options);
-
-        // Action
-        CieLch actual = converter.Adapt(input);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs
deleted file mode 100644
index 0119f4f3a..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="CieXyz"/>-<see cref="CieLab"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.brucelindbloom.com/index.html?ColorCalculator.html"/>
-/// </remarks>
-public class RgbAndCieXyzConversionTest
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="CieXyz"/> (<see cref="Illuminants.D50"/>)
-    /// to <see cref="Rgb"/> (<see cref="Rgb.DefaultWorkingSpace">default sRGB working space</see>).
-    /// </summary>
-    [Theory]
-    [InlineData(0.96422, 1.00000, 0.82521, 1, 1, 1)]
-    [InlineData(0.00000, 1.00000, 0.00000, 0, 1, 0)]
-    [InlineData(0.96422, 0.00000, 0.00000, 1, 0, 0.292064)]
-    [InlineData(0.00000, 0.00000, 0.82521, 0, 0.181415, 1)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.297676, 0.267854, 0.045504, 0.720315, 0.509999, 0.168112)]
-    public void Convert_XYZ_D50_to_SRGB(float x, float y, float z, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D50, TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new Rgb(r, g, b);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = converter.ToRgb(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion
-    /// from <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>)
-    /// to <see cref="Rgb"/> (<see cref="Rgb.DefaultWorkingSpace">default sRGB working space</see>).
-    /// </summary>
-    [Theory]
-    [InlineData(0.950470, 1.000000, 1.088830, 1, 1, 1)]
-    [InlineData(0, 1.000000, 0, 0, 1, 0)]
-    [InlineData(0.950470, 0, 0, 1, 0, 0.254967)]
-    [InlineData(0, 0, 1.088830, 0, 0.235458, 1)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0.297676, 0.267854, 0.045504, 0.754903, 0.501961, 0.099998)]
-    public void Convert_XYZ_D65_to_SRGB(float x, float y, float z, float r, float g, float b)
-    {
-        // Arrange
-        var input = new CieXyz(x, y, z);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65, TargetRgbWorkingSpace = RgbWorkingSpaces.SRgb };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new Rgb(r, g, b);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = converter.ToRgb(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> (<see cref="Rgb.DefaultWorkingSpace">default sRGB working space</see>)
-    /// to <see cref="CieXyz"/> (<see cref="Illuminants.D50"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(1, 1, 1, 0.964220, 1.000000, 0.825210)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 0, 0, 0.436075, 0.222504, 0.013932)]
-    [InlineData(0, 1, 0, 0.385065, 0.716879, 0.0971045)]
-    [InlineData(0, 0, 1, 0.143080, 0.060617, 0.714173)]
-    [InlineData(0.754902, 0.501961, 0.100000, 0.315757, 0.273323, 0.035506)]
-    public void Convert_SRGB_to_XYZ_D50(float r, float g, float b, float x, float y, float z)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D50 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> (<see cref="Rgb.DefaultWorkingSpace">default sRGB working space</see>)
-    /// to <see cref="CieXyz"/> (<see cref="Illuminants.D65"/>).
-    /// </summary>
-    [Theory]
-    [InlineData(1, 1, 1, 0.950470, 1.000000, 1.088830)]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 0, 0, 0.412456, 0.212673, 0.019334)]
-    [InlineData(0, 1, 0, 0.357576, 0.715152, 0.119192)]
-    [InlineData(0, 0, 1, 0.1804375, 0.072175, 0.950304)]
-    [InlineData(0.754902, 0.501961, 0.100000, 0.297676, 0.267854, 0.045504)]
-    public void Convert_SRGB_to_XYZ_D65(float r, float g, float b, float x, float y, float z)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var options = new ColorSpaceConverterOptions { WhitePoint = Illuminants.D65 };
-        var converter = new ColorSpaceConverter(options);
-        var expected = new CieXyz(x, y, z);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        // Act
-        var actual = converter.ToCieXyz(input);
-        converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs
deleted file mode 100644
index 942b34db3..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Rgb"/>-<see cref="Cmyk"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.colorhexa.com"/>
-/// <see href="http://www.rapidtables.com/convert/color/cmyk-to-rgb.htm"/>
-/// </remarks>
-public class RgbAndCmykConversionTest
-{
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="Cmyk"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(1, 1, 1, 1, 0, 0, 0)]
-    [InlineData(0, 0, 0, 0, 1, 1, 1)]
-    [InlineData(0, 0.84, 0.037, 0.365, 0.635, 0.1016, 0.6115)]
-    public void Convert_Cmyk_To_Rgb(float c, float m, float y, float k, float r, float g, float b)
-    {
-        // Arrange
-        var input = new Cmyk(c, m, y, k);
-        var expected = new Rgb(r, g, b);
-
-        Span<Cmyk> inputSpan = new Cmyk[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToRgb(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="Cmyk"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(1, 1, 1, 0, 0, 0, 0)]
-    [InlineData(0, 0, 0, 0, 0, 0, 1)]
-    [InlineData(0.635, 0.1016, 0.6115, 0, 0.84, 0.037, 0.365)]
-    public void Convert_Rgb_To_Cmyk(float r, float g, float b, float c, float m, float y, float k)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new Cmyk(c, m, y, k);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<Cmyk> actualSpan = new Cmyk[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToCmyk(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs
deleted file mode 100644
index 8b448a042..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Rgb"/>-<see cref="Hsl"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.colorhexa.com"/>
-/// <see href="http://www.rapidtables.com/convert/color/hsl-to-rgb"/>
-/// </remarks>
-public class RgbAndHslConversionTest
-{
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsl"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 1, 1, 1, 1, 1)]
-    [InlineData(360, 1, 1, 1, 1, 1)]
-    [InlineData(0, 1, .5F, 1, 0, 0)]
-    [InlineData(120, 1, .5F, 0, 1, 0)]
-    [InlineData(240, 1, .5F, 0, 0, 1)]
-    public void Convert_Hsl_To_Rgb(float h, float s, float l, float r, float g, float b)
-    {
-        // Arrange
-        var input = new Hsl(h, s, l);
-        var expected = new Rgb(r, g, b);
-
-        Span<Hsl> inputSpan = new Hsl[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToRgb(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="Hsl"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 1, 1, 0, 0, 1)]
-    [InlineData(1, 0, 0, 0, 1, .5F)]
-    [InlineData(0, 1, 0, 120, 1, .5F)]
-    [InlineData(0, 0, 1, 240, 1, .5F)]
-    [InlineData(0.7, 0.8, 0.6, 90, 0.3333, 0.7F)]
-    public void Convert_Rgb_To_Hsl(float r, float g, float b, float h, float s, float l)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new Hsl(h, s, l);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<Hsl> actualSpan = new Hsl[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToHsl(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs
deleted file mode 100644
index d80aa6c32..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Rgb"/>-<see cref="Hsv"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated using:
-/// <see href="http://www.colorhexa.com"/>
-/// </remarks>
-public class RgbAndHsvConversionTest
-{
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="Hsv"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(0, 0, 1, 1, 1, 1)]
-    [InlineData(360, 1, 1, 1, 0, 0)]
-    [InlineData(0, 1, 1, 1, 0, 0)]
-    [InlineData(120, 1, 1, 0, 1, 0)]
-    [InlineData(240, 1, 1, 0, 0, 1)]
-    public void Convert_Hsv_To_Rgb(float h, float s, float v, float r, float g, float b)
-    {
-        // Arrange
-        var input = new Hsv(h, s, v);
-        var expected = new Rgb(r, g, b);
-
-        Span<Hsv> inputSpan = new Hsv[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToRgb(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="Hsv"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 0, 0)]
-    [InlineData(1, 1, 1, 0, 0, 1)]
-    [InlineData(1, 0, 0, 0, 1, 1)]
-    [InlineData(0, 1, 0, 120, 1, 1)]
-    [InlineData(0, 0, 1, 240, 1, 1)]
-    public void Convert_Rgb_To_Hsv(float r, float g, float b, float h, float s, float v)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new Hsv(h, s, v);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<Hsv> actualSpan = new Hsv[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToHsv(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs
deleted file mode 100644
index eb4eb0bbf..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-/// <summary>
-/// Tests <see cref="Rgb"/>-<see cref="YCbCr"/> conversions.
-/// </summary>
-/// <remarks>
-/// Test data generated mathematically
-/// </remarks>
-public class RgbAndYCbCrConversionTest
-{
-    private static readonly ColorSpaceConverter Converter = new ColorSpaceConverter();
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.001F);
-
-    /// <summary>
-    /// Tests conversion from <see cref="YCbCr"/> to <see cref="Rgb"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(255, 128, 128, 1, 1, 1)]
-    [InlineData(0, 128, 128, 0, 0, 0)]
-    [InlineData(128, 128, 128, 0.502, 0.502, 0.502)]
-    public void Convert_YCbCr_To_Rgb(float y, float cb, float cr, float r, float g, float b)
-    {
-        // Arrange
-        var input = new YCbCr(y, cb, cr);
-        var expected = new Rgb(r, g, b);
-
-        Span<YCbCr> inputSpan = new YCbCr[5];
-        inputSpan.Fill(input);
-
-        Span<Rgb> actualSpan = new Rgb[5];
-
-        // Act
-        var actual = Converter.ToRgb(input);
-        Converter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(Rgb.DefaultWorkingSpace, actual.WorkingSpace, ColorSpaceComparer);
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-
-    /// <summary>
-    /// Tests conversion from <see cref="Rgb"/> to <see cref="YCbCr"/>.
-    /// </summary>
-    [Theory]
-    [InlineData(0, 0, 0, 0, 128, 128)]
-    [InlineData(1, 1, 1, 255, 128, 128)]
-    [InlineData(0.5, 0.5, 0.5, 127.5, 128, 128)]
-    [InlineData(1, 0, 0, 76.245, 84.972, 255)]
-    public void Convert_Rgb_To_YCbCr(float r, float g, float b, float y, float cb, float cr)
-    {
-        // Arrange
-        var input = new Rgb(r, g, b);
-        var expected = new YCbCr(y, cb, cr);
-
-        Span<Rgb> inputSpan = new Rgb[5];
-        inputSpan.Fill(input);
-
-        Span<YCbCr> actualSpan = new YCbCr[5];
-
-        // Act
-        var actual = ColorSpaceConverter.ToYCbCr(input);
-        ColorSpaceConverter.Convert(inputSpan, actualSpan);
-
-        // Assert
-        Assert.Equal(expected, actual, ColorSpaceComparer);
-
-        for (int i = 0; i < actualSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/VonKriesChromaticAdaptationTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/VonKriesChromaticAdaptationTests.cs
deleted file mode 100644
index 9e33ad168..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/Conversion/VonKriesChromaticAdaptationTests.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
-
-public class VonKriesChromaticAdaptationTests
-{
-    private static readonly ApproximateColorSpaceComparer ColorSpaceComparer = new ApproximateColorSpaceComparer(.0001F);
-    public static readonly TheoryData<CieXyz, CieXyz> WhitePoints = new TheoryData<CieXyz, CieXyz>
-    {
-        { CieLuv.DefaultWhitePoint, CieLab.DefaultWhitePoint },
-        { CieLuv.DefaultWhitePoint, CieLuv.DefaultWhitePoint }
-    };
-
-    [Theory]
-    [MemberData(nameof(WhitePoints))]
-    public void SingleAndBulkTransformYieldIdenticalResults(CieXyz sourceWhitePoint, CieXyz destinationWhitePoint)
-    {
-        var adaptation = new VonKriesChromaticAdaptation();
-        var input = new CieXyz(1, 0, 1);
-        CieXyz expected = adaptation.Transform(input, sourceWhitePoint, destinationWhitePoint);
-
-        Span<CieXyz> inputSpan = new CieXyz[5];
-        inputSpan.Fill(input);
-
-        Span<CieXyz> actualSpan = new CieXyz[5];
-
-        adaptation.Transform(inputSpan, actualSpan, sourceWhitePoint, destinationWhitePoint);
-
-        for (int i = 0; i < inputSpan.Length; i++)
-        {
-            Assert.Equal(expected, actualSpan[i], ColorSpaceComparer);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/HslTests.cs b/tests/ImageSharp.Tests/Colorspaces/HslTests.cs
deleted file mode 100644
index a8702488a..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/HslTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="Hsl"/> struct.
-/// </summary>
-public class HslTests
-{
-    [Fact]
-    public void HslConstructorAssignsFields()
-    {
-        const float h = 275F;
-        const float s = .64F;
-        const float l = .87F;
-        var hsl = new Hsl(h, s, l);
-
-        Assert.Equal(h, hsl.H);
-        Assert.Equal(s, hsl.S);
-        Assert.Equal(l, hsl.L);
-    }
-
-    [Fact]
-    public void HslEquality()
-    {
-        var x = default(Hsl);
-        var y = new Hsl(Vector3.One);
-
-        Assert.True(default(Hsl) == default(Hsl));
-        Assert.False(default(Hsl) != default(Hsl));
-        Assert.Equal(default(Hsl), default(Hsl));
-        Assert.Equal(new Hsl(1, 0, 1), new Hsl(1, 0, 1));
-        Assert.Equal(new Hsl(Vector3.One), new Hsl(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/HsvTests.cs b/tests/ImageSharp.Tests/Colorspaces/HsvTests.cs
deleted file mode 100644
index caedd3f17..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/HsvTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="Hsv"/> struct.
-/// </summary>
-public class HsvTests
-{
-    [Fact]
-    public void HsvConstructorAssignsFields()
-    {
-        const float h = 275F;
-        const float s = .64F;
-        const float v = .87F;
-        var hsv = new Hsv(h, s, v);
-
-        Assert.Equal(h, hsv.H);
-        Assert.Equal(s, hsv.S);
-        Assert.Equal(v, hsv.V);
-    }
-
-    [Fact]
-    public void HsvEquality()
-    {
-        var x = default(Hsv);
-        var y = new Hsv(Vector3.One);
-
-        Assert.True(default(Hsv) == default(Hsv));
-        Assert.False(default(Hsv) != default(Hsv));
-        Assert.Equal(default(Hsv), default(Hsv));
-        Assert.Equal(new Hsv(1, 0, 1), new Hsv(1, 0, 1));
-        Assert.Equal(new Hsv(Vector3.One), new Hsv(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/HunterLabTests.cs b/tests/ImageSharp.Tests/Colorspaces/HunterLabTests.cs
deleted file mode 100644
index 9c97c4c91..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/HunterLabTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="HunterLab"/> struct.
-/// </summary>
-public class HunterLabTests
-{
-    [Fact]
-    public void HunterLabConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float a = -64F;
-        const float b = 87F;
-        var hunterLab = new HunterLab(l, a, b);
-
-        Assert.Equal(l, hunterLab.L);
-        Assert.Equal(a, hunterLab.A);
-        Assert.Equal(b, hunterLab.B);
-    }
-
-    [Fact]
-    public void HunterLabEquality()
-    {
-        var x = default(HunterLab);
-        var y = new HunterLab(Vector3.One);
-
-        Assert.True(default(HunterLab) == default(HunterLab));
-        Assert.True(new HunterLab(1, 0, 1) != default(HunterLab));
-        Assert.False(new HunterLab(1, 0, 1) == default(HunterLab));
-        Assert.Equal(default(HunterLab), default(HunterLab));
-        Assert.Equal(new HunterLab(1, 0, 1), new HunterLab(1, 0, 1));
-        Assert.Equal(new HunterLab(Vector3.One), new HunterLab(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/LinearRgbTests.cs b/tests/ImageSharp.Tests/Colorspaces/LinearRgbTests.cs
deleted file mode 100644
index ff2d15134..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/LinearRgbTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="LinearRgb"/> struct.
-/// </summary>
-public class LinearRgbTests
-{
-    [Fact]
-    public void LinearRgbConstructorAssignsFields()
-    {
-        const float r = .75F;
-        const float g = .64F;
-        const float b = .87F;
-        var rgb = new LinearRgb(r, g, b);
-
-        Assert.Equal(r, rgb.R);
-        Assert.Equal(g, rgb.G);
-        Assert.Equal(b, rgb.B);
-    }
-
-    [Fact]
-    public void LinearRgbEquality()
-    {
-        var x = default(LinearRgb);
-        var y = new LinearRgb(Vector3.One);
-
-        Assert.True(default(LinearRgb) == default(LinearRgb));
-        Assert.False(default(LinearRgb) != default(LinearRgb));
-        Assert.Equal(default(LinearRgb), default(LinearRgb));
-        Assert.Equal(new LinearRgb(1, 0, 1), new LinearRgb(1, 0, 1));
-        Assert.Equal(new LinearRgb(Vector3.One), new LinearRgb(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/LmsTests.cs b/tests/ImageSharp.Tests/Colorspaces/LmsTests.cs
deleted file mode 100644
index 5e8840664..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/LmsTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="Lms"/> struct.
-/// </summary>
-public class LmsTests
-{
-    [Fact]
-    public void LmsConstructorAssignsFields()
-    {
-        const float l = 75F;
-        const float m = -64F;
-        const float s = 87F;
-        var lms = new Lms(l, m, s);
-
-        Assert.Equal(l, lms.L);
-        Assert.Equal(m, lms.M);
-        Assert.Equal(s, lms.S);
-    }
-
-    [Fact]
-    public void LmsEquality()
-    {
-        var x = default(Lms);
-        var y = new Lms(Vector3.One);
-
-        Assert.True(default(Lms) == default(Lms));
-        Assert.True(new Lms(1, 0, 1) != default(Lms));
-        Assert.False(new Lms(1, 0, 1) == default(Lms));
-        Assert.Equal(default(Lms), default(Lms));
-        Assert.Equal(new Lms(1, 0, 1), new Lms(1, 0, 1));
-        Assert.Equal(new Lms(Vector3.One), new Lms(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbTests.cs b/tests/ImageSharp.Tests/Colorspaces/RgbTests.cs
deleted file mode 100644
index be96b79f4..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/RgbTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="Rgb"/> struct.
-/// </summary>
-public class RgbTests
-{
-    [Fact]
-    public void RgbConstructorAssignsFields()
-    {
-        const float r = .75F;
-        const float g = .64F;
-        const float b = .87F;
-        var rgb = new Rgb(r, g, b);
-
-        Assert.Equal(r, rgb.R);
-        Assert.Equal(g, rgb.G);
-        Assert.Equal(b, rgb.B);
-    }
-
-    [Fact]
-    public void RgbEquality()
-    {
-        var x = default(Rgb);
-        var y = new Rgb(Vector3.One);
-
-        Assert.True(default(Rgb) == default(Rgb));
-        Assert.False(default(Rgb) != default(Rgb));
-        Assert.Equal(default(Rgb), default(Rgb));
-        Assert.Equal(new Rgb(1, 0, 1), new Rgb(1, 0, 1));
-        Assert.Equal(new Rgb(Vector3.One), new Rgb(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-
-    [Fact]
-    public void RgbAndRgb24Operators()
-    {
-        const byte r = 64;
-        const byte g = 128;
-        const byte b = 255;
-
-        Rgb24 rgb24 = new Rgb(r / 255F, g / 255F, b / 255F);
-        Rgb rgb2 = rgb24;
-
-        Assert.Equal(r, rgb24.R);
-        Assert.Equal(g, rgb24.G);
-        Assert.Equal(b, rgb24.B);
-
-        Assert.Equal(r / 255F, rgb2.R);
-        Assert.Equal(g / 255F, rgb2.G);
-        Assert.Equal(b / 255F, rgb2.B);
-    }
-
-    [Fact]
-    public void RgbAndRgba32Operators()
-    {
-        const byte r = 64;
-        const byte g = 128;
-        const byte b = 255;
-
-        Rgba32 rgba32 = new Rgb(r / 255F, g / 255F, b / 255F);
-        Rgb rgb2 = rgba32;
-
-        Assert.Equal(r, rgba32.R);
-        Assert.Equal(g, rgba32.G);
-        Assert.Equal(b, rgba32.B);
-
-        Assert.Equal(r / 255F, rgb2.R);
-        Assert.Equal(g / 255F, rgb2.G);
-        Assert.Equal(b / 255F, rgb2.B);
-    }
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/StringRepresentationTests.cs b/tests/ImageSharp.Tests/Colorspaces/StringRepresentationTests.cs
deleted file mode 100644
index 2ae0824f2..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/StringRepresentationTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-using SixLabors.ImageSharp.ColorSpaces.Conversion;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-public class StringRepresentationTests
-{
-    private static readonly Vector3 One = new Vector3(1);
-    private static readonly Vector3 Zero = new Vector3(0);
-    private static readonly Vector3 Random = new Vector3(42.4F, 94.5F, 83.4F);
-
-    public static readonly TheoryData<object, string> TestData = new TheoryData<object, string>
-    {
-        { new CieLab(Zero), "CieLab(0, 0, 0)" },
-        { new CieLch(Zero), "CieLch(0, 0, 0)" },
-        { new CieLchuv(Zero), "CieLchuv(0, 0, 0)" },
-        { new CieLuv(Zero), "CieLuv(0, 0, 0)" },
-        { new CieXyz(Zero), "CieXyz(0, 0, 0)" },
-        { new CieXyy(Zero), "CieXyy(0, 0, 0)" },
-        { new HunterLab(Zero), "HunterLab(0, 0, 0)" },
-        { new Lms(Zero), "Lms(0, 0, 0)" },
-        { new LinearRgb(Zero), "LinearRgb(0, 0, 0)" },
-        { new Rgb(Zero), "Rgb(0, 0, 0)" },
-        { new Hsl(Zero), "Hsl(0, 0, 0)" },
-        { new Hsv(Zero), "Hsv(0, 0, 0)" },
-        { new YCbCr(Zero), "YCbCr(0, 0, 0)" },
-        { new CieLab(One), "CieLab(1, 1, 1)" },
-        { new CieLch(One), "CieLch(1, 1, 1)" },
-        { new CieLchuv(One), "CieLchuv(1, 1, 1)" },
-        { new CieLuv(One), "CieLuv(1, 1, 1)" },
-        { new CieXyz(One), "CieXyz(1, 1, 1)" },
-        { new CieXyy(One), "CieXyy(1, 1, 1)" },
-        { new HunterLab(One), "HunterLab(1, 1, 1)" },
-        { new Lms(One), "Lms(1, 1, 1)" },
-        { new LinearRgb(One), "LinearRgb(1, 1, 1)" },
-        { new Rgb(One), "Rgb(1, 1, 1)" },
-        { new Hsl(One), "Hsl(1, 1, 1)" },
-        { new Hsv(One), "Hsv(1, 1, 1)" },
-        { new YCbCr(One), "YCbCr(1, 1, 1)" },
-        { new CieXyChromaticityCoordinates(1, 1), "CieXyChromaticityCoordinates(1, 1)" },
-        { new CieLab(Random), "CieLab(42.4, 94.5, 83.4)" },
-        { new CieLch(Random), "CieLch(42.4, 94.5, 83.4)" },
-        { new CieLchuv(Random), "CieLchuv(42.4, 94.5, 83.4)" },
-        { new CieLuv(Random), "CieLuv(42.4, 94.5, 83.4)" },
-        { new CieXyz(Random), "CieXyz(42.4, 94.5, 83.4)" },
-        { new CieXyy(Random), "CieXyy(42.4, 94.5, 83.4)" },
-        { new HunterLab(Random), "HunterLab(42.4, 94.5, 83.4)" },
-        { new Lms(Random), "Lms(42.4, 94.5, 83.4)" },
-        { new LinearRgb(Random), "LinearRgb(1, 1, 1)" },  // clamping to 1 is expected
-        { new Rgb(Random), "Rgb(1, 1, 1)" },              // clamping to 1 is expected
-        { new Hsl(Random), "Hsl(42.4, 1, 1)" },           // clamping to 1 is expected
-        { new Hsv(Random), "Hsv(42.4, 1, 1)" },           // clamping to 1 is expected
-        { new YCbCr(Random), "YCbCr(42.4, 94.5, 83.4)" },
-    };
-
-    [Theory]
-    [MemberData(nameof(TestData))]
-    public void StringRepresentationsAreCorrect(object color, string text) => Assert.Equal(text, color.ToString());
-}
diff --git a/tests/ImageSharp.Tests/Colorspaces/YCbCrTests.cs b/tests/ImageSharp.Tests/Colorspaces/YCbCrTests.cs
deleted file mode 100644
index efab45c3c..000000000
--- a/tests/ImageSharp.Tests/Colorspaces/YCbCrTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors.
-// Licensed under the Six Labors Split License.
-
-using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
-
-namespace SixLabors.ImageSharp.Tests.Colorspaces;
-
-/// <summary>
-/// Tests the <see cref="YCbCr"/> struct.
-/// </summary>
-public class YCbCrTests
-{
-    [Fact]
-    public void YCbCrConstructorAssignsFields()
-    {
-        const float y = 75F;
-        const float cb = 64F;
-        const float cr = 87F;
-        var yCbCr = new YCbCr(y, cb, cr);
-
-        Assert.Equal(y, yCbCr.Y);
-        Assert.Equal(cb, yCbCr.Cb);
-        Assert.Equal(cr, yCbCr.Cr);
-    }
-
-    [Fact]
-    public void YCbCrEquality()
-    {
-        var x = default(YCbCr);
-        var y = new YCbCr(Vector3.One);
-
-        Assert.True(default(YCbCr) == default(YCbCr));
-        Assert.False(default(YCbCr) != default(YCbCr));
-        Assert.Equal(default(YCbCr), default(YCbCr));
-        Assert.Equal(new YCbCr(1, 0, 1), new YCbCr(1, 0, 1));
-        Assert.Equal(new YCbCr(Vector3.One), new YCbCr(Vector3.One));
-        Assert.False(x.Equals(y));
-        Assert.False(x.Equals((object)y));
-        Assert.False(x.GetHashCode().Equals(y.GetHashCode()));
-    }
-}