diff --git a/src/ImageSharp/ColorSpaces/ICompanding.cs b/src/ImageSharp/ColorSpaces/Conversion/ICompanding.cs
similarity index 92%
rename from src/ImageSharp/ColorSpaces/ICompanding.cs
rename to src/ImageSharp/ColorSpaces/Conversion/ICompanding.cs
index 8d81501b7..55a7569ff 100644
--- a/src/ImageSharp/ColorSpaces/ICompanding.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ICompanding.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
-
-namespace SixLabors.ImageSharp.ColorSpaces
+namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation
 {
     /// <summary>
     /// Pair of companding functions for <see cref="RgbWorkingSpace"/>.
diff --git a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
index 466c1dca1..1e629b455 100644
--- a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
@@ -1,15 +1,10 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.ColorSpaces;
 using Xunit;
 
-// ReSharper disable InconsistentNaming
-// TODO: This needs to be refactored so that it uses a serializable type once the colorspace code is public
 namespace SixLabors.ImageSharp.Tests.Colorspaces
 {
     /// <summary>
diff --git a/tests/ImageSharp.Tests/Colorspaces/ApproximateColorspaceComparer.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs
similarity index 99%
rename from tests/ImageSharp.Tests/Colorspaces/ApproximateColorspaceComparer.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs
index 88aa572ee..169a907b1 100644
--- a/tests/ImageSharp.Tests/Colorspaces/ApproximateColorspaceComparer.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/ApproximateColorspaceComparer.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Allows the approximate comparison of colorspace component values.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs
index de63a3dbf..d3d759825 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieLabAndCieLchConversionTests.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLabAndCieLchConversionTests.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieLab"/>-<see cref="CieLch"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieLchuvConversionTests.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieLchuvConversionTests.cs
index cb8334087..be510f95d 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieLuvAndCieLchuvConversionTests.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieLuvAndCieLchuvConversionTests.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieLuv"/>-<see cref="CieLchuv"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs
index 763c60770..66f7e75ad 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLabConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLabConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="CieLab"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs
index df80db2d2..a6a7ee7ae 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieLuvConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieLuvConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="CieLuv"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs
similarity index 97%
rename from tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs
index 2686a8228..3f5ea4cfd 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndCieXyyConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndCieXyyConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="CieXyy"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs
index 6e547e9e4..225177792 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndHunterLabConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndHunterLabConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="HunterLab"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs
index eb7e8fa86..6b128eff8 100644
--- a/tests/ImageSharp.Tests/Colorspaces/CieXyzAndLmsConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CieXyzAndLmsConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="Lms"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs
index aa7325a51..f5dc6f611 100644
--- a/tests/ImageSharp.Tests/Colorspaces/ColorConverterAdaptTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/ColorConverterAdaptTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="M:ColorSpaceConverter.Adapt" /> methods.
diff --git a/tests/ImageSharp.Tests/Colorspaces/Conversion/CompandingTests.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/CompandingTests.cs
new file mode 100644
index 000000000..adf0263a0
--- /dev/null
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/CompandingTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
+{
+    /// <summary>
+    /// Tests various companding algorithms. Numbers are hand calculated from formulas online.
+    /// TODO: Oddly the formula for converting to/from Rec 2020 and 709 from Wikipedia seems to cause the value to 
+    /// fail a round trip. They're large spaces so this is a surprise. More reading required!!
+    /// </summary>
+    public class CompandingTests
+    {
+        private static readonly ApproximateFloatComparer FloatComparer = new ApproximateFloatComparer(.00001F);
+
+        [Fact]
+        public void Rec2020CompandingIsCorrect()
+        {
+            CompandingIsCorrectImpl(new Rec2020Companding(), .667F, .4484759F, .3937096F);
+        }
+
+        [Fact]
+        public void Rec709CompandingIsCorrect()
+        {
+            CompandingIsCorrectImpl(new Rec709Companding(), .667F, .4483577F, .3937451F);
+        }
+
+        [Fact]
+        public void SRgbCompandingIsCorrect()
+        {
+            CompandingIsCorrectImpl(new SRgbCompanding(), .667F, .40242353F, .667F);
+        }
+
+        [Fact]
+        public void GammaCompandingIsCorrect()
+        {
+            CompandingIsCorrectImpl(new GammaCompanding(2.2F), .667F, .41027668F, .667F);
+        }
+
+        [Fact]
+        public void LCompandingIsCorrect()
+        {
+            CompandingIsCorrectImpl(new LCompanding(), .667F, .36236193F, .58908917F);
+        }
+
+        private static void CompandingIsCorrectImpl(ICompanding companding, float input, float expanded, float compressed)
+        {
+            float e = companding.Expand(input);
+            float c = companding.Compress(e);
+
+            Assert.Equal(expanded, e, FloatComparer);
+            Assert.Equal(compressed, c, FloatComparer);
+        }
+    }
+}
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs
similarity index 99%
rename from tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs
index 92ab75a8a..ea1d0db00 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCieXyzConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCieXyzConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="CieXyz"/>-<see cref="CieLab"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs
index a8a9a0567..2b03ee988 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndCmykConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndCmykConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="Rgb"/>-<see cref="Cmyk"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs
index ba7aab5ea..22f5c6d51 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHslConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHslConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="Rgb"/>-<see cref="Hsl"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs
similarity index 98%
rename from tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs
index 89829e9d9..e84ce9723 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndHsvConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndHsvConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="Rgb"/>-<see cref="Hsv"/> conversions.
diff --git a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs
similarity index 97%
rename from tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs
rename to tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs
index 2e66dd7b0..f5c7dbae6 100644
--- a/tests/ImageSharp.Tests/Colorspaces/RgbAndYCbCrConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/Conversion/RgbAndYCbCrConversionTest.cs
@@ -6,7 +6,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Colorspaces
+namespace SixLabors.ImageSharp.Tests.Colorspaces.Conversion
 {
     /// <summary>
     /// Tests <see cref="Rgb"/>-<see cref="YCbCr"/> conversions.
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index 7c2eb8238..75dc0081e 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder.ColorConverters;
-using SixLabors.ImageSharp.Tests.Colorspaces;
+using SixLabors.ImageSharp.Tests.Colorspaces.Conversion;
 using SixLabors.Memory;
 
 using Xunit;