diff --git a/src/ImageSharp/Colors/ColorspaceTransforms.cs b/src/ImageSharp/Colors/ColorspaceTransforms.cs
index 0c70dd98b1..7315b9e9d2 100644
--- a/src/ImageSharp/Colors/ColorspaceTransforms.cs
+++ b/src/ImageSharp/Colors/ColorspaceTransforms.cs
@@ -7,6 +7,7 @@ namespace ImageSharp
 {
     using System;
     using System.Numerics;
+    using Colors.Spaces;
 
     /// <summary>
     /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
diff --git a/src/ImageSharp/Colors/Colorspaces/Bgra32.cs b/src/ImageSharp/Colors/Spaces/Bgra32.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/Bgra32.cs
rename to src/ImageSharp/Colors/Spaces/Bgra32.cs
index ff9203b03a..e590b9e388 100644
--- a/src/ImageSharp/Colors/Colorspaces/Bgra32.cs
+++ b/src/ImageSharp/Colors/Spaces/Bgra32.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/CieLab.cs b/src/ImageSharp/Colors/Spaces/CieLab.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/CieLab.cs
rename to src/ImageSharp/Colors/Spaces/CieLab.cs
index e3300f3b87..78aa0dc70d 100644
--- a/src/ImageSharp/Colors/Colorspaces/CieLab.cs
+++ b/src/ImageSharp/Colors/Spaces/CieLab.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/CieXyz.cs b/src/ImageSharp/Colors/Spaces/CieXyz.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/CieXyz.cs
rename to src/ImageSharp/Colors/Spaces/CieXyz.cs
index 16d5cb8275..3a8704171d 100644
--- a/src/ImageSharp/Colors/Colorspaces/CieXyz.cs
+++ b/src/ImageSharp/Colors/Spaces/CieXyz.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/Cmyk.cs b/src/ImageSharp/Colors/Spaces/Cmyk.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/Cmyk.cs
rename to src/ImageSharp/Colors/Spaces/Cmyk.cs
index 15bea263cc..9e0f10898b 100644
--- a/src/ImageSharp/Colors/Colorspaces/Cmyk.cs
+++ b/src/ImageSharp/Colors/Spaces/Cmyk.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/Hsl.cs b/src/ImageSharp/Colors/Spaces/Hsl.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/Hsl.cs
rename to src/ImageSharp/Colors/Spaces/Hsl.cs
index 1cc54ec8c3..8c1d293021 100644
--- a/src/ImageSharp/Colors/Colorspaces/Hsl.cs
+++ b/src/ImageSharp/Colors/Spaces/Hsl.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/Hsv.cs b/src/ImageSharp/Colors/Spaces/Hsv.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/Hsv.cs
rename to src/ImageSharp/Colors/Spaces/Hsv.cs
index b55e07e6bd..eebf034ce9 100644
--- a/src/ImageSharp/Colors/Colorspaces/Hsv.cs
+++ b/src/ImageSharp/Colors/Spaces/Hsv.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/src/ImageSharp/Colors/Colorspaces/IAlmostEquatable.cs b/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
similarity index 97%
rename from src/ImageSharp/Colors/Colorspaces/IAlmostEquatable.cs
rename to src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
index 1163657edb..a2183d396c 100644
--- a/src/ImageSharp/Colors/Colorspaces/IAlmostEquatable.cs
+++ b/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
 
diff --git a/src/ImageSharp/Colors/Colorspaces/YCbCr.cs b/src/ImageSharp/Colors/Spaces/YCbCr.cs
similarity index 99%
rename from src/ImageSharp/Colors/Colorspaces/YCbCr.cs
rename to src/ImageSharp/Colors/Spaces/YCbCr.cs
index c9a0872c51..8d94ebccaf 100644
--- a/src/ImageSharp/Colors/Colorspaces/YCbCr.cs
+++ b/src/ImageSharp/Colors/Spaces/YCbCr.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.Colors.Spaces
 {
     using System;
     using System.ComponentModel;
diff --git a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
index f1b6d5f9b5..4884557522 100644
--- a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
@@ -7,7 +7,7 @@ namespace ImageSharp.Tests
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
-
+    using ImageSharp.Colors.Spaces;
     using Xunit;
 
     /// <summary>