diff --git a/ImageSharp.sln.DotSettings b/ImageSharp.sln.DotSettings
index 435aad73b..432f4524a 100644
--- a/ImageSharp.sln.DotSettings
+++ b/ImageSharp.sln.DotSettings
@@ -343,8 +343,11 @@
     <Entry DisplayName="All other members" />
   </TypePattern>
 &lt;/Patterns&gt;</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">// Copyright (c) Six Labors and contributors.&#xD;
+// Licensed under the Apache License, Version 2.0.&#xD;
+</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AC/@EntryIndexedValue">AC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DC/@EntryIndexedValue">DC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DCT/@EntryIndexedValue">DCT</s:String>
diff --git a/appveyor.yml b/appveyor.yml
index 3e6b79bfc..5d84e6cea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 version: 1.0.0.{build}
-image: Visual Studio 2017
+image: Previous Visual Studio 2017
 
 # prevent the double build when a branch has an active PR
 skip_branch_with_pr: true
diff --git a/build.ps1 b/build.ps1
index 4c5a36cae..35b8344dc 100644
--- a/build.ps1
+++ b/build.ps1
@@ -8,7 +8,7 @@ $tagRegex = '^v?(\d+\.\d+\.\d+)(-([a-zA-Z]+)\.?(\d*))?$'
 # we are running on the build server 
 $isVersionTag = $env:APPVEYOR_REPO_TAG_NAME -match $tagRegex
 
- if($isVersionTag){
+ if($isVersionTag) {
      
     Write-Debug "Building commit tagged with a compatable version number"
     
@@ -26,7 +26,8 @@ $isVersionTag = $env:APPVEYOR_REPO_TAG_NAME -match $tagRegex
 
         $version = "${version}${padded}"
      }
- }else {
+ }
+ else {
      
     Write-Debug "Untagged"
     $lastTag =  (git tag --list  --sort=-taggerdate)  | Out-String
diff --git a/src/ImageSharp.Drawing/Primitives/ShapePath.cs b/src/ImageSharp.Drawing/Primitives/ShapePath.cs
index 7a8c9e895..a4fef66a6 100644
--- a/src/ImageSharp.Drawing/Primitives/ShapePath.cs
+++ b/src/ImageSharp.Drawing/Primitives/ShapePath.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Shapes;
 
 namespace SixLabors.ImageSharp.Primitives
diff --git a/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs b/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs
index 9f5611dc0..fddd283e0 100644
--- a/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs
+++ b/src/ImageSharp.Drawing/Primitives/ShapeRegion.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
@@ -45,7 +46,7 @@ namespace SixLabors.ImageSharp.Primitives
             var start = new PointF(this.Bounds.Left - 1, y);
             var end = new PointF(this.Bounds.Right + 1, y);
 
-            using (IBuffer<PointF> tempBuffer = configuration.MemoryAllocator.Allocate<PointF>(buffer.Length))
+            using (IMemoryOwner<PointF> tempBuffer = configuration.MemoryAllocator.Allocate<PointF>(buffer.Length))
             {
                 Span<PointF> innerBuffer = tempBuffer.GetSpan();
                 int count = this.Shape.FindIntersections(start, end, innerBuffer);
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs b/src/ImageSharp.Drawing/Processing/BrushApplicator.cs
similarity index 93%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs
rename to src/ImageSharp.Drawing/Processing/BrushApplicator.cs
index 7672681da..64f37eeab 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Processing/BrushApplicator.cs
@@ -2,11 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
+
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// primitive that converts a point in to a color for discovering the fill color based on an implementation
@@ -24,9 +26,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
         internal BrushApplicator(ImageFrame<TPixel> target, GraphicsOptions options)
         {
             this.Target = target;
-
             this.Options = options;
-
             this.Blender = PixelOperations<TPixel>.Instance.GetPixelBlender(options.BlenderMode);
         }
 
@@ -67,8 +67,8 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
         {
             MemoryAllocator memoryAllocator = this.Target.MemoryAllocator;
 
-            using (IBuffer<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
-            using (IBuffer<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
+            using (IMemoryOwner<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
+            using (IMemoryOwner<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
             {
                 Span<float> amountSpan = amountBuffer.GetSpan();
                 Span<TPixel> overlaySpan = overlay.GetSpan();
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/Brushes.cs b/src/ImageSharp.Drawing/Processing/Brushes.cs
similarity index 99%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/Brushes.cs
rename to src/ImageSharp.Drawing/Processing/Brushes.cs
index 141ca403b..c5e7a3e9f 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/Brushes.cs
+++ b/src/ImageSharp.Drawing/Processing/Brushes.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A collection of methods for creating generic brushes.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/ColorStop{TPixel}.cs b/src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs
similarity index 86%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/ColorStop{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs
index 298af5cb5..7fd0ba7cd 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/ColorStop{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs
@@ -1,8 +1,11 @@
-using System.Diagnostics;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Diagnostics;
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A struct that defines a single color stop.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawBezierExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawBezierExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawBezierExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawBezierExtensions.cs
index 72bd76fa6..782f5d4d7 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawBezierExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawBezierExtensions.cs
@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of Bezier paths to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawImageExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawImageExtensions.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawImageExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawImageExtensions.cs
index 83e1b90f5..7c9d7c280 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawImageExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawImageExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of images to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawLineExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawLineExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawLineExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawLineExtensions.cs
index 981a07e13..9084b30ef 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawLineExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawLineExtensions.cs
@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of lines to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawPathCollectionExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawPathCollectionExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawPathCollectionExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawPathCollectionExtensions.cs
index eca3805bd..0d3abf297 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawPathCollectionExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawPathCollectionExtensions.cs
@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of collections of polygon outlines to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawPathExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawPathExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawPathExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawPathExtensions.cs
index a15412a45..4dbe942f2 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawPathExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawPathExtensions.cs
@@ -3,11 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of polygon outlines to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawPolygonExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawPolygonExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawPolygonExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawPolygonExtensions.cs
index 9f8d74f00..4dcfe00aa 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawPolygonExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawPolygonExtensions.cs
@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of closed linear polygons to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/DrawRectangleExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawRectangleExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/DrawRectangleExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawRectangleExtensions.cs
index 1f4a38a27..918fb1e73 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/DrawRectangleExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawRectangleExtensions.cs
@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of rectangles to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs b/src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs
similarity index 96%
rename from src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs
index a20d7f730..46061ce9b 100644
--- a/src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs
@@ -3,17 +3,15 @@
 
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Text.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Text
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the drawing of text to the <see cref="Image{TPixel}"/> type.
     /// </summary>
-    public static partial class DrawTextExtensions
+    public static class DrawTextExtensions
     {
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/EllipticGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/EllipticGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs
index 43f7fe04e..8af01564c 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/EllipticGradientBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs
@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Gradient Brush with elliptic shape.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillPathBuilderExtensions.cs b/src/ImageSharp.Drawing/Processing/FillPathBuilderExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillPathBuilderExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillPathBuilderExtensions.cs
index 921209d2e..ff4de3ff8 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillPathBuilderExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillPathBuilderExtensions.cs
@@ -3,10 +3,9 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of polygons with various brushes to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillPathCollectionExtensions.cs b/src/ImageSharp.Drawing/Processing/FillPathCollectionExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillPathCollectionExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillPathCollectionExtensions.cs
index 71474dceb..da2dd35b6 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillPathCollectionExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillPathCollectionExtensions.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of collections of polygon outlines to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillPathExtensions.cs b/src/ImageSharp.Drawing/Processing/FillPathExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillPathExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillPathExtensions.cs
index 4273fd8be..da1062111 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillPathExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillPathExtensions.cs
@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of polygon outlines to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillPolygonExtensions.cs b/src/ImageSharp.Drawing/Processing/FillPolygonExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillPolygonExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillPolygonExtensions.cs
index 3b80dd0f4..970ca2264 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillPolygonExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillPolygonExtensions.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of closed linear polygons to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillRectangleExtensions.cs b/src/ImageSharp.Drawing/Processing/FillRectangleExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillRectangleExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillRectangleExtensions.cs
index ae0afc5d5..26bf214f7 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillRectangleExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillRectangleExtensions.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of rectangles to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/FillRegionExtensions.cs b/src/ImageSharp.Drawing/Processing/FillRegionExtensions.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/FillRegionExtensions.cs
rename to src/ImageSharp.Drawing/Processing/FillRegionExtensions.cs
index 997dba22e..e566d0323 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/FillRegionExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/FillRegionExtensions.cs
@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 
-namespace SixLabors.ImageSharp.Processing.Drawing
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the filling of regions with various brushes to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientBrushBase{TPixel}.cs b/src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientBrushBase{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs
index 061023428..fe997ed7f 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientBrushBase{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs
@@ -1,11 +1,14 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.PixelFormats.PixelBlenders;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Base class for Gradient brushes
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientRepetitionMode.cs b/src/ImageSharp.Drawing/Processing/GradientRepetitionMode.cs
similarity index 89%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientRepetitionMode.cs
rename to src/ImageSharp.Drawing/Processing/GradientRepetitionMode.cs
index adbc26ed4..c156153be 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientRepetitionMode.cs
+++ b/src/ImageSharp.Drawing/Processing/GradientRepetitionMode.cs
@@ -1,4 +1,7 @@
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Modes to repeat a gradient.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/IBrush.cs b/src/ImageSharp.Drawing/Processing/IBrush.cs
similarity index 96%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/IBrush.cs
rename to src/ImageSharp.Drawing/Processing/IBrush.cs
index 93ecb7788..a3c94a1b5 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/IBrush.cs
+++ b/src/ImageSharp.Drawing/Processing/IBrush.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Brush represents a logical configuration of a brush which can be used to source pixel colors
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Pens/IPen.cs b/src/ImageSharp.Drawing/Processing/IPen.cs
similarity index 89%
rename from src/ImageSharp.Drawing/Processing/Drawing/Pens/IPen.cs
rename to src/ImageSharp.Drawing/Processing/IPen.cs
index 387165e20..6f63dcfd0 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Pens/IPen.cs
+++ b/src/ImageSharp.Drawing/Processing/IPen.cs
@@ -3,9 +3,8 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Interface representing a Pen
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
similarity index 94%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
index 779848856..5ebad0f32 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
@@ -2,12 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of an image brush for painting images within areas.
@@ -118,8 +119,8 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
             internal override void Apply(Span<float> scanline, int x, int y)
             {
                 // Create a span for colors
-                using (IBuffer<float> amountBuffer = this.Target.MemoryAllocator.Allocate<float>(scanline.Length))
-                using (IBuffer<TPixel> overlay = this.Target.MemoryAllocator.Allocate<TPixel>(scanline.Length))
+                using (IMemoryOwner<float> amountBuffer = this.Target.MemoryAllocator.Allocate<float>(scanline.Length))
+                using (IMemoryOwner<TPixel> overlay = this.Target.MemoryAllocator.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.GetSpan();
                     Span<TPixel> overlaySpan = overlay.GetSpan();
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/LinearGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/LinearGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs
index 09f816dd9..765bf5499 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/LinearGradientBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs
@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a brush for painting linear gradients within areas.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
similarity index 95%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
index 21f2066fb..ab48a185b 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
@@ -9,7 +10,7 @@ using SixLabors.ImageSharp.Primitives;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a pattern brush for painting patterns.
@@ -153,8 +154,8 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
                 int patternY = y % this.pattern.Rows;
                 MemoryAllocator memoryAllocator = this.Target.MemoryAllocator;
 
-                using (IBuffer<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
-                using (IBuffer<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
+                using (IMemoryOwner<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
+                using (IMemoryOwner<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.GetSpan();
                     Span<TPixel> overlaySpan = overlay.GetSpan();
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Pens/Pens.cs b/src/ImageSharp.Drawing/Processing/Pens.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/Pens/Pens.cs
rename to src/ImageSharp.Drawing/Processing/Pens.cs
index b1883e322..90253a3cb 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Pens/Pens.cs
+++ b/src/ImageSharp.Drawing/Processing/Pens.cs
@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains a collection of common Pen styles
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Pens/Pen{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs
similarity index 84%
rename from src/ImageSharp.Drawing/Processing/Drawing/Pens/Pen{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs
index 1dd6b6616..26c21a0e5 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Pens/Pen{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs
@@ -3,9 +3,8 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Pens
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides a pen that can apply a pattern to a line with a set brush and thickness
@@ -25,7 +24,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         private readonly float[] pattern;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -36,7 +35,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
@@ -49,7 +48,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -59,7 +58,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Drawing.Pens.Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
index 506df3886..4a59dfe3e 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Combines two images together by blending the pixels.
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Processors
 
             MemoryAllocator memoryAllocator = this.Image.GetConfiguration().MemoryAllocator;
 
-            using (IBuffer<float> amount = memoryAllocator.Allocate<float>(width))
+            using (IMemoryOwner<float> amount = memoryAllocator.Allocate<float>(width))
             {
                 amount.GetSpan().Fill(this.Opacity);
 
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
similarity index 93%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
index 4214041a7..e40ba5316 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
@@ -2,15 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Using the brush as a source of pixels colors blends the brush color with source.
@@ -77,7 +76,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Processors
                     startY = 0;
                 }
 
-                using (IBuffer<float> amount = source.MemoryAllocator.Allocate<float>(width))
+                using (IMemoryOwner<float> amount = source.MemoryAllocator.Allocate<float>(width))
                 using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(
                     source,
                     sourceRectangle,
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
similarity index 95%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
index 1e968b97e..b9db3f067 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
@@ -2,15 +2,15 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
+
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Utils;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Using a brush and a shape fills shape with contents of brush the
@@ -96,8 +96,8 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Processors
             using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(source, rect, this.Options))
             {
                 int scanlineWidth = maxX - minX;
-                using (IBuffer<float> bBuffer = source.MemoryAllocator.Allocate<float>(maxIntersections))
-                using (IBuffer<float> bScanline = source.MemoryAllocator.Allocate<float>(scanlineWidth))
+                using (IMemoryOwner<float> bBuffer = source.MemoryAllocator.Allocate<float>(maxIntersections))
+                using (IMemoryOwner<float> bScanline = source.MemoryAllocator.Allocate<float>(scanlineWidth))
                 {
                     bool scanlineDirty = true;
                     float subpixelFraction = 1f / subpixelCount;
diff --git a/src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
index 9327f9449..048c4440d 100644
--- a/src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
@@ -2,19 +2,17 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Utils;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 
-namespace SixLabors.ImageSharp.Processing.Text.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Text
 {
     /// <summary>
     /// Using the brush as a source of pixels colors blends the brush color with source.
@@ -337,10 +335,10 @@ namespace SixLabors.ImageSharp.Processing.Text.Processors
                 }
 
                 // take the path inside the path builder, scan thing and generate a Buffer2d representing the glyph and cache it.
-                Buffer2D<float> fullBuffer = this.MemoryAllocator.Allocate2D<float>(size.Width + 1, size.Height + 1, true);
+                Buffer2D<float> fullBuffer = this.MemoryAllocator.Allocate2D<float>(size.Width + 1, size.Height + 1, AllocationOptions.Clean);
 
-                using (IBuffer<float> bufferBacking = this.MemoryAllocator.Allocate<float>(path.MaxIntersections))
-                using (IBuffer<PointF> rowIntersectionBuffer = this.MemoryAllocator.Allocate<PointF>(size.Width))
+                using (IMemoryOwner<float> bufferBacking = this.MemoryAllocator.Allocate<float>(path.MaxIntersections))
+                using (IMemoryOwner<PointF> rowIntersectionBuffer = this.MemoryAllocator.Allocate<PointF>(size.Width))
                 {
                     float subpixelFraction = 1f / subpixelCount;
                     float subpixelFractionPoint = subpixelFraction / subpixelCount;
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/RadialGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs
similarity index 96%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/RadialGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs
index 5c0d8051c..16380fc34 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/RadialGradientBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs
@@ -1,9 +1,12 @@
-using System;
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A Circular Gradient Brush, defined by center point and radius.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
similarity index 95%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
index a7da2cc5b..e1b11637d 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
@@ -2,20 +2,21 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a brush that can recolor an image
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
     public class RecolorBrush<TPixel> : IBrush<TPixel>
-    where TPixel : struct, IPixel<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RecolorBrush{TPixel}" /> class.
@@ -138,8 +139,8 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
             {
                 MemoryAllocator memoryAllocator = this.Target.MemoryAllocator;
 
-                using (IBuffer<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
-                using (IBuffer<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
+                using (IMemoryOwner<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
+                using (IMemoryOwner<TPixel> overlay = memoryAllocator.Allocate<TPixel>(scanline.Length))
                 {
                     Span<float> amountSpan = amountBuffer.GetSpan();
                     Span<TPixel> overlaySpan = overlay.GetSpan();
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
similarity index 94%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
index 791c307bf..3904f3d9b 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
@@ -2,12 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
+
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides an implementation of a solid brush for painting solid color areas.
@@ -65,7 +67,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
             /// <summary>
             /// Gets the colors.
             /// </summary>
-            protected IBuffer<TPixel> Colors { get; }
+            protected IMemoryOwner<TPixel> Colors { get; }
 
             /// <summary>
             /// Gets the color for a single pixel.
@@ -96,7 +98,7 @@ namespace SixLabors.ImageSharp.Processing.Drawing.Brushes
                 }
                 else
                 {
-                    using (IBuffer<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
+                    using (IMemoryOwner<float> amountBuffer = memoryAllocator.Allocate<float>(scanline.Length))
                     {
                         Span<float> amountSpan = amountBuffer.GetSpan();
 
diff --git a/src/ImageSharp.Drawing/Processing/Text/TextGraphicsOptions.cs b/src/ImageSharp.Drawing/Processing/TextGraphicsOptions.cs
similarity index 99%
rename from src/ImageSharp.Drawing/Processing/Text/TextGraphicsOptions.cs
rename to src/ImageSharp.Drawing/Processing/TextGraphicsOptions.cs
index aaa6dea56..dfad06768 100644
--- a/src/ImageSharp.Drawing/Processing/Text/TextGraphicsOptions.cs
+++ b/src/ImageSharp.Drawing/Processing/TextGraphicsOptions.cs
@@ -4,7 +4,7 @@
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Text
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Options for influencing the drawing functions.
diff --git a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
index 18b1d994b..1c73b5ed1 100644
--- a/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
+++ b/src/ImageSharp/Advanced/AdvancedImageExtensions.cs
@@ -105,7 +105,7 @@ namespace SixLabors.ImageSharp.Advanced
         internal static Memory<TPixel> GetPixelMemory<TPixel>(this ImageFrame<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
         {
-            return source.PixelBuffer.Buffer.Memory;
+            return source.PixelBuffer.MemorySource.Memory;
         }
 
         /// <summary>
diff --git a/src/ImageSharp/ColorSpaces/CieLab.cs b/src/ImageSharp/ColorSpaces/CieLab.cs
index 66900079f..82975d933 100644
--- a/src/ImageSharp/ColorSpaces/CieLab.cs
+++ b/src/ImageSharp/ColorSpaces/CieLab.cs
@@ -20,11 +20,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.D50;
 
-        /// <summary>
-        /// Represents a <see cref="CieLab"/> that has L, A, B values set to zero.
-        /// </summary>
-        public static readonly CieLab Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -83,11 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the reference white point of this color
         /// </summary>
-        public CieXyz WhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz WhitePoint { get; }
 
         /// <summary>
         /// Gets the lightness dimension.
@@ -119,18 +110,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieLab"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieLab"/> objects for equality.
@@ -171,27 +152,18 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            unchecked
-            {
-                int hashCode = this.WhitePoint.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode();
-                return hashCode;
-            }
+            return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode());
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieLab [Empty]";
-            }
-
-            return $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
+            return this.Equals(default)
+                ? "CieLab [Empty]"
+                : $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieLab other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieLch.cs b/src/ImageSharp/ColorSpaces/CieLch.cs
index 57ed5f48d..67a9956bd 100644
--- a/src/ImageSharp/ColorSpaces/CieLch.cs
+++ b/src/ImageSharp/ColorSpaces/CieLch.cs
@@ -20,11 +20,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.D50;
 
-        /// <summary>
-        /// Represents a <see cref="CieLch"/> that has L, C, H values set to zero.
-        /// </summary>
-        public static readonly CieLch Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -83,11 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the reference white point of this color
         /// </summary>
-        public CieXyz WhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz WhitePoint { get; }
 
         /// <summary>
         /// Gets the lightness dimension.
@@ -119,18 +110,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieLch"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieLch"/> objects for equality.
@@ -171,23 +152,15 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            unchecked
-            {
-                int hashCode = this.WhitePoint.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode();
-                return hashCode;
-            }
+            return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode());
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieLch [Empty]";
-            }
-
-            return $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]";
+            return this.Equals(default)
+                ? "CieLch [Empty]"
+                : $"CieLch [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]";
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/ColorSpaces/CieLchuv.cs b/src/ImageSharp/ColorSpaces/CieLchuv.cs
index a378aae86..0b4c7a903 100644
--- a/src/ImageSharp/ColorSpaces/CieLchuv.cs
+++ b/src/ImageSharp/ColorSpaces/CieLchuv.cs
@@ -20,11 +20,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.D65;
 
-        /// <summary>
-        /// Represents a <see cref="CieLchuv"/> that has L, C, H values set to zero.
-        /// </summary>
-        public static readonly CieLchuv Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -83,11 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the reference white point of this color
         /// </summary>
-        public CieXyz WhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz WhitePoint { get; }
 
         /// <summary>
         /// Gets the lightness dimension.
@@ -119,18 +110,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieLchuv"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieLchuv"/> objects for equality.
@@ -144,7 +125,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <returns>
         /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator ==(CieLchuv left, CieLchuv right)
         {
             return left.Equals(right);
@@ -162,36 +142,27 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <returns>
         /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator !=(CieLchuv left, CieLchuv right)
         {
             return !left.Equals(right);
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
-            unchecked
-            {
-                int hashCode = this.WhitePoint.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode();
-                return hashCode;
-            }
+            return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode());
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieLchuv [Empty]";
-            }
-
-            return $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}]";
+            return this.Equals(default)
+                ? "CieLchuv [Empty]"
+                : $"CieLchuv [ L={this.L:#0.##}, C={this.C:#0.##}, H={this.H:#0.##}";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieLchuv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieLuv.cs b/src/ImageSharp/ColorSpaces/CieLuv.cs
index f93e1fd46..dbc3b6dee 100644
--- a/src/ImageSharp/ColorSpaces/CieLuv.cs
+++ b/src/ImageSharp/ColorSpaces/CieLuv.cs
@@ -22,11 +22,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.D65;
 
-        /// <summary>
-        /// Represents a <see cref="CieLuv"/> that has L, U, and V values set to zero.
-        /// </summary>
-        public static readonly CieLuv Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -85,11 +80,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the reference white point of this color
         /// </summary>
-        public CieXyz WhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz WhitePoint { get; }
 
         /// <summary>
         /// Gets the lightness dimension
@@ -121,18 +112,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieLuv"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieLuv"/> objects for equality.
@@ -173,27 +154,18 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override int GetHashCode()
         {
-            unchecked
-            {
-                int hashCode = this.WhitePoint.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode();
-                return hashCode;
-            }
+            return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode());
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieLuv [ Empty ]";
-            }
-
-            return $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]";
+            return this.Equals(default)
+                ? "CieLuv [ Empty ]"
+                : $"CieLuv [ L={this.L:#0.##}, U={this.U:#0.##}, V={this.V:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieLuv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
index 6716b1bad..4f4f95147 100644
--- a/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyChromaticityCoordinates.cs
@@ -14,11 +14,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     internal readonly struct CieXyChromaticityCoordinates : IEquatable<CieXyChromaticityCoordinates>, IAlmostEquatable<CieXyChromaticityCoordinates, float>
     {
-        /// <summary>
-        /// Represents a <see cref="CieXyChromaticityCoordinates"/> that has X, Y values set to zero.
-        /// </summary>
-        public static readonly CieXyChromaticityCoordinates Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -69,12 +64,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Y;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieXyChromaticityCoordinates"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <summary>
         /// Compares two <see cref="CieXyChromaticityCoordinates"/> objects for equality.
         /// </summary>
@@ -112,6 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -120,16 +110,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieXyChromaticityCoordinates [Empty]";
-            }
-
-            return $"CieXyChromaticityCoordinates [ X={this.X:#0.##}, Y={this.Y:#0.##}]";
+            return this.Equals(default)
+                ? "CieXyChromaticityCoordinates [Empty]"
+                : $"CieXyChromaticityCoordinates [ X={this.X:#0.##}, Y={this.Y:#0.##}]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieXyChromaticityCoordinates other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieXyy.cs b/src/ImageSharp/ColorSpaces/CieXyy.cs
index 71ad4701a..ac1a4532c 100644
--- a/src/ImageSharp/ColorSpaces/CieXyy.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyy.cs
@@ -14,11 +14,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     internal readonly struct CieXyy : IColorVector, IEquatable<CieXyy>, IAlmostEquatable<CieXyy, float>
     {
-        /// <summary>
-        /// Represents a <see cref="CieXyy"/> that has X, Y, and Y values set to zero.
-        /// </summary>
-        public static readonly CieXyy Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -78,18 +73,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieXyy"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieXyy"/> objects for equality.
@@ -128,6 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -136,16 +122,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieXyy [ Empty ]";
-            }
-
-            return $"CieXyy [ X={this.X:#0.##}, Y={this.Y:#0.##}, Yl={this.Yl:#0.##} ]";
+            return this.Equals(default)
+                ? "CieXyy [ Empty ]"
+                : $"CieXyy [ X={this.X:#0.##}, Y={this.Y:#0.##}, Yl={this.Yl:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieXyy other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/CieXyz.cs b/src/ImageSharp/ColorSpaces/CieXyz.cs
index 79676bb08..fa4261b46 100644
--- a/src/ImageSharp/ColorSpaces/CieXyz.cs
+++ b/src/ImageSharp/ColorSpaces/CieXyz.cs
@@ -14,11 +14,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     internal readonly struct CieXyz : IColorVector, IEquatable<CieXyz>, IAlmostEquatable<CieXyz, float>
     {
-        /// <summary>
-        /// Represents a <see cref="CieXyz"/> that has X, Y, and Z values set to zero.
-        /// </summary>
-        public static readonly CieXyz Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -40,7 +35,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// Initializes a new instance of the <see cref="CieXyz"/> struct.
         /// </summary>
         /// <param name="vector">The vector representing the x, y, z components.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public CieXyz(Vector3 vector)
             : this()
         {
@@ -78,18 +72,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieXyz"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="CieXyz"/> objects for equality.
@@ -128,6 +112,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -136,16 +121,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "CieXyz [ Empty ]";
-            }
-
-            return $"CieXyz [ X={this.X:#0.##}, Y={this.Y:#0.##}, Z={this.Z:#0.##} ]";
+            return this.Equals(default)
+                ? "CieXyz [ Empty ]"
+                : $"CieXyz [ X={this.X:#0.##}, Y={this.Y:#0.##}, Z={this.Z:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is CieXyz other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Cmyk.cs b/src/ImageSharp/ColorSpaces/Cmyk.cs
index 989d512bb..2702d4ba3 100644
--- a/src/ImageSharp/ColorSpaces/Cmyk.cs
+++ b/src/ImageSharp/ColorSpaces/Cmyk.cs
@@ -13,11 +13,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     internal readonly struct Cmyk : IEquatable<Cmyk>, IAlmostEquatable<Cmyk, float>
     {
-        /// <summary>
-        /// Represents a <see cref="Cmyk"/> that has C, M, Y, and K values set to zero.
-        /// </summary>
-        public static readonly Cmyk Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -87,12 +82,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.W;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Cmyk"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <summary>
         /// Compares two <see cref="Cmyk"/> objects for equality.
         /// </summary>
@@ -130,6 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -138,16 +128,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "Cmyk [Empty]";
-            }
-
-            return $"Cmyk [ C={this.C:#0.##}, M={this.M:#0.##}, Y={this.Y:#0.##}, K={this.K:#0.##}]";
+            return this.Equals(default)
+                ? "Cmyk [Empty]"
+                : $"Cmyk [ C={this.C:#0.##}, M={this.M:#0.##}, Y={this.Y:#0.##}, K={this.K:#0.##}]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is Cmyk other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
index 4bb537aeb..e2c1308fa 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Adapt.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <param name="color">The color to adapt</param>
         /// <param name="sourceWhitePoint">The white point to adapt for</param>
         /// <returns>The adapted color</returns>
-        public CieXyz Adapt(CieXyz color, CieXyz sourceWhitePoint)
+        public CieXyz Adapt(in CieXyz color, in CieXyz sourceWhitePoint)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public CieLab Adapt(CieLab color)
+        public CieLab Adapt(in CieLab color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public CieLch Adapt(CieLch color)
+        public CieLch Adapt(in CieLch color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public CieLchuv Adapt(CieLchuv color)
+        public CieLchuv Adapt(in CieLchuv color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -96,7 +96,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public CieLuv Adapt(CieLuv color)
+        public CieLuv Adapt(in CieLuv color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -117,7 +117,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public HunterLab Adapt(HunterLab color)
+        public HunterLab Adapt(in HunterLab color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -138,7 +138,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public LinearRgb Adapt(LinearRgb color)
+        public LinearRgb Adapt(in LinearRgb color)
         {
             if (!this.IsChromaticAdaptationPerformed)
             {
@@ -167,7 +167,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to adapt</param>
         /// <returns>The adapted color</returns>
-        public Rgb Adapt(Rgb color)
+        public Rgb Adapt(in Rgb color)
         {
             LinearRgb linearInput = this.ToLinearRgb(color);
             LinearRgb linearOutput = this.Adapt(linearInput);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
index 16e3ec707..1cead3001 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLab.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(CieLch color)
+        public CieLab ToCieLab(in CieLch color)
         {
             // Conversion (perserving white point)
             CieLab unadapted = CieLchToCieLabConverter.Convert(color);
@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(CieLchuv color)
+        public CieLab ToCieLab(in CieLchuv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(CieLuv color)
+        public CieLab ToCieLab(in CieLuv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -62,7 +62,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(CieXyy color)
+        public CieLab ToCieLab(in CieXyy color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(CieXyz color)
+        public CieLab ToCieLab(in CieXyz color)
         {
             // Adaptation
             CieXyz adapted = !this.WhitePoint.Equals(this.TargetLabWhitePoint) && this.IsChromaticAdaptationPerformed
@@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(Cmyk color)
+        public CieLab ToCieLab(in Cmyk color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(Hsl color)
+        public CieLab ToCieLab(in Hsl color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(Hsv color)
+        public CieLab ToCieLab(in Hsv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(HunterLab color)
+        public CieLab ToCieLab(in HunterLab color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -134,7 +134,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(Lms color)
+        public CieLab ToCieLab(in Lms color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -145,7 +145,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(LinearRgb color)
+        public CieLab ToCieLab(in LinearRgb color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -156,7 +156,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(Rgb color)
+        public CieLab ToCieLab(in Rgb color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
@@ -167,7 +167,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLab ToCieLab(YCbCr color)
+        public CieLab ToCieLab(in YCbCr color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLab(xyzColor);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
index b13580209..cbefc5ac5 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLch.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(CieLab color)
+        public CieLch ToCieLch(in CieLab color)
         {
             // Adaptation
             CieLab adapted = this.IsChromaticAdaptationPerformed ? this.Adapt(color) : color;
@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(CieLchuv color)
+        public CieLch ToCieLch(in CieLchuv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(CieLuv color)
+        public CieLch ToCieLch(in CieLuv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(CieXyy color)
+        public CieLch ToCieLch(in CieXyy color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(CieXyz color)
+        public CieLch ToCieLch(in CieXyz color)
         {
             CieLab labColor = this.ToCieLab(color);
             return this.ToCieLch(labColor);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(Cmyk color)
+        public CieLch ToCieLch(in Cmyk color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(Hsl color)
+        public CieLch ToCieLch(in Hsl color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -100,7 +100,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(Hsv color)
+        public CieLch ToCieLch(in Hsv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -111,7 +111,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(HunterLab color)
+        public CieLch ToCieLch(in HunterLab color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(LinearRgb color)
+        public CieLch ToCieLch(in LinearRgb color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(Lms color)
+        public CieLch ToCieLch(in Lms color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -144,7 +144,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(Rgb color)
+        public CieLch ToCieLch(in Rgb color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
@@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLch"/></returns>
-        public CieLch ToCieLch(YCbCr color)
+        public CieLch ToCieLch(in YCbCr color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLch(xyzColor);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs
index a5b5220b9..a44541bdb 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLchuv.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(CieLab color)
+        public CieLchuv ToCieLchuv(in CieLab color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -31,7 +31,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(CieLch color)
+        public CieLchuv ToCieLchuv(in CieLch color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -42,7 +42,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(CieLuv color)
+        public CieLchuv ToCieLchuv(in CieLuv color)
         {
             // Adaptation
             CieLuv adapted = this.IsChromaticAdaptationPerformed ? this.Adapt(color) : color;
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(CieXyy color)
+        public CieLchuv ToCieLchuv(in CieXyy color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -67,7 +67,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(CieXyz color)
+        public CieLchuv ToCieLchuv(in CieXyz color)
         {
             CieLab labColor = this.ToCieLab(color);
             return this.ToCieLchuv(labColor);
@@ -78,7 +78,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(Cmyk color)
+        public CieLchuv ToCieLchuv(in Cmyk color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(Hsl color)
+        public CieLchuv ToCieLchuv(in Hsl color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -100,7 +100,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(Hsv color)
+        public CieLchuv ToCieLchuv(in Hsv color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -111,7 +111,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(HunterLab color)
+        public CieLchuv ToCieLchuv(in HunterLab color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -122,7 +122,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(LinearRgb color)
+        public CieLchuv ToCieLchuv(in LinearRgb color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -133,7 +133,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(Lms color)
+        public CieLchuv ToCieLchuv(in Lms color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
@@ -155,7 +155,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLchuv"/></returns>
-        public CieLchuv ToCieLchuv(YCbCr color)
+        public CieLchuv ToCieLchuv(in YCbCr color)
         {
             CieXyz xyzColor = this.ToCieXyz(color);
             return this.ToCieLchuv(xyzColor);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
index 7260a818f..36e6501a5 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieLuv.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(CieLab color)
+        public CieLuv ToCieLuv(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(CieLch color)
+        public CieLuv ToCieLuv(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLab"/></returns>
-        public CieLuv ToCieLuv(CieLchuv color)
+        public CieLuv ToCieLuv(in CieLchuv color)
         {
             // Conversion (perserving white point)
             CieLuv unadapted = CieLchuvToCieLuvConverter.Convert(color);
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(CieXyy color)
+        public CieLuv ToCieLuv(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -71,7 +71,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(CieXyz color)
+        public CieLuv ToCieLuv(in CieXyz color)
         {
             // Adaptation
             CieXyz adapted = !this.WhitePoint.Equals(this.TargetLabWhitePoint) && this.IsChromaticAdaptationPerformed
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(Cmyk color)
+        public CieLuv ToCieLuv(in Cmyk color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -99,7 +99,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(Hsl color)
+        public CieLuv ToCieLuv(in Hsl color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -110,7 +110,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(Hsv color)
+        public CieLuv ToCieLuv(in Hsv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -121,7 +121,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(HunterLab color)
+        public CieLuv ToCieLuv(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -132,7 +132,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(Lms color)
+        public CieLuv ToCieLuv(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -143,7 +143,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(LinearRgb color)
+        public CieLuv ToCieLuv(in LinearRgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -154,7 +154,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(Rgb color)
+        public CieLuv ToCieLuv(in Rgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
@@ -165,7 +165,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieLuv"/></returns>
-        public CieLuv ToCieLuv(YCbCr color)
+        public CieLuv ToCieLuv(in YCbCr color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToCieLuv(xyzColor);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
index 5f6aaea6b..25a9f75a4 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyy.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(CieLab color)
+        public CieXyy ToCieXyy(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(CieLch color)
+        public CieXyy ToCieXyy(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(CieLchuv color)
+        public CieXyy ToCieXyy(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(CieLuv color)
+        public CieXyy ToCieXyy(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(CieXyz color)
+        public CieXyy ToCieXyy(in CieXyz color)
         {
             return CieXyzAndCieXyyConverter.Convert(color);
         }
@@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(Cmyk color)
+        public CieXyy ToCieXyy(in Cmyk color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -99,7 +99,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(Hsv color)
+        public CieXyy ToCieXyy(in Hsv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -111,7 +111,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(HunterLab color)
+        public CieXyy ToCieXyy(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -123,7 +123,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(LinearRgb color)
+        public CieXyy ToCieXyy(in LinearRgb color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(Lms color)
+        public CieXyy ToCieXyy(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -147,7 +147,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(Rgb color)
+        public CieXyy ToCieXyy(in Rgb color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyy"/></returns>
-        public CieXyy ToCieXyy(YCbCr color)
+        public CieXyy ToCieXyy(in YCbCr color)
         {
             var xyzColor = this.ToCieXyz(color);
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
index cd3f7f3c8..f4f28401f 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.CieXyz.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(CieLab color)
+        public CieXyz ToCieXyz(in CieLab color)
         {
             // Conversion
             CieXyz unadapted = CieLabToCieXyzConverter.Convert(color);
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(CieLch color)
+        public CieXyz ToCieXyz(in CieLch color)
         {
             // Conversion to Lab
             CieLab labColor = CieLchToCieLabConverter.Convert(color);
@@ -58,7 +58,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(CieLchuv color)
+        public CieXyz ToCieXyz(in CieLchuv color)
         {
             // Conversion to Luv
             CieLuv luvColor = CieLchuvToCieLuvConverter.Convert(color);
@@ -72,7 +72,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(CieLuv color)
+        public CieXyz ToCieXyz(in CieLuv color)
         {
             // Conversion
             CieXyz unadapted = CieLuvToCieXyzConverter.Convert(color);
@@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(CieXyy color)
+        public CieXyz ToCieXyz(in CieXyy color)
         {
             // Conversion
             return CieXyzAndCieXyyConverter.Convert(color);
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(Cmyk color)
+        public CieXyz ToCieXyz(in Cmyk color)
         {
             // Conversion
             var rgb = this.ToRgb(color);
@@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(Hsl color)
+        public CieXyz ToCieXyz(in Hsl color)
         {
             // Conversion
             var rgb = this.ToRgb(color);
@@ -127,7 +127,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(Hsv color)
+        public CieXyz ToCieXyz(in Hsv color)
         {
             // Conversion
             var rgb = this.ToRgb(color);
@@ -140,7 +140,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(HunterLab color)
+        public CieXyz ToCieXyz(in HunterLab color)
         {
             // Conversion
             CieXyz unadapted = HunterLabToCieXyzConverter.Convert(color);
@@ -158,7 +158,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(LinearRgb color)
+        public CieXyz ToCieXyz(in LinearRgb color)
         {
             // Conversion
             LinearRgbToCieXyzConverter converter = this.GetLinearRgbToCieXyzConverter(color.WorkingSpace);
@@ -175,7 +175,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(Lms color)
+        public CieXyz ToCieXyz(in Lms color)
         {
             // Conversion
             return this.cachedCieXyzAndLmsConverter.Convert(color);
@@ -186,7 +186,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(Rgb color)
+        public CieXyz ToCieXyz(in Rgb color)
         {
             // Conversion
             LinearRgb linear = RgbToLinearRgbConverter.Convert(color);
@@ -198,7 +198,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        public CieXyz ToCieXyz(YCbCr color)
+        public CieXyz ToCieXyz(in YCbCr color)
         {
             // Conversion
             var rgb = this.ToRgb(color);
@@ -211,7 +211,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="workingSpace">The source working space</param>
         /// <returns>The <see cref="LinearRgbToCieXyzConverter"/></returns>
-        private LinearRgbToCieXyzConverter GetLinearRgbToCieXyzConverter(IRgbWorkingSpace workingSpace)
+        private LinearRgbToCieXyzConverter GetLinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
         {
             if (this.linearRgbToCieXyzConverter != null && this.linearRgbToCieXyzConverter.SourceWorkingSpace.Equals(workingSpace))
             {
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
index 708c2eac0..1e403828a 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Cmyk.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieLab color)
+        public Cmyk ToCmyk(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieLch color)
+        public Cmyk ToCmyk(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieLchuv color)
+        public Cmyk ToCmyk(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieLuv color)
+        public Cmyk ToCmyk(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieXyy color)
+        public Cmyk ToCmyk(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(CieXyz color)
+        public Cmyk ToCmyk(in CieXyz color)
         {
             var rgb = this.ToRgb(color);
 
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(Hsl color)
+        public Cmyk ToCmyk(in Hsl color)
         {
             var rgb = this.ToRgb(color);
 
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(Hsv color)
+        public Cmyk ToCmyk(in Hsv color)
         {
             var rgb = this.ToRgb(color);
 
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(HunterLab color)
+        public Cmyk ToCmyk(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -125,7 +125,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(LinearRgb color)
+        public Cmyk ToCmyk(in LinearRgb color)
         {
             var rgb = this.ToRgb(color);
 
@@ -137,7 +137,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(Lms color)
+        public Cmyk ToCmyk(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(Rgb color)
+        public Cmyk ToCmyk(in Rgb color)
         {
             return CmykAndRgbConverter.Convert(color);
         }
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Cmyk"/></returns>
-        public Cmyk ToCmyk(YCbCr color)
+        public Cmyk ToCmyk(in YCbCr color)
         {
             var rgb = this.ToRgb(color);
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
index 909658a06..78f8c36fb 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsl.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieLab color)
+        public Hsl ToHsl(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieLch color)
+        public Hsl ToHsl(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieLchuv color)
+        public Hsl ToHsl(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieLuv color)
+        public Hsl ToHsl(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieXyy color)
+        public Hsl ToHsl(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(CieXyz color)
+        public Hsl ToHsl(in CieXyz color)
         {
             var rgb = this.ToRgb(color);
 
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(Cmyk color)
+        public Hsl ToHsl(in Cmyk color)
         {
             var rgb = this.ToRgb(color);
 
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(Hsv color)
+        public Hsl ToHsl(in Hsv color)
         {
             var rgb = this.ToRgb(color);
 
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(HunterLab color)
+        public Hsl ToHsl(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -125,7 +125,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(LinearRgb color)
+        public Hsl ToHsl(in LinearRgb color)
         {
             var rgb = this.ToRgb(color);
 
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(Rgb color)
+        public Hsl ToHsl(in Rgb color)
         {
             return HslAndRgbConverter.Convert(color);
         }
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsl"/></returns>
-        public Hsl ToHsl(YCbCr color)
+        public Hsl ToHsl(in YCbCr color)
         {
             var rgb = this.ToRgb(color);
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
index 0aa644567..3edd72c59 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Hsv.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieLab color)
+        public Hsv ToHsv(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieLch color)
+        public Hsv ToHsv(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieLchuv color)
+        public Hsv ToHsv(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieLuv color)
+        public Hsv ToHsv(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieXyy color)
+        public Hsv ToHsv(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(CieXyz color)
+        public Hsv ToHsv(in CieXyz color)
         {
             var rgb = this.ToRgb(color);
 
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(Cmyk color)
+        public Hsv ToHsv(in Cmyk color)
         {
             var rgb = this.ToRgb(color);
 
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(Hsl color)
+        public Hsv ToHsv(in Hsl color)
         {
             var rgb = this.ToRgb(color);
 
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(HunterLab color)
+        public Hsv ToHsv(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -125,7 +125,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(LinearRgb color)
+        public Hsv ToHsv(in LinearRgb color)
         {
             var rgb = this.ToRgb(color);
 
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(Rgb color)
+        public Hsv ToHsv(in Rgb color)
         {
             return HsvAndRgbConverter.Convert(color);
         }
@@ -159,7 +159,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Hsv"/></returns>
-        public Hsv ToHsv(YCbCr color)
+        public Hsv ToHsv(in YCbCr color)
         {
             var rgb = this.ToRgb(color);
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs
index 880a91551..f3a64164b 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.HunterLab.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieLab color)
+        public HunterLab ToHunterLab(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieLch color)
+        public HunterLab ToHunterLab(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieLchuv color)
+        public HunterLab ToHunterLab(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieLuv color)
+        public HunterLab ToHunterLab(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieXyy color)
+        public HunterLab ToHunterLab(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(CieXyz color)
+        public HunterLab ToHunterLab(in CieXyz color)
         {
             // Adaptation
             CieXyz adapted = !this.WhitePoint.Equals(this.TargetHunterLabWhitePoint) && this.IsChromaticAdaptationPerformed
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(Cmyk color)
+        public HunterLab ToHunterLab(in Cmyk color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -97,7 +97,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(Hsl color)
+        public HunterLab ToHunterLab(in Hsl color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -108,7 +108,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(Hsv color)
+        public HunterLab ToHunterLab(in Hsv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -119,7 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(LinearRgb color)
+        public HunterLab ToHunterLab(in LinearRgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(Lms color)
+        public HunterLab ToHunterLab(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -141,7 +141,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(Rgb color)
+        public HunterLab ToHunterLab(in Rgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToHunterLab(xyzColor);
@@ -152,7 +152,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="HunterLab"/></returns>
-        public HunterLab ToHunterLab(YCbCr color)
+        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
index 92d2cd861..5fdde5c75 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.LinearRgb.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieLab color)
+        public LinearRgb ToLinearRgb(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -30,7 +30,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieLch color)
+        public LinearRgb ToLinearRgb(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieLchuv color)
+        public LinearRgb ToLinearRgb(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -52,7 +52,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieLuv color)
+        public LinearRgb ToLinearRgb(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -63,7 +63,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieXyy color)
+        public LinearRgb ToLinearRgb(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(CieXyz color)
+        public LinearRgb ToLinearRgb(in CieXyz color)
         {
             // Adaptation
             CieXyz adapted = this.TargetRgbWorkingSpace.WhitePoint.Equals(this.WhitePoint) || !this.IsChromaticAdaptationPerformed
@@ -91,7 +91,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(Cmyk color)
+        public LinearRgb ToLinearRgb(in Cmyk color)
         {
             var rgb = this.ToRgb(color);
             return this.ToLinearRgb(rgb);
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(Hsl color)
+        public LinearRgb ToLinearRgb(in Hsl color)
         {
             var rgb = this.ToRgb(color);
             return this.ToLinearRgb(rgb);
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(Hsv color)
+        public LinearRgb ToLinearRgb(in Hsv color)
         {
             var rgb = this.ToRgb(color);
             return this.ToLinearRgb(rgb);
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(HunterLab color)
+        public LinearRgb ToLinearRgb(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(Lms color)
+        public LinearRgb ToLinearRgb(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLinearRgb(xyzColor);
@@ -146,7 +146,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(Rgb color)
+        public LinearRgb ToLinearRgb(in Rgb color)
         {
             // Conversion
             return RgbToLinearRgbConverter.Convert(color);
@@ -157,7 +157,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="LinearRgb"/></returns>
-        public LinearRgb ToLinearRgb(YCbCr color)
+        public LinearRgb ToLinearRgb(in YCbCr color)
         {
             var rgb = this.ToRgb(color);
             return this.ToLinearRgb(rgb);
@@ -168,7 +168,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="workingSpace">The target working space</param>
         /// <returns>The <see cref="CieXyzToLinearRgbConverter"/></returns>
-        private CieXyzToLinearRgbConverter GetCieXyxToLinearRgbConverter(IRgbWorkingSpace workingSpace)
+        private CieXyzToLinearRgbConverter GetCieXyxToLinearRgbConverter(RgbWorkingSpace workingSpace)
         {
             if (this.cieXyzToLinearRgbConverter != null && this.cieXyzToLinearRgbConverter.TargetWorkingSpace.Equals(workingSpace))
             {
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
index 1de0d70d3..3293e2f4a 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Lms.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieLab color)
+        public Lms ToLms(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieLch color)
+        public Lms ToLms(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieLchuv color)
+        public Lms ToLms(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieLuv color)
+        public Lms ToLms(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieXyy color)
+        public Lms ToLms(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -70,7 +70,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(CieXyz color)
+        public Lms ToLms(in CieXyz color)
         {
             return this.cachedCieXyzAndLmsConverter.Convert(color);
         }
@@ -80,7 +80,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(Cmyk color)
+        public Lms ToLms(in Cmyk color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -91,7 +91,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(Hsl color)
+        public Lms ToLms(in Hsl color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(Hsv color)
+        public Lms ToLms(in Hsv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(HunterLab color)
+        public Lms ToLms(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -124,7 +124,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(LinearRgb color)
+        public Lms ToLms(in LinearRgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -135,7 +135,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(Rgb color)
+        public Lms ToLms(in Rgb color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToLms(xyzColor);
@@ -146,7 +146,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Lms"/></returns>
-        public Lms ToLms(YCbCr color)
+        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
index b609934e9..5bfb6ee05 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.Rgb.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieLab color)
+        public Rgb ToRgb(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -28,7 +28,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieLch color)
+        public Rgb ToRgb(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -39,7 +39,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieLchuv color)
+        public Rgb ToRgb(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieLuv color)
+        public Rgb ToRgb(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieXyy color)
+        public Rgb ToRgb(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -72,7 +72,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(CieXyz color)
+        public Rgb ToRgb(in CieXyz color)
         {
             // Conversion
             var linear = this.ToLinearRgb(color);
@@ -86,7 +86,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(Cmyk color)
+        public Rgb ToRgb(in Cmyk color)
         {
             // Conversion
             return CmykAndRgbConverter.Convert(color);
@@ -97,7 +97,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(Hsv color)
+        public Rgb ToRgb(in Hsv color)
         {
             // Conversion
             return HsvAndRgbConverter.Convert(color);
@@ -108,7 +108,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(Hsl color)
+        public Rgb ToRgb(in Hsl color)
         {
             // Conversion
             return HslAndRgbConverter.Convert(color);
@@ -119,7 +119,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(HunterLab color)
+        public Rgb ToRgb(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(LinearRgb color)
+        public Rgb ToRgb(in LinearRgb color)
         {
             // Conversion
             return LinearRgbToRgbConverter.Convert(color);
@@ -141,7 +141,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(Lms color)
+        public Rgb ToRgb(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
             return this.ToRgb(xyzColor);
@@ -152,7 +152,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="Rgb"/></returns>
-        public Rgb ToRgb(YCbCr color)
+        public Rgb ToRgb(in YCbCr color)
         {
             // Conversion
             Rgb rgb = YCbCrAndRgbConverter.Convert(color);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
index 97d9f3818..b7fe34f41 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.YCbCr.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieLab color)
+        public YCbCr ToYCbCr(in CieLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieLch color)
+        public YCbCr ToYCbCr(in CieLch color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieLchuv color)
+        public YCbCr ToYCbCr(in CieLchuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -53,7 +53,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieLuv color)
+        public YCbCr ToYCbCr(in CieLuv color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieXyy color)
+        public YCbCr ToYCbCr(in CieXyy color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(CieXyz color)
+        public YCbCr ToYCbCr(in CieXyz color)
         {
             var rgb = this.ToRgb(color);
 
@@ -89,7 +89,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(Cmyk color)
+        public YCbCr ToYCbCr(in Cmyk color)
         {
             var rgb = this.ToRgb(color);
 
@@ -101,7 +101,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(Hsl color)
+        public YCbCr ToYCbCr(in Hsl color)
         {
             var rgb = this.ToRgb(color);
 
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(Hsv color)
+        public YCbCr ToYCbCr(in Hsv color)
         {
             var rgb = this.ToRgb(color);
 
@@ -125,7 +125,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(HunterLab color)
+        public YCbCr ToYCbCr(in HunterLab color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -137,7 +137,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(LinearRgb color)
+        public YCbCr ToYCbCr(in LinearRgb color)
         {
             var rgb = this.ToRgb(color);
 
@@ -149,7 +149,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(Lms color)
+        public YCbCr ToYCbCr(in Lms color)
         {
             var xyzColor = this.ToCieXyz(color);
 
@@ -161,7 +161,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// </summary>
         /// <param name="color">The color to convert.</param>
         /// <returns>The <see cref="YCbCr"/></returns>
-        public YCbCr ToYCbCr(Rgb color)
+        public YCbCr ToYCbCr(in Rgb color)
         {
             return YCbCrAndRgbConverter.Convert(color);
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs
index f86f50538..7142ab0e8 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/ColorSpaceConverter.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Numerics;
-using SixLabors.ImageSharp.ColorSpaces;
 using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.LmsColorSapce;
+using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
 
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion
 {
@@ -64,7 +64,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// 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 IRgbWorkingSpace TargetRgbWorkingSpace { get; set; }
+        public RgbWorkingSpace TargetRgbWorkingSpace { get; set; }
 
         /// <summary>
         /// Gets or sets the chromatic adaptation method used. When null, no adaptation will be performed.
diff --git a/src/ImageSharp/ColorSpaces/Conversion/IChromaticAdaptation.cs b/src/ImageSharp/ColorSpaces/Conversion/IChromaticAdaptation.cs
index c5d91f9a0..dfba4b926 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/IChromaticAdaptation.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/IChromaticAdaptation.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.ColorSpaces;
-
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion
 {
     /// <summary>
@@ -20,6 +18,6 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         /// <param name="sourceWhitePoint">The source white point.</param>
         /// <param name="targetWhitePoint">The target white point.</param>
         /// <returns>The <see cref="CieXyz"/></returns>
-        CieXyz Transform(CieXyz sourceColor, CieXyz sourceWhitePoint, CieXyz targetWhitePoint);
+        CieXyz Transform(in CieXyz sourceColor, in CieXyz sourceWhitePoint, in CieXyz targetWhitePoint);
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/ColorSpaces/Conversion/IColorConversion.cs b/src/ImageSharp/ColorSpaces/Conversion/IColorConversion.cs
index 9ef24b38a..009b91c40 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/IColorConversion.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/IColorConversion.cs
@@ -8,13 +8,15 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
     /// </summary>
     /// <typeparam name="T">The input color type.</typeparam>
     /// <typeparam name="TResult">The result color type.</typeparam>
-    internal interface IColorConversion<in T, out TResult>
+    internal interface IColorConversion<T, TResult>
+        where T : struct
+        where TResult : struct
     {
         /// <summary>
         /// Performs the conversion from the input to an instance of the output type.
         /// </summary>
         /// <param name="input">The input color instance.</param>
         /// <returns>The converted result</returns>
-        TResult Convert(T input);
+        TResult Convert(in T input);
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieLabToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieLabToCieXyzConverter.cs
index 53d9c927a..ca8f23c56 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieLabToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieLabToCieXyzConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLabColor
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyz Convert(CieLab input)
+        public 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;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieXyzToCieLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieXyzToCieLabConverter.cs
index 454601b88..0fe52e6af 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieXyzToCieLabConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLab/CieXyzToCieLabConverter.cs
@@ -33,15 +33,11 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLabColor
         /// <summary>
         /// Gets the target reference whitepoint. When not set, <see cref="CieLab.DefaultWhitePoint"/> is used.
         /// </summary>
-        public CieXyz LabWhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz LabWhitePoint { get; }
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLab Convert(CieXyz input)
+        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;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CIeLchToCieLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CIeLchToCieLabConverter.cs
index 0b1ebae0e..061d04493 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CIeLchToCieLabConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CIeLchToCieLabConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLchColor
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLab Convert(CieLch input)
+        public CieLab Convert(in CieLch input)
         {
             // Conversion algorithm described here:
             // https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CieLabToCieLchConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CieLabToCieLchConverter.cs
index ec73a830f..105fb2aa1 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CieLabToCieLchConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLch/CieLabToCieLchConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLchColor
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLch Convert(CieLab input)
+        public CieLch Convert(in CieLab input)
         {
             // Conversion algorithm described here:
             // https://en.wikipedia.org/wiki/Lab_color_space#Cylindrical_representation:_CIELCh_or_CIEHLC
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLchuvToCieLuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLchuvToCieLuvConverter.cs
index eb523806a..7f8e0fc1e 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLchuvToCieLuvConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLchuvToCieLuvConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLchuvCol
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLuv Convert(CieLchuv input)
+        public CieLuv Convert(in CieLchuv input)
         {
             // Conversion algorithm described here:
             // https://en.wikipedia.org/wiki/CIELUV#Cylindrical_representation_.28CIELCH.29
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLuvToCieLchuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLuvToCieLchuvConverter.cs
index 7a9dd2c6a..7a23e2da1 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLuvToCieLchuvConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLchuv/CieLuvToCieLchuvConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLchuvCol
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLchuv Convert(CieLuv input)
+        public CieLchuv Convert(in CieLuv input)
         {
             // Conversion algorithm described here:
             // https://en.wikipedia.org/wiki/CIELUV#Cylindrical_representation_.28CIELCH.29
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieLuvToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieLuvToCieXyzConverter.cs
index 7a264fdfe..cd2ec488d 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieLuvToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieLuvToCieXyzConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyz Convert(CieLuv input)
+        public 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;
@@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         /// <param name="input">The whitepoint</param>
         /// <returns>The <see cref="float"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float ComputeU0(CieXyz input)
+        private static float ComputeU0(in CieXyz input)
         {
             return (4 * input.X) / (input.X + (15 * input.Y) + (3 * input.Z));
         }
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         /// <param name="input">The whitepoint</param>
         /// <returns>The <see cref="float"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float ComputeV0(CieXyz input)
+        private static float ComputeV0(in CieXyz input)
         {
             return (9 * input.Y) / (input.X + (15 * input.Y) + (3 * input.Z));
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
index e1c5dde4f..c34a2455a 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieLuv/CieXyzToCieLuvConverter.cs
@@ -34,15 +34,11 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         /// <summary>
         /// Gets the target reference whitepoint. When not set, <see cref="CieLuv.DefaultWhitePoint"/> is used.
         /// </summary>
-        public CieXyz LuvWhitePoint
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
+        public CieXyz LuvWhitePoint { get; }
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieLuv Convert(CieXyz input)
+        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;
@@ -80,7 +76,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         /// <param name="input">The whitepoint</param>
         /// <returns>The <see cref="float"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float ComputeUp(CieXyz input)
+        private static float ComputeUp(in CieXyz input)
         {
             return (4 * input.X) / (input.X + (15 * input.Y) + (3 * input.Z));
         }
@@ -90,7 +86,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieLuvColor
         /// </summary>
         /// <param name="input">The whitepoint</param>
         /// <returns>The <see cref="float"/></returns>
-        private static float ComputeVp(CieXyz input)
+        private static float ComputeVp(in CieXyz input)
         {
             return (9 * input.Y) / (input.X + (15 * input.Y) + (3 * input.Z));
         }
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
index 7dfc577dc..d15f7360e 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/CieXyy/CieXyzAndCieXyyConverter.cs
@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieXyyColor
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyy Convert(CieXyz input)
+        public 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);
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CieXyyColor
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyz Convert(CieXyy input)
+        public CieXyz Convert(in CieXyy input)
         {
             if (MathF.Abs(input.Y) < Constants.Epsilon)
             {
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Cmyk/CmykAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Cmyk/CmykAndRgbConverter.cs
index ed86ec9a5..869178370 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Cmyk/CmykAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Cmyk/CmykAndRgbConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CmykColorSa
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb Convert(Cmyk input)
+        public Rgb Convert(in Cmyk input)
         {
             float r = (1F - input.C) * (1F - input.K);
             float g = (1F - input.M) * (1F - input.K);
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.CmykColorSa
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Cmyk Convert(Rgb input)
+        public Cmyk Convert(in Rgb input)
         {
             // To CMYK
             float c = 1F - input.R;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
index 7983b6ce4..1bec834a8 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsl/HslAndRgbConverter.cs
@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HslColorSap
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb Convert(Hsl input)
+        public Rgb Convert(in Hsl input)
         {
             float rangedH = input.H / 360F;
             float r = 0;
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HslColorSap
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Hsl Convert(Rgb input)
+        public Hsl Convert(in Rgb input)
         {
             float r = input.R;
             float g = input.G;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
index c46d8f26b..f2c4cc188 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Hsv/HsvAndRgbConverter.cs
@@ -14,7 +14,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HsvColorSap
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb Convert(Hsv input)
+        public Rgb Convert(in Hsv input)
         {
             float s = input.S;
             float v = input.V;
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HsvColorSap
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Hsv Convert(Rgb input)
+        public Hsv Convert(in Rgb input)
         {
             float r = input.R;
             float g = input.G;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
index 58363ea2b..af681e981 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/CieXyzToHunterLabConverter.cs
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HunterLabCo
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public HunterLab Convert(CieXyz input)
+        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;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/HunterLabToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/HunterLabToCieXyzConverter.cs
index 228d7362b..eba9fe1c8 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/HunterLabToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/HunterLab/HunterLabToCieXyzConverter.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.HunterLabCo
     {
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyz Convert(HunterLab input)
+        public 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;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Lms/CieXyzAndLmsConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Lms/CieXyzAndLmsConverter.cs
index 5241b62f9..c29496c37 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Lms/CieXyzAndLmsConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Lms/CieXyzAndLmsConverter.cs
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.LmsColorSap
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Lms Convert(CieXyz input)
+        public Lms Convert(in CieXyz input)
         {
             Vector3 vector = Vector3.Transform(input.Vector, this.transformationMatrix);
             return new Lms(vector);
@@ -68,7 +68,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.LmsColorSap
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public CieXyz Convert(Lms input)
+        public CieXyz Convert(in Lms input)
         {
             Vector3 vector = Vector3.Transform(input.Vector, this.inverseTransformationMatrix);
             return new CieXyz(vector);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
index 2f52c2074..217698c23 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/CieXyzToLinearRgbConverter.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     /// <summary>
     /// Color converter between CieXyz and LinearRgb
     /// </summary>
-    internal class CieXyzToLinearRgbConverter : LinearRgbAndCieXyzConverterBase, IColorConversion<CieXyz, LinearRgb>
+    internal sealed class CieXyzToLinearRgbConverter : LinearRgbAndCieXyzConverterBase, IColorConversion<CieXyz, LinearRgb>
     {
         private readonly Matrix4x4 conversionMatrix;
 
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// Initializes a new instance of the <see cref="CieXyzToLinearRgbConverter"/> class.
         /// </summary>
         /// <param name="workingSpace">The target working space.</param>
-        public CieXyzToLinearRgbConverter(IRgbWorkingSpace workingSpace)
+        public CieXyzToLinearRgbConverter(RgbWorkingSpace workingSpace)
         {
             this.TargetWorkingSpace = workingSpace;
             this.conversionMatrix = GetRgbToCieXyzMatrix(workingSpace);
@@ -33,10 +33,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <summary>
         /// Gets the target working space
         /// </summary>
-        public IRgbWorkingSpace TargetWorkingSpace { get; }
+        public RgbWorkingSpace TargetWorkingSpace { get; }
 
         /// <inheritdoc/>
-        public LinearRgb Convert(CieXyz input)
+        public LinearRgb Convert(in CieXyz input)
         {
             Matrix4x4.Invert(this.conversionMatrix, out Matrix4x4 inverted);
             Vector3 vector = Vector3.Transform(input.Vector, inverted);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
index a0da2bc26..bc11c51b5 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbAndCieXyzConverterBase.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// </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(IRgbWorkingSpace workingSpace)
+        public static Matrix4x4 GetRgbToCieXyzMatrix(RgbWorkingSpace workingSpace)
         {
             DebugGuard.NotNull(workingSpace, nameof(workingSpace));
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
index 0746c78c3..e597b66af 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToCieXyzConverter.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     /// <summary>
     /// Color converter between LinearRgb and CieXyz
     /// </summary>
-    internal class LinearRgbToCieXyzConverter : LinearRgbAndCieXyzConverterBase, IColorConversion<LinearRgb, CieXyz>
+    internal sealed class LinearRgbToCieXyzConverter : LinearRgbAndCieXyzConverterBase, IColorConversion<LinearRgb, CieXyz>
     {
         private readonly Matrix4x4 conversionMatrix;
 
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// Initializes a new instance of the <see cref="LinearRgbToCieXyzConverter"/> class.
         /// </summary>
         /// <param name="workingSpace">The target working space.</param>
-        public LinearRgbToCieXyzConverter(IRgbWorkingSpace workingSpace)
+        public LinearRgbToCieXyzConverter(RgbWorkingSpace workingSpace)
         {
             this.SourceWorkingSpace = workingSpace;
             this.conversionMatrix = GetRgbToCieXyzMatrix(workingSpace);
@@ -33,10 +33,10 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
         /// <summary>
         /// Gets the source working space
         /// </summary>
-        public IRgbWorkingSpace SourceWorkingSpace { get; }
+        public RgbWorkingSpace SourceWorkingSpace { get; }
 
         /// <inheritdoc/>
-        public CieXyz Convert(LinearRgb input)
+        public CieXyz Convert(in LinearRgb input)
         {
             DebugGuard.IsTrue(input.WorkingSpace.Equals(this.SourceWorkingSpace), nameof(input.WorkingSpace), "Input and source working spaces must be equal.");
 
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
index 3b70c02af..34873c1f5 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/LinearRgbToRgbConverter.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     internal class LinearRgbToRgbConverter : IColorConversion<LinearRgb, Rgb>
     {
         /// <inheritdoc/>
-        public Rgb Convert(LinearRgb input)
+        public Rgb Convert(in LinearRgb input)
         {
             Vector3 vector = input.Vector;
             vector.X = input.WorkingSpace.Companding.Compress(vector.X);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs
index 8afe2ffa0..4359d666e 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RGBPrimariesChromaticityCoordinates.cs
@@ -7,7 +7,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
 {
     /// <summary>
     /// Represents the chromaticity coordinates of RGB primaries.
-    /// One of the specifiers of <see cref="IRgbWorkingSpace"/>.
+    /// One of the specifiers of <see cref="RgbWorkingSpace"/>.
     /// </summary>
     internal readonly struct RgbPrimariesChromaticityCoordinates : IEquatable<RgbPrimariesChromaticityCoordinates>
     {
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbToLinearRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbToLinearRgbConverter.cs
index ed415df8c..4cc3d607f 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbToLinearRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbToLinearRgbConverter.cs
@@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
     internal class RgbToLinearRgbConverter : IColorConversion<Rgb, LinearRgb>
     {
         /// <inheritdoc/>
-        public LinearRgb Convert(Rgb input)
+        public LinearRgb Convert(in Rgb input)
         {
             Vector3 vector = input.Vector;
             vector.X = input.WorkingSpace.Companding.Expand(vector.X);
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
index 530c01691..f4a79c744 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/Rgb/RgbWorkingSpace.cs
@@ -4,12 +4,12 @@
 namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce
 {
     /// <summary>
-    /// Trivial implementation of <see cref="IRgbWorkingSpace"/>
+    /// Trivial implementation of <see cref="RgbWorkingSpace"/>
     /// </summary>
-    internal readonly struct RgbWorkingSpace : IRgbWorkingSpace
+    internal class RgbWorkingSpace
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="RgbWorkingSpace"/> struct.
+        /// Initializes a new instance of the <see cref="RgbWorkingSpace"/> class.
         /// </summary>
         /// <param name="referenceWhite">The reference white point.</param>
         /// <param name="companding">The function pair for converting to <see cref="CieXyz"/> and back.</param>
@@ -70,14 +70,12 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSap
             return !Equals(left, right);
         }
 
-        /// <inheritdoc/>
         public override bool Equals(object obj)
         {
             return obj is RgbWorkingSpace other && this.Equals(other);
         }
 
-        /// <inheritdoc/>
-        public bool Equals(IRgbWorkingSpace other)
+        public bool Equals(RgbWorkingSpace other)
         {
             // TODO: Object.Equals for ICompanding will be slow.
             return this.WhitePoint.Equals(other.WhitePoint)
diff --git a/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs b/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
index 99149a592..e8d32572a 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/Implementation/YCbCr/YCbCrAndRgbConverter.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.YCbCrColorS
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb Convert(YCbCr input)
+        public Rgb Convert(in YCbCr input)
         {
             float y = input.Y;
             float cb = input.Cb - 128F;
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.YCbCrColorS
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public YCbCr Convert(Rgb input)
+        public YCbCr Convert(in Rgb input)
         {
             Vector3 rgb = input.Vector * MaxBytes;
             float r = rgb.X;
diff --git a/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs b/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
index 22ba5928e..0ab194af2 100644
--- a/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
+++ b/src/ImageSharp/ColorSpaces/Conversion/VonKriesChromaticAdaptation.cs
@@ -47,7 +47,7 @@ namespace SixLabors.ImageSharp.ColorSpaces.Conversion
         }
 
         /// <inheritdoc/>
-        public CieXyz Transform(CieXyz sourceColor, CieXyz sourceWhitePoint, CieXyz targetWhitePoint)
+        public CieXyz Transform(in CieXyz sourceColor, in CieXyz sourceWhitePoint, in CieXyz targetWhitePoint)
         {
             if (sourceWhitePoint.Equals(targetWhitePoint))
             {
diff --git a/src/ImageSharp/ColorSpaces/Hsl.cs b/src/ImageSharp/ColorSpaces/Hsl.cs
index 88b14fa97..8ed406753 100644
--- a/src/ImageSharp/ColorSpaces/Hsl.cs
+++ b/src/ImageSharp/ColorSpaces/Hsl.cs
@@ -14,12 +14,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
     internal readonly struct Hsl : IColorVector, IEquatable<Hsl>, IAlmostEquatable<Hsl, float>
     {
         /// <summary>
-        /// Represents a <see cref="Hsl"/> that has H, S, and L values set to zero.
-        /// </summary>
-        public static readonly Hsl Empty = default;
-
-        /// <summary>
-        /// Max range used for clamping
+        /// Max range used for clamping.
         /// </summary>
         private static readonly Vector3 VectorMax = new Vector3(360, 1, 1);
 
@@ -80,18 +75,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Hsl"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc/>
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="Hsl"/> objects for equality.
@@ -130,6 +115,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -138,16 +124,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "Hsl [ Empty ]";
-            }
-
-            return $"Hsl [ H={this.H:#0.##}, S={this.S:#0.##}, L={this.L:#0.##} ]";
+            return this.Equals(default)
+                ? "Hsl [ Empty ]"
+                : $"Hsl [ H={this.H:#0.##}, S={this.S:#0.##}, L={this.L:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is Hsl other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Hsv.cs b/src/ImageSharp/ColorSpaces/Hsv.cs
index 1f6c8d5eb..78a49097e 100644
--- a/src/ImageSharp/ColorSpaces/Hsv.cs
+++ b/src/ImageSharp/ColorSpaces/Hsv.cs
@@ -16,12 +16,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
     internal readonly struct Hsv : IColorVector, IEquatable<Hsv>, IAlmostEquatable<Hsv, float>
     {
         /// <summary>
-        /// Represents a <see cref="Hsv"/> that has H, S, and V values set to zero.
-        /// </summary>
-        public static readonly Hsv Empty = default;
-
-        /// <summary>
-        /// Max range used for clamping
+        /// Max range used for clamping.
         /// </summary>
         private static readonly Vector3 VectorMax = new Vector3(360, 1, 1);
 
@@ -82,18 +77,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Hsv"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc/>
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
@@ -182,6 +167,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -190,16 +176,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "Hsv [ Empty ]";
-            }
-
-            return $"Hsv [ H={this.H:#0.##}, S={this.S:#0.##}, V={this.V:#0.##} ]";
+            return this.Equals(default)
+                ? "Hsv [ Empty ]"
+                : $"Hsv [ H={this.H:#0.##}, S={this.S:#0.##}, V={this.V:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is Hsv other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/HunterLab.cs b/src/ImageSharp/ColorSpaces/HunterLab.cs
index 4395d9d7c..44f31bc29 100644
--- a/src/ImageSharp/ColorSpaces/HunterLab.cs
+++ b/src/ImageSharp/ColorSpaces/HunterLab.cs
@@ -20,11 +20,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// </summary>
         public static readonly CieXyz DefaultWhitePoint = Illuminants.C;
 
-        /// <summary>
-        /// Represents a <see cref="HunterLab"/> that has L, A, B values set to zero.
-        /// </summary>
-        public static readonly HunterLab Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -115,18 +110,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="HunterLab"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="HunterLab"/> objects for equality.
@@ -140,7 +125,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <returns>
         /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator ==(HunterLab left, HunterLab right)
         {
             return left.Equals(right);
@@ -165,29 +149,21 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
-            unchecked
-            {
-                int hashCode = this.WhitePoint.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.backingVector.GetHashCode();
-                return hashCode;
-            }
+            return HashHelpers.Combine(this.WhitePoint.GetHashCode(), this.backingVector.GetHashCode());
         }
 
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "HunterLab [Empty]";
-            }
-
-            return $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
+            return this.Equals(default)
+                ? "HunterLab [Empty]"
+                : $"HunterLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is HunterLab other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/ICompanding.cs b/src/ImageSharp/ColorSpaces/ICompanding.cs
index 2dfa575ed..053c8d17b 100644
--- a/src/ImageSharp/ColorSpaces/ICompanding.cs
+++ b/src/ImageSharp/ColorSpaces/ICompanding.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
+
 namespace SixLabors.ImageSharp.ColorSpaces
 {
     /// <summary>
-    /// Pair of companding functions for <see cref="IRgbWorkingSpace"/>.
+    /// Pair of companding functions for <see cref="RgbWorkingSpace"/>.
     /// Used for conversion to <see cref="CieXyz"/> and backwards.
-    /// See also: <seealso cref="IRgbWorkingSpace.Companding"/>
+    /// See also: <seealso cref="RgbWorkingSpace.Companding"/>
     /// </summary>
     internal interface ICompanding
     {
diff --git a/src/ImageSharp/ColorSpaces/IRgbWorkingSpace.cs b/src/ImageSharp/ColorSpaces/IRgbWorkingSpace.cs
deleted file mode 100644
index 156e94ed3..000000000
--- a/src/ImageSharp/ColorSpaces/IRgbWorkingSpace.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
-
-namespace SixLabors.ImageSharp.ColorSpaces
-{
-    /// <summary>
-    /// Encasulates the RGB working color space
-    /// </summary>
-    internal interface IRgbWorkingSpace : IEquatable<IRgbWorkingSpace>
-    {
-        /// <summary>
-        /// Gets the reference white of the color space
-        /// </summary>
-        CieXyz WhitePoint { get; }
-
-        /// <summary>
-        /// Gets the chromaticity coordinates of the primaries
-        /// </summary>
-        RgbPrimariesChromaticityCoordinates ChromaticityCoordinates { get; }
-
-        /// <summary>
-        /// Gets the companding function associated with the RGB color system. Used for conversion to XYZ and backwards.
-        /// <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"/>
-        /// </summary>
-        ICompanding Companding { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/ColorSpaces/LinearRgb.cs b/src/ImageSharp/ColorSpaces/LinearRgb.cs
index c721347be..aaf05e035 100644
--- a/src/ImageSharp/ColorSpaces/LinearRgb.cs
+++ b/src/ImageSharp/ColorSpaces/LinearRgb.cs
@@ -2,26 +2,21 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.ComponentModel;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
 
 namespace SixLabors.ImageSharp.ColorSpaces
 {
     /// <summary>
-    /// Represents an linear Rgb color with specified <see cref="IRgbWorkingSpace"/> working space
+    /// Represents an linear Rgb color with specified <see cref="RgbWorkingSpace"/> working space
     /// </summary>
     internal readonly struct LinearRgb : IColorVector, IEquatable<LinearRgb>, IAlmostEquatable<LinearRgb, float>
     {
         /// <summary>
-        /// Represents a <see cref="LinearRgb"/> that has R, G, and B values set to zero.
+        /// The default LinearRgb working space.
         /// </summary>
-        public static readonly LinearRgb Empty = default;
-
-        /// <summary>
-        /// The default LinearRgb working space
-        /// </summary>
-        public static readonly IRgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
+        public static readonly RgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
 
         /// <summary>
         /// The backing vector for SIMD support.
@@ -48,7 +43,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <param name="b">The blue component ranging between 0 and 1.</param>
         /// <param name="workingSpace">The rgb working space.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public LinearRgb(float r, float g, float b, IRgbWorkingSpace workingSpace)
+        public LinearRgb(float r, float g, float b, RgbWorkingSpace workingSpace)
             : this(new Vector3(r, g, b), workingSpace)
         {
         }
@@ -69,7 +64,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <param name="vector">The vector representing the r, g, b components.</param>
         /// <param name="workingSpace">The LinearRgb working space.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public LinearRgb(Vector3 vector, IRgbWorkingSpace workingSpace)
+        public LinearRgb(Vector3 vector, RgbWorkingSpace workingSpace)
             : this()
         {
             // Clamp to 0-1 range.
@@ -110,20 +105,10 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the LinearRgb color space <seealso cref="RgbWorkingSpaces"/>
         /// </summary>
-        public IRgbWorkingSpace WorkingSpace { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="LinearRgb"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
+        public RgbWorkingSpace WorkingSpace { get; }
 
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="LinearRgb"/> objects for equality.
@@ -162,6 +147,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -170,16 +156,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "LinearRgb [ Empty ]";
-            }
-
-            return $"LinearRgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
+            return this.Equals(default)
+                ? "LinearRgb [ Empty ]"
+                : $"LinearRgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is LinearRgb other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Lms.cs b/src/ImageSharp/ColorSpaces/Lms.cs
index e46249569..9b0331e0b 100644
--- a/src/ImageSharp/ColorSpaces/Lms.cs
+++ b/src/ImageSharp/ColorSpaces/Lms.cs
@@ -15,11 +15,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
     /// </summary>
     internal readonly struct Lms : IColorVector, IEquatable<Lms>, IAlmostEquatable<Lms, float>
     {
-        /// <summary>
-        /// Represents a <see cref="Lms"/> that has L, M, and S values set to zero.
-        /// </summary>
-        public static readonly Lms Empty = default;
-
         /// <summary>
         /// The backing vector for SIMD support.
         /// </summary>
@@ -79,18 +74,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Lms"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="Lms"/> objects for equality.
@@ -137,16 +122,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "Lms [ Empty ]";
-            }
-
-            return $"Lms [ L={this.L:#0.##}, M={this.M:#0.##}, S={this.S:#0.##} ]";
+            return this.Equals(default)
+                ? "Lms [ Empty ]"
+                : $"Lms [ L={this.L:#0.##}, M={this.M:#0.##}, S={this.S:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is Lms other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/Rgb.cs b/src/ImageSharp/ColorSpaces/Rgb.cs
index 8cdf54ace..ccfa1760f 100644
--- a/src/ImageSharp/ColorSpaces/Rgb.cs
+++ b/src/ImageSharp/ColorSpaces/Rgb.cs
@@ -2,28 +2,22 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.ComponentModel;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-
+using SixLabors.ImageSharp.ColorSpaces.Conversion.Implementation.RgbColorSapce;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.ColorSpaces
 {
     /// <summary>
-    /// Represents an RGB color with specified <see cref="IRgbWorkingSpace"/> working space
+    /// Represents an RGB color with specified <see cref="RgbWorkingSpace"/> working space
     /// </summary>
     internal readonly struct Rgb : IColorVector, IEquatable<Rgb>, IAlmostEquatable<Rgb, float>
     {
-        /// <summary>
-        /// Represents a <see cref="Rgb"/> that has R, G, and B values set to zero.
-        /// </summary>
-        public static readonly Rgb Empty = default;
-
         /// <summary>
         /// The default rgb working space
         /// </summary>
-        public static readonly IRgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
+        public static readonly RgbWorkingSpace DefaultWorkingSpace = RgbWorkingSpaces.SRgb;
 
         /// <summary>
         /// The backing vector for SIMD support.
@@ -50,7 +44,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <param name="b">The blue component ranging between 0 and 1.</param>
         /// <param name="workingSpace">The rgb working space.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb(float r, float g, float b, IRgbWorkingSpace workingSpace)
+        public Rgb(float r, float g, float b, RgbWorkingSpace workingSpace)
             : this(new Vector3(r, g, b), workingSpace)
         {
         }
@@ -71,7 +65,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <param name="vector">The vector representing the r, g, b components.</param>
         /// <param name="workingSpace">The rgb working space.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Rgb(Vector3 vector, IRgbWorkingSpace workingSpace)
+        public Rgb(Vector3 vector, RgbWorkingSpace workingSpace)
             : this()
         {
             // Clamp to 0-1 range.
@@ -112,24 +106,10 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <summary>
         /// Gets the Rgb color space <seealso cref="RgbWorkingSpaces"/>
         /// </summary>
-        public IRgbWorkingSpace WorkingSpace
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Rgb"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
+        public RgbWorkingSpace WorkingSpace { get; }
 
         /// <inheritdoc />
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
@@ -192,16 +172,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "Rgb [ Empty ]";
-            }
-
-            return $"Rgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
+            return this.Equals(default)
+                ? "Rgb [ Empty ]"
+                : $"Rgb [ R={this.R:#0.##}, G={this.G:#0.##}, B={this.B:#0.##} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is Rgb other && this.Equals(other);
diff --git a/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs b/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs
index 098ca9a4a..978a35725 100644
--- a/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs
+++ b/src/ImageSharp/ColorSpaces/RgbWorkingSpaces.cs
@@ -19,97 +19,97 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// Uses proper companding function, according to:
         /// <see href="http://www.brucelindbloom.com/index.html?Eqn_Rgb_to_XYZ.html"/>
         /// </remarks>
-        public static readonly IRgbWorkingSpace SRgb = new RgbWorkingSpace(Illuminants.D65, new SRgbCompanding(), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.3000F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
+        public static readonly RgbWorkingSpace SRgb = new RgbWorkingSpace(Illuminants.D65, new SRgbCompanding(), 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 IRgbWorkingSpace SRgbSimplified = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.3000F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
+        public static readonly RgbWorkingSpace SRgbSimplified = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), 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
+        /// Rec. 709 (ITU-R Recommendation BT.709) working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace Rec709 = new RgbWorkingSpace(Illuminants.D65, new Rec709Companding(), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.64F, 0.33F), new CieXyChromaticityCoordinates(0.30F, 0.60F), new CieXyChromaticityCoordinates(0.15F, 0.06F)));
+        public static readonly RgbWorkingSpace Rec709 = new RgbWorkingSpace(Illuminants.D65, new Rec709Companding(), 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
+        /// Rec. 2020 (ITU-R Recommendation BT.2020F) working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace Rec2020 = new RgbWorkingSpace(Illuminants.D65, new Rec2020Companding(), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.708F, 0.292F), new CieXyChromaticityCoordinates(0.170F, 0.797F), new CieXyChromaticityCoordinates(0.131F, 0.046F)));
+        public static readonly RgbWorkingSpace Rec2020 = new RgbWorkingSpace(Illuminants.D65, new Rec2020Companding(), 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
+        /// ECI Rgb v2 working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace ECIRgbv2 = new RgbWorkingSpace(Illuminants.D50, new LCompanding(), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6700F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1400F, 0.0800F)));
+        public static readonly RgbWorkingSpace ECIRgbv2 = new RgbWorkingSpace(Illuminants.D50, new LCompanding(), 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
+        /// Adobe Rgb (1998) working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace AdobeRgb1998 = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
+        public static readonly RgbWorkingSpace AdobeRgb1998 = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), 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
+        /// Apple sRgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace ApplesRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(1.8F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6250F, 0.3400F), new CieXyChromaticityCoordinates(0.2800F, 0.5950F), new CieXyChromaticityCoordinates(0.1550F, 0.0700F)));
+        public static readonly RgbWorkingSpace ApplesRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(1.8F), 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
+        /// Best Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace BestRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7347F, 0.2653F), new CieXyChromaticityCoordinates(0.2150F, 0.7750F), new CieXyChromaticityCoordinates(0.1300F, 0.0350F)));
+        public static readonly RgbWorkingSpace BestRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), 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
+        /// Beta Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace BetaRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6888F, 0.3112F), new CieXyChromaticityCoordinates(0.1986F, 0.7551F), new CieXyChromaticityCoordinates(0.1265F, 0.0352F)));
+        public static readonly RgbWorkingSpace BetaRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), 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
+        /// Bruce Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace BruceRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2800F, 0.6500F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
+        public static readonly RgbWorkingSpace BruceRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), 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
+        /// CIE Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace CIERgb = new RgbWorkingSpace(Illuminants.E, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7350F, 0.2650F), new CieXyChromaticityCoordinates(0.2740F, 0.7170F), new CieXyChromaticityCoordinates(0.1670F, 0.0090F)));
+        public static readonly RgbWorkingSpace CIERgb = new RgbWorkingSpace(Illuminants.E, new GammaCompanding(2.2F), 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
+        /// ColorMatch Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace ColorMatchRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(1.8F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6300F, 0.3400F), new CieXyChromaticityCoordinates(0.2950F, 0.6050F), new CieXyChromaticityCoordinates(0.1500F, 0.0750F)));
+        public static readonly RgbWorkingSpace ColorMatchRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(1.8F), 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
+        /// Don Rgb 4 working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace DonRgb4 = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6960F, 0.3000F), new CieXyChromaticityCoordinates(0.2150F, 0.7650F), new CieXyChromaticityCoordinates(0.1300F, 0.0350F)));
+        public static readonly RgbWorkingSpace DonRgb4 = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), 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
+        /// Ekta Space PS5 working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace EktaSpacePS5 = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6950F, 0.3050F), new CieXyChromaticityCoordinates(0.2600F, 0.7000F), new CieXyChromaticityCoordinates(0.1100F, 0.0050F)));
+        public static readonly RgbWorkingSpace EktaSpacePS5 = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), 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
+        /// NTSC Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace NTSCRgb = new RgbWorkingSpace(Illuminants.C, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6700F, 0.3300F), new CieXyChromaticityCoordinates(0.2100F, 0.7100F), new CieXyChromaticityCoordinates(0.1400F, 0.0800F)));
+        public static readonly RgbWorkingSpace NTSCRgb = new RgbWorkingSpace(Illuminants.C, new GammaCompanding(2.2F), 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
+        /// PAL/SECAM Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace PALSECAMRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6400F, 0.3300F), new CieXyChromaticityCoordinates(0.2900F, 0.6000F), new CieXyChromaticityCoordinates(0.1500F, 0.0600F)));
+        public static readonly RgbWorkingSpace PALSECAMRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), 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
+        /// ProPhoto Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace ProPhotoRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(1.8F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7347F, 0.2653F), new CieXyChromaticityCoordinates(0.1596F, 0.8404F), new CieXyChromaticityCoordinates(0.0366F, 0.0001F)));
+        public static readonly RgbWorkingSpace ProPhotoRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(1.8F), 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
+        /// SMPTE-C Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace SMPTECRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.6300F, 0.3400F), new CieXyChromaticityCoordinates(0.3100F, 0.5950F), new CieXyChromaticityCoordinates(0.1550F, 0.0700F)));
+        public static readonly RgbWorkingSpace SMPTECRgb = new RgbWorkingSpace(Illuminants.D65, new GammaCompanding(2.2F), 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
+        /// Wide Gamut Rgb working space.
         /// </summary>
-        public static readonly IRgbWorkingSpace WideGamutRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7350F, 0.2650F), new CieXyChromaticityCoordinates(0.1150F, 0.8260F), new CieXyChromaticityCoordinates(0.1570F, 0.0180F)));
+        public static readonly RgbWorkingSpace WideGamutRgb = new RgbWorkingSpace(Illuminants.D50, new GammaCompanding(2.2F), new RgbPrimariesChromaticityCoordinates(new CieXyChromaticityCoordinates(0.7350F, 0.2650F), new CieXyChromaticityCoordinates(0.1150F, 0.8260F), new CieXyChromaticityCoordinates(0.1570F, 0.0180F)));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/ColorSpaces/YCbCr.cs b/src/ImageSharp/ColorSpaces/YCbCr.cs
index 2c3feffa9..00533c699 100644
--- a/src/ImageSharp/ColorSpaces/YCbCr.cs
+++ b/src/ImageSharp/ColorSpaces/YCbCr.cs
@@ -16,12 +16,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
     internal readonly struct YCbCr : IColorVector, IEquatable<YCbCr>, IAlmostEquatable<YCbCr, float>
     {
         /// <summary>
-        /// Represents a <see cref="YCbCr"/> that has Y, Cb, and Cr values set to zero.
-        /// </summary>
-        public static readonly YCbCr Empty = default;
-
-        /// <summary>
-        /// Vector which is used in clamping to the max value
+        /// Vector which is used in clamping to the max value.
         /// </summary>
         private static readonly Vector3 VectorMax = new Vector3(255F);
 
@@ -82,18 +77,8 @@ namespace SixLabors.ImageSharp.ColorSpaces
             get => this.backingVector.Z;
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="YCbCr"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
         /// <inheritdoc/>
-        public Vector3 Vector
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.backingVector;
-        }
+        public Vector3 Vector => this.backingVector;
 
         /// <summary>
         /// Compares two <see cref="YCbCr"/> objects for equality.
@@ -107,7 +92,6 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <returns>
         /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator ==(YCbCr left, YCbCr right)
         {
             return left.Equals(right);
@@ -132,6 +116,7 @@ namespace SixLabors.ImageSharp.ColorSpaces
         }
 
         /// <inheritdoc/>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()
         {
             return this.backingVector.GetHashCode();
@@ -140,16 +125,12 @@ namespace SixLabors.ImageSharp.ColorSpaces
         /// <inheritdoc/>
         public override string ToString()
         {
-            if (this.IsEmpty)
-            {
-                return "YCbCr [ Empty ]";
-            }
-
-            return $"YCbCr [ Y={this.Y}, Cb={this.Cb}, Cr={this.Cr} ]";
+            return this.Equals(default)
+                ? "YCbCr [ Empty ]"
+                : $"YCbCr [ Y={this.Y}, Cb={this.Cb}, Cr={this.Cr} ]";
         }
 
         /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             return obj is YCbCr other && this.Equals(other);
diff --git a/src/ImageSharp/Common/Constants.cs b/src/ImageSharp/Common/Constants.cs
index b7cfddcb6..a8a693fa6 100644
--- a/src/ImageSharp/Common/Constants.cs
+++ b/src/ImageSharp/Common/Constants.cs
@@ -18,4 +18,4 @@ namespace SixLabors.ImageSharp
         /// </summary>
         public static readonly float EpsilonSquared = Epsilon * Epsilon;
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
index 88712a736..b88c229c5 100644
--- a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
+++ b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
@@ -110,4 +110,4 @@ namespace SixLabors.ImageSharp
             return MathF.Pow((signal + 0.055F) / 1.055F, 2.4F);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Common/Helpers/ParallelFor.cs b/src/ImageSharp/Common/Helpers/ParallelFor.cs
index 7061475a7..02c6deda3 100644
--- a/src/ImageSharp/Common/Helpers/ParallelFor.cs
+++ b/src/ImageSharp/Common/Helpers/ParallelFor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using SixLabors.Memory;
 
@@ -32,23 +33,23 @@ namespace SixLabors.ImageSharp
             int toExclusive,
             Configuration configuration,
             int bufferLength,
-            Action<int, IBuffer<T>> body)
+            Action<int, IMemoryOwner<T>> body)
             where T : struct
         {
             MemoryAllocator memoryAllocator = configuration.MemoryAllocator;
             ParallelOptions parallelOptions = configuration.ParallelOptions;
 
-            IBuffer<T> InitBuffer()
+            IMemoryOwner<T> InitBuffer()
             {
                 return memoryAllocator.Allocate<T>(bufferLength);
             }
 
-            void CleanUpBuffer(IBuffer<T> buffer)
+            void CleanUpBuffer(IMemoryOwner<T> buffer)
             {
                 buffer.Dispose();
             }
 
-            IBuffer<T> BodyFunc(int i, ParallelLoopState state, IBuffer<T> buffer)
+            IMemoryOwner<T> BodyFunc(int i, ParallelLoopState state, IMemoryOwner<T> buffer)
             {
                 body(i, buffer);
                 return buffer;
diff --git a/src/ImageSharp/Common/Helpers/UnitConverter.cs b/src/ImageSharp/Common/Helpers/UnitConverter.cs
new file mode 100644
index 000000000..c8b25bf56
--- /dev/null
+++ b/src/ImageSharp/Common/Helpers/UnitConverter.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+
+namespace SixLabors.ImageSharp.Common.Helpers
+{
+    /// <summary>
+    /// Contains methods for converting values between unit scales.
+    /// </summary>
+    internal static class UnitConverter
+    {
+        /// <summary>
+        /// The number of centimeters in a meter.
+        /// 1 cm is equal to exactly 0.01 meters.
+        /// </summary>
+        private const double CmsInMeter = 1 / 0.01D;
+
+        /// <summary>
+        /// The number of centimeters in an inch.
+        /// 1 inch is equal to exactly 2.54 centimeters.
+        /// </summary>
+        private const double CmsInInch = 2.54D;
+
+        /// <summary>
+        /// The number of inches in a meter.
+        /// 1 inch is equal to exactly 0.0254 meters.
+        /// </summary>
+        private const double InchesInMeter = 1 / 0.0254D;
+
+        /// <summary>
+        /// Scales the value from centimeters to meters.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double CmToMeter(double x) => x * CmsInMeter;
+
+        /// <summary>
+        /// Scales the value from meters to centimeters.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double MeterToCm(double x) => x / CmsInMeter;
+
+        /// <summary>
+        /// Scales the value from meters to inches.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double MeterToInch(double x) => x / InchesInMeter;
+
+        /// <summary>
+        /// Scales the value from inches to meters.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double InchToMeter(double x) => x * InchesInMeter;
+
+        /// <summary>
+        /// Scales the value from centimeters to inches.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double CmToInch(double x) => x / CmsInInch;
+
+        /// <summary>
+        /// Scales the value from inches to centimeters.
+        /// </summary>
+        /// <param name="x">The value to scale.</param>
+        /// <returns>The <see cref="double"/>.</returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static double InchToCm(double x) => x * CmsInInch;
+
+        /// <summary>
+        /// Converts an <see cref="ExifTag.ResolutionUnit"/> to a <see cref="PixelResolutionUnit"/>.
+        /// </summary>
+        /// <param name="profile">The EXIF profile containing the value.</param>
+        /// <returns>The <see cref="PixelResolutionUnit"/></returns>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        public static PixelResolutionUnit ExifProfileToResolutionUnit(ExifProfile profile)
+        {
+            return profile.TryGetValue(ExifTag.ResolutionUnit, out ExifValue resolution)
+                ? (PixelResolutionUnit)(byte)(((ushort)resolution.Value) - 1) // EXIF is 1, 2, 3
+                : default;
+        }
+    }
+}
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 20175613e..612850e5f 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -5,6 +5,7 @@ using System;
 using System.Buffers.Binary;
 using System.IO;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
@@ -59,6 +60,11 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// </summary>
         private Stream stream;
 
+        /// <summary>
+        /// The metadata
+        /// </summary>
+        private ImageMetaData metaData;
+
         /// <summary>
         /// The file header containing general information.
         /// TODO: Why is this not used? We advance the stream but do not use the values parsed.
@@ -103,7 +109,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             {
                 this.ReadImageHeaders(stream, out bool inverted, out byte[] palette);
 
-                var image = new Image<TPixel>(this.configuration, this.infoHeader.Width, this.infoHeader.Height);
+                var image = new Image<TPixel>(this.configuration, this.infoHeader.Width, this.infoHeader.Height, this.metaData);
 
                 Buffer2D<TPixel> pixels = image.GetRootFramePixelBuffer();
 
@@ -157,7 +163,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         public IImageInfo Identify(Stream stream)
         {
             this.ReadImageHeaders(stream, out _, out _);
-            return new ImageInfo(new PixelTypeInfo(this.infoHeader.BitsPerPixel), this.infoHeader.Width, this.infoHeader.Height, new ImageMetaData());
+            return new ImageInfo(new PixelTypeInfo(this.infoHeader.BitsPerPixel), this.infoHeader.Width, this.infoHeader.Height, this.metaData);
         }
 
         /// <summary>
@@ -220,7 +226,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             TPixel color = default;
             var rgba = new Rgba32(0, 0, 0, 255);
 
-            using (Buffer2D<byte> buffer = this.memoryAllocator.AllocateClean2D<byte>(width, height))
+            using (Buffer2D<byte> buffer = this.memoryAllocator.Allocate2D<byte>(width, height, AllocationOptions.Clean))
             {
                 this.UncompressRle8(width, buffer.GetSpan());
 
@@ -348,7 +354,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 padding = 4 - padding;
             }
 
-            using (IManagedByteBuffer row = this.memoryAllocator.AllocateCleanManagedByteBuffer(arrayWidth + padding))
+            using (IManagedByteBuffer row = this.memoryAllocator.AllocateManagedByteBuffer(arrayWidth + padding, AllocationOptions.Clean))
             {
                 TPixel color = default;
                 var rgba = new Rgba32(0, 0, 0, 255);
@@ -518,6 +524,23 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 throw new NotSupportedException($"ImageSharp does not support this BMP file. HeaderSize: {headerSize}.");
             }
 
+            // Resolution is stored in PPM.
+            var meta = new ImageMetaData();
+            meta.ResolutionUnits = PixelResolutionUnit.PixelsPerMeter;
+            if (this.infoHeader.XPelsPerMeter > 0 && this.infoHeader.YPelsPerMeter > 0)
+            {
+                meta.HorizontalResolution = this.infoHeader.XPelsPerMeter;
+                meta.VerticalResolution = this.infoHeader.YPelsPerMeter;
+            }
+            else
+            {
+                // Convert default metadata values to PPM.
+                meta.HorizontalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetaData.DefaultHorizontalResolution));
+                meta.VerticalResolution = Math.Round(UnitConverter.InchToMeter(ImageMetaData.DefaultVerticalResolution));
+            }
+
+            this.metaData = meta;
+
             // skip the remaining header because we can't read those parts
             this.stream.Skip(skipAmount);
         }
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index a4e61f910..80fc6330a 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -3,6 +3,8 @@
 
 using System;
 using System.IO;
+using SixLabors.ImageSharp.Common.Helpers;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 
@@ -50,6 +52,38 @@ namespace SixLabors.ImageSharp.Formats.Bmp
             int bytesPerLine = 4 * (((image.Width * bpp) + 31) / 32);
             this.padding = bytesPerLine - (image.Width * (int)this.bitsPerPixel);
 
+            // Set Resolution.
+            ImageMetaData meta = image.MetaData;
+            int hResolution = 0;
+            int vResolution = 0;
+
+            if (meta.ResolutionUnits != PixelResolutionUnit.AspectRatio)
+            {
+                if (meta.HorizontalResolution > 0 && meta.VerticalResolution > 0)
+                {
+                    switch (meta.ResolutionUnits)
+                    {
+                        case PixelResolutionUnit.PixelsPerInch:
+
+                            hResolution = (int)Math.Round(UnitConverter.InchToMeter(meta.HorizontalResolution));
+                            vResolution = (int)Math.Round(UnitConverter.InchToMeter(meta.VerticalResolution));
+                            break;
+
+                        case PixelResolutionUnit.PixelsPerCentimeter:
+
+                            hResolution = (int)Math.Round(UnitConverter.CmToMeter(meta.HorizontalResolution));
+                            vResolution = (int)Math.Round(UnitConverter.CmToMeter(meta.VerticalResolution));
+                            break;
+
+                        case PixelResolutionUnit.PixelsPerMeter:
+                            hResolution = (int)Math.Round(meta.HorizontalResolution);
+                            vResolution = (int)Math.Round(meta.VerticalResolution);
+
+                            break;
+                    }
+                }
+            }
+
             var infoHeader = new BmpInfoHeader(
                 headerSize: BmpInfoHeader.Size,
                 height: image.Height,
@@ -58,7 +92,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
                 planes: 1,
                 imageSize: image.Height * bytesPerLine,
                 clrUsed: 0,
-                clrImportant: 0);
+                clrImportant: 0,
+                xPelsPerMeter: hResolution,
+                yPelsPerMeter: vResolution);
 
             var fileHeader = new BmpFileHeader(
                 type: 19778, // BM
diff --git a/src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs b/src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs
index 0bfd6980b..56952f035 100644
--- a/src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs
@@ -14,4 +14,4 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// </summary>
         BmpBitsPerPixel BitsPerPixel { get; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/DisposalMethod.cs b/src/ImageSharp/Formats/Gif/DisposalMethod.cs
index 5371fc0fa..5d3e1b4d8 100644
--- a/src/ImageSharp/Formats/Gif/DisposalMethod.cs
+++ b/src/ImageSharp/Formats/Gif/DisposalMethod.cs
@@ -35,4 +35,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         RestoreToPrevious = 3
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index fc73f55a1..591f787ea 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -321,11 +321,11 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 if (imageDescriptor.LocalColorTableFlag)
                 {
                     int length = imageDescriptor.LocalColorTableSize * 3;
-                    localColorTable = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(length, true);
+                    localColorTable = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(length, AllocationOptions.Clean);
                     this.stream.Read(localColorTable.Array, 0, length);
                 }
 
-                indices = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, true);
+                indices = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(imageDescriptor.Width * imageDescriptor.Height, AllocationOptions.Clean);
 
                 this.ReadFrameIndices(imageDescriptor, indices.GetSpan());
                 ReadOnlySpan<Rgb24> colorTable = MemoryMarshal.Cast<byte, Rgb24>((localColorTable ?? this.globalColorTable).GetSpan());
@@ -450,8 +450,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 {
                     int index = Unsafe.Add(ref indicesRef, i);
 
-                    if (this.graphicsControlExtension.TransparencyFlag == false ||
-                        this.graphicsControlExtension.TransparencyIndex != index)
+                    if (!this.graphicsControlExtension.TransparencyFlag
+                        || this.graphicsControlExtension.TransparencyIndex != index)
                     {
                         ref TPixel pixel = ref Unsafe.Add(ref rowRef, x);
                         rgba.Rgb = colorTable[index];
@@ -516,19 +516,47 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <param name="stream">The stream containing image data. </param>
         private void ReadLogicalScreenDescriptorAndGlobalColorTable(Stream stream)
         {
-            this.metaData = new ImageMetaData();
-
             this.stream = stream;
 
             // Skip the identifier
             this.stream.Skip(6);
             this.ReadLogicalScreenDescriptor();
 
+            var meta = new ImageMetaData();
+
+            // The Pixel Aspect Ratio is defined to be the quotient of the pixel's
+            // width over its height.  The value range in this field allows
+            // specification of the widest pixel of 4:1 to the tallest pixel of
+            // 1:4 in increments of 1/64th.
+            //
+            // Values :        0 -   No aspect ratio information is given.
+            //            1..255 -   Value used in the computation.
+            //
+            // Aspect Ratio = (Pixel Aspect Ratio + 15) / 64
+            if (this.logicalScreenDescriptor.PixelAspectRatio > 0)
+            {
+                meta.ResolutionUnits = PixelResolutionUnit.AspectRatio;
+                float ratio = (this.logicalScreenDescriptor.PixelAspectRatio + 15) / 64F;
+
+                if (ratio > 1)
+                {
+                    meta.HorizontalResolution = ratio;
+                    meta.VerticalResolution = 1;
+                }
+                else
+                {
+                    meta.VerticalResolution = 1 / ratio;
+                    meta.HorizontalResolution = 1;
+                }
+            }
+
+            this.metaData = meta;
+
             if (this.logicalScreenDescriptor.GlobalColorTableFlag)
             {
                 int globalColorTableLength = this.logicalScreenDescriptor.GlobalColorTableSize * 3;
 
-                this.globalColorTable = this.MemoryAllocator.AllocateManagedByteBuffer(globalColorTableLength, true);
+                this.globalColorTable = this.MemoryAllocator.AllocateManagedByteBuffer(globalColorTableLength, AllocationOptions.Clean);
 
                 // Read the global color table data from the stream
                 stream.Read(this.globalColorTable.Array, 0, globalColorTableLength);
diff --git a/src/ImageSharp/Formats/Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs
index 07a70ad96..e8e28ccdd 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoder.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Gif
 {
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index 8a6415c3b..ea507c781 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Gif
@@ -226,11 +226,41 @@ namespace SixLabors.ImageSharp.Formats.Gif
         {
             byte packedValue = GifLogicalScreenDescriptor.GetPackedValue(useGlobalTable, this.bitDepth - 1, false, this.bitDepth - 1);
 
+            // The Pixel Aspect Ratio is defined to be the quotient of the pixel's
+            // width over its height.  The value range in this field allows
+            // specification of the widest pixel of 4:1 to the tallest pixel of
+            // 1:4 in increments of 1/64th.
+            //
+            // Values :        0 -   No aspect ratio information is given.
+            //            1..255 -   Value used in the computation.
+            //
+            // Aspect Ratio = (Pixel Aspect Ratio + 15) / 64
+            ImageMetaData meta = image.MetaData;
+            byte ratio = 0;
+
+            if (meta.ResolutionUnits == PixelResolutionUnit.AspectRatio)
+            {
+                double hr = meta.HorizontalResolution;
+                double vr = meta.VerticalResolution;
+                if (hr != vr)
+                {
+                    if (hr > vr)
+                    {
+                        ratio = (byte)((hr * 64) - 15);
+                    }
+                    else
+                    {
+                        ratio = (byte)(((1 / vr) * 64) - 15);
+                    }
+                }
+            }
+
             var descriptor = new GifLogicalScreenDescriptor(
                 width: (ushort)image.Width,
                 height: (ushort)image.Height,
                 packed: packedValue,
-                backgroundColorIndex: unchecked((byte)transparencyIndex));
+                backgroundColorIndex: unchecked((byte)transparencyIndex),
+                ratio);
 
             descriptor.WriteTo(this.buffer);
 
diff --git a/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs b/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
index 30e476e7e..bad6e0031 100644
--- a/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Text;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Gif
 {
diff --git a/src/ImageSharp/Formats/Gif/LzwDecoder.cs b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
index 35eb43a8a..7a2aef180 100644
--- a/src/ImageSharp/Formats/Gif/LzwDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwDecoder.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -32,17 +33,17 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The prefix buffer.
         /// </summary>
-        private readonly IBuffer<int> prefix;
+        private readonly IMemoryOwner<int> prefix;
 
         /// <summary>
         /// The suffix buffer.
         /// </summary>
-        private readonly IBuffer<int> suffix;
+        private readonly IMemoryOwner<int> suffix;
 
         /// <summary>
         /// The pixel stack buffer.
         /// </summary>
-        private readonly IBuffer<int> pixelStack;
+        private readonly IMemoryOwner<int> pixelStack;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LzwDecoder"/> class
@@ -57,9 +58,9 @@ namespace SixLabors.ImageSharp.Formats.Gif
 
             this.stream = stream;
 
-            this.prefix = memoryAllocator.Allocate<int>(MaxStackSize, true);
-            this.suffix = memoryAllocator.Allocate<int>(MaxStackSize, true);
-            this.pixelStack = memoryAllocator.Allocate<int>(MaxStackSize + 1, true);
+            this.prefix = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
+            this.suffix = memoryAllocator.Allocate<int>(MaxStackSize, AllocationOptions.Clean);
+            this.pixelStack = memoryAllocator.Allocate<int>(MaxStackSize + 1, AllocationOptions.Clean);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Gif/LzwEncoder.cs b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
index 347609a54..002457db3 100644
--- a/src/ImageSharp/Formats/Gif/LzwEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/LzwEncoder.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -66,12 +67,12 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <summary>
         /// The hash table.
         /// </summary>
-        private readonly IBuffer<int> hashTable;
+        private readonly IMemoryOwner<int> hashTable;
 
         /// <summary>
         /// The code table.
         /// </summary>
-        private readonly IBuffer<int> codeTable;
+        private readonly IMemoryOwner<int> codeTable;
 
         /// <summary>
         /// Define the storage for the packet accumulator.
@@ -168,8 +169,8 @@ namespace SixLabors.ImageSharp.Formats.Gif
         public LzwEncoder(MemoryAllocator memoryAllocator, int colorDepth)
         {
             this.initialCodeSize = Math.Max(2, colorDepth);
-            this.hashTable = memoryAllocator.Allocate<int>(HashSize, true);
-            this.codeTable = memoryAllocator.Allocate<int>(HashSize, true);
+            this.hashTable = memoryAllocator.Allocate<int>(HashSize, AllocationOptions.Clean);
+            this.codeTable = memoryAllocator.Allocate<int>(HashSize, AllocationOptions.Clean);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FastACTables.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FastACTables.cs
similarity index 87%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FastACTables.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FastACTables.cs
index 6cb0d6dfe..95693c09b 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FastACTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FastACTables.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// The collection of lookup tables used for fast AC entropy scan decoding.
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <param name="memoryAllocator">The memory allocator used to allocate memory for image processing operations.</param>
         public FastACTables(MemoryAllocator memoryAllocator)
         {
-            this.tables = memoryAllocator.AllocateClean2D<short>(512, 4);
+            this.tables = memoryAllocator.Allocate2D<short>(512, 4, AllocationOptions.Clean);
         }
 
         /// <summary>
@@ -35,10 +35,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         /// <summary>
-        /// Gets a reference to the first element of the AC table indexed by <see cref="PdfJsFrameComponent.ACHuffmanTableId"/>
-        /// </summary>
+        /// Gets a reference to the first element of the AC table indexed by <see cref="JpegComponent.ACHuffmanTableId"/>       /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref short GetAcTableReference(PdfJsFrameComponent component)
+        public ref short GetAcTableReference(JpegComponent component)
         {
             return ref this.tables.GetRowSpan(component.ACHuffmanTableId)[0];
         }
@@ -48,11 +47,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// </summary>
         /// <param name="index">The table index.</param>
         /// <param name="acHuffmanTables">The collection of AC Huffman tables.</param>
-        public void BuildACTableLut(int index, PdfJsHuffmanTables acHuffmanTables)
+        public void BuildACTableLut(int index, HuffmanTables acHuffmanTables)
         {
             const int FastBits = ScanDecoder.FastBits;
             Span<short> fastAC = this.tables.GetRowSpan(index);
-            ref PdfJsHuffmanTable huffman = ref acHuffmanTables[index];
+            ref HuffmanTable huffman = ref acHuffmanTables[index];
 
             int i;
             for (i = 0; i < (1 << FastBits); i++)
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer256.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer256.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer256.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer256.cs
index 5870e3da8..1d26178e0 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer256.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer256.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct FixedByteBuffer256
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer512.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer512.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer512.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer512.cs
index c509903c9..556e74fd5 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedByteBuffer512.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedByteBuffer512.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct FixedByteBuffer512
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt16Buffer257.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt16Buffer257.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt16Buffer257.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt16Buffer257.cs
index b304dbf8c..a3b67a700 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt16Buffer257.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt16Buffer257.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct FixedInt16Buffer257
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt32Buffer18.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt32Buffer18.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt32Buffer18.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt32Buffer18.cs
index f8507ec47..bba89f072 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedInt32Buffer18.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedInt32Buffer18.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct FixedInt32Buffer18
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedUInt32Buffer18.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedUInt32Buffer18.cs
similarity index 90%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedUInt32Buffer18.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedUInt32Buffer18.cs
index 9b076d9da..1d3ca9933 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FixedUInt32Buffer18.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/FixedUInt32Buffer18.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     [StructLayout(LayoutKind.Sequential)]
     internal unsafe struct FixedUInt32Buffer18
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTable.cs
similarity index 91%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTable.cs
index 15ae56331..f159bda07 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTable.cs
@@ -2,17 +2,18 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Represents a Huffman Table
     /// </summary>
     [StructLayout(LayoutKind.Sequential)]
-    internal unsafe struct PdfJsHuffmanTable
+    internal unsafe struct HuffmanTable
     {
         /// <summary>
         /// Gets the max code array
@@ -40,15 +41,15 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         public FixedInt16Buffer257 Sizes;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PdfJsHuffmanTable"/> struct.
+        /// Initializes a new instance of the <see cref="HuffmanTable"/> struct.
         /// </summary>
         /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/> to use for buffer allocations.</param>
         /// <param name="count">The code lengths</param>
         /// <param name="values">The huffman values</param>
-        public PdfJsHuffmanTable(MemoryAllocator memoryAllocator, ReadOnlySpan<byte> count, ReadOnlySpan<byte> values)
+        public HuffmanTable(MemoryAllocator memoryAllocator, ReadOnlySpan<byte> count, ReadOnlySpan<byte> values)
         {
             const int Length = 257;
-            using (IBuffer<short> huffcode = memoryAllocator.Allocate<short>(Length))
+            using (IMemoryOwner<short> huffcode = memoryAllocator.Allocate<short>(Length))
             {
                 ref short huffcodeRef = ref MemoryMarshal.GetReference(huffcode.GetSpan());
 
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTables.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTables.cs
similarity index 54%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTables.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTables.cs
index 5cbde2b88..dc066aa0a 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/HuffmanTables.cs
@@ -1,24 +1,23 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
-    /// Defines a 2 pairs of huffman tables
+    /// Defines a 2 pairs of huffman tables.
     /// </summary>
-    internal sealed class PdfJsHuffmanTables
+    internal sealed class HuffmanTables
     {
-        private readonly PdfJsHuffmanTable[] tables = new PdfJsHuffmanTable[4];
+        private readonly HuffmanTable[] tables = new HuffmanTable[4];
 
         /// <summary>
         /// Gets or sets the table at the given index.
         /// </summary>
         /// <param name="index">The index</param>
-        /// <returns>The <see cref="PdfJsHuffmanTable"/></returns>
-        public ref PdfJsHuffmanTable this[int index]
+        /// <returns>The <see cref="HuffmanTable"/></returns>
+        public ref HuffmanTable this[int index]
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => ref this.tables[index];
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
index 591af6344..f153ce062 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JFifMarker.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using SixLabors.ImageSharp.MetaData;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
@@ -28,10 +29,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         {
             Guard.MustBeGreaterThan(xDensity, 0, nameof(xDensity));
             Guard.MustBeGreaterThan(yDensity, 0, nameof(yDensity));
+            Guard.MustBeBetweenOrEqualTo(densityUnits, 0, 2, nameof(densityUnits));
 
             this.MajorVersion = majorVersion;
             this.MinorVersion = minorVersion;
-            this.DensityUnits = densityUnits;
+            this.DensityUnits = (PixelResolutionUnit)densityUnits;
             this.XDensity = xDensity;
             this.YDensity = yDensity;
         }
@@ -52,7 +54,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         ///  01 : Pixels per inch (2.54 cm)
         ///  02 : Pixels per centimeter
         /// </summary>
-        public byte DensityUnits { get; }
+        public PixelResolutionUnit DensityUnits { get; }
 
         /// <summary>
         /// Gets the horizontal pixel density. Must not be zero.
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs
index 2baefff9b..87f675491 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegBlockPostProcessor.cs
@@ -9,7 +9,7 @@ using SixLabors.Primitives;
 namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
-    /// Encapsulates the implementation of processing "raw" <see cref="IBuffer{T}"/>-s into Jpeg image channels.
+    /// Encapsulates the implementation of processing "raw" jpeg buffers into Jpeg image channels.
     /// </summary>
     [StructLayout(LayoutKind.Sequential)]
     internal struct JpegBlockPostProcessor
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs
similarity index 82%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs
index 7501b0d83..73a69a069 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegComponent.cs
@@ -5,21 +5,19 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Represents a single frame component
     /// </summary>
-    internal class PdfJsFrameComponent : IDisposable, IJpegComponent
+    internal class JpegComponent : IDisposable, IJpegComponent
     {
         private readonly MemoryAllocator memoryAllocator;
 
-        public PdfJsFrameComponent(MemoryAllocator memoryAllocator, PdfJsFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index)
+        public JpegComponent(MemoryAllocator memoryAllocator, JpegFrame frame, byte id, int horizontalFactor, int verticalFactor, byte quantizationTableIndex, int index)
         {
             this.memoryAllocator = memoryAllocator;
             this.Frame = frame;
@@ -89,7 +87,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// </summary>
         public int ACHuffmanTableId { get; set; }
 
-        public PdfJsFrame Frame { get; }
+        public JpegFrame Frame { get; }
 
         /// <inheritdoc/>
         public void Dispose()
@@ -125,11 +123,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             }
             else
             {
-                PdfJsFrameComponent c0 = this.Frame.Components[0];
+                JpegComponent c0 = this.Frame.Components[0];
                 this.SubSamplingDivisors = c0.SamplingFactors.DivideBy(this.SamplingFactors);
             }
 
-            this.SpectralBlocks = this.memoryAllocator.AllocateClean2D<Block8x8>(blocksPerColumnForMcu, blocksPerLineForMcu + 1);
+            this.SpectralBlocks = this.memoryAllocator.Allocate2D<Block8x8>(blocksPerColumnForMcu, blocksPerLineForMcu + 1, AllocationOptions.Clean);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -140,16 +138,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int GetBlockBufferOffset(int row, int col)
+        public ref short GetBlockDataReference(int column, int row)
         {
-            return 64 * (((this.WidthInBlocks + 1) * row) + col);
-        }
-
-        // TODO: we need consistence in (row, col) VS (col, row) ordering
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref short GetBlockDataReference(int row, int col)
-        {
-            ref Block8x8 blockRef = ref this.GetBlockReference(col, row);
+            ref Block8x8 blockRef = ref this.GetBlockReference(column, row);
             return ref Unsafe.As<Block8x8, short>(ref blockRef);
         }
     }
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFileMarker.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFileMarker.cs
similarity index 74%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFileMarker.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFileMarker.cs
index 85c9f9466..d2b0ee26e 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFileMarker.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFileMarker.cs
@@ -3,32 +3,30 @@
 
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
-    /// Represents a jpeg file marker
+    /// Represents a jpeg file marker.
     /// </summary>
-    internal readonly struct PdfJsFileMarker
+    internal readonly struct JpegFileMarker
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="PdfJsFileMarker"/> struct.
+        /// Initializes a new instance of the <see cref="JpegFileMarker"/> struct.
         /// </summary>
         /// <param name="marker">The marker</param>
         /// <param name="position">The position within the stream</param>
-        public PdfJsFileMarker(byte marker, long position)
+        public JpegFileMarker(byte marker, long position)
+            : this(marker, position, false)
         {
-            this.Marker = marker;
-            this.Position = position;
-            this.Invalid = false;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PdfJsFileMarker"/> struct.
+        /// Initializes a new instance of the <see cref="JpegFileMarker"/> struct.
         /// </summary>
         /// <param name="marker">The marker</param>
         /// <param name="position">The position within the stream</param>
         /// <param name="invalid">Whether the current marker is invalid</param>
-        public PdfJsFileMarker(byte marker, long position, bool invalid)
+        public JpegFileMarker(byte marker, long position, bool invalid)
         {
             this.Marker = marker;
             this.Position = position;
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrame.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFrame.cs
similarity index 92%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrame.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFrame.cs
index 8ce981a09..da089fa44 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrame.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegFrame.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Represent a single jpeg frame
     /// </summary>
-    internal sealed class PdfJsFrame : IDisposable
+    internal sealed class JpegFrame : IDisposable
     {
         /// <summary>
         /// Gets or sets a value indicating whether the frame uses the extended specification
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <summary>
         /// Gets or sets the frame component collection
         /// </summary>
-        public PdfJsFrameComponent[] Components { get; set; }
+        public JpegComponent[] Components { get; set; }
 
         /// <summary>
         /// Gets or sets the maximum horizontal sampling factor
@@ -94,7 +94,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 
             for (int i = 0; i < this.ComponentCount; i++)
             {
-                PdfJsFrameComponent component = this.Components[i];
+                JpegComponent component = this.Components[i];
                 component.Init();
             }
         }
diff --git a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs
index 99408cf57..1b513c612 100644
--- a/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/JpegImagePostProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.Advanced;
@@ -37,7 +38,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
         /// <summary>
         /// Temporal buffer to store a row of colors.
         /// </summary>
-        private readonly IBuffer<Vector4> rgbaBuffer;
+        private readonly IMemoryOwner<Vector4> rgbaBuffer;
 
         /// <summary>
         /// The <see cref="JpegColorConverter"/> corresponding to the current <see cref="JpegColorSpace"/> determined by <see cref="IRawJpegData.ColorSpace"/>.
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ScanDecoder.cs
similarity index 93%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs
rename to src/ImageSharp/Formats/Jpeg/Components/Decoder/ScanDecoder.cs
index 8575bac69..8c525335b 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/Components/Decoder/ScanDecoder.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
+using SixLabors.ImageSharp.IO;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder
 {
     /// <summary>
     /// Decodes the Huffman encoded spectral scan.
@@ -23,13 +22,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         // LUT Bias[n] = (-1 << n) + 1
         private static readonly int[] Bias = { 0, -1, -3, -7, -15, -31, -63, -127, -255, -511, -1023, -2047, -4095, -8191, -16383, -32767 };
 
-        private readonly PdfJsFrame frame;
-        private readonly PdfJsHuffmanTables dcHuffmanTables;
-        private readonly PdfJsHuffmanTables acHuffmanTables;
+        private readonly JpegFrame frame;
+        private readonly HuffmanTables dcHuffmanTables;
+        private readonly HuffmanTables acHuffmanTables;
         private readonly FastACTables fastACTables;
 
         private readonly DoubleBufferedStreamReader stream;
-        private readonly PdfJsFrameComponent[] components;
+        private readonly JpegComponent[] components;
         private readonly ZigZag dctZigZag;
 
         // The restart interval.
@@ -97,9 +96,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// <param name="successiveLow">The successive approximation bit low end.</param>
         public ScanDecoder(
             DoubleBufferedStreamReader stream,
-            PdfJsFrame frame,
-            PdfJsHuffmanTables dcHuffmanTables,
-            PdfJsHuffmanTables acHuffmanTables,
+            JpegFrame frame,
+            HuffmanTables dcHuffmanTables,
+            HuffmanTables acHuffmanTables,
             FastACTables fastACTables,
             int componentIndex,
             int componentsLength,
@@ -177,10 +176,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                     // Scan an interleaved mcu... process components in order
                     for (int k = 0; k < this.componentsLength; k++)
                     {
-                        PdfJsFrameComponent component = this.components[k];
+                        JpegComponent component = this.components[k];
 
-                        ref PdfJsHuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
-                        ref PdfJsHuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
+                        ref HuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
+                        ref HuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
                         ref short fastACRef = ref this.fastACTables.GetAcTableReference(component);
                         int h = component.HorizontalSamplingFactor;
                         int v = component.VerticalSamplingFactor;
@@ -231,13 +230,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// </summary>
         private void ParseBaselineDataNonInterleaved()
         {
-            PdfJsFrameComponent component = this.components[this.componentIndex];
+            JpegComponent component = this.components[this.componentIndex];
 
             int w = component.WidthInBlocks;
             int h = component.HeightInBlocks;
 
-            ref PdfJsHuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
-            ref PdfJsHuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
+            ref HuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
+            ref HuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
             ref short fastACRef = ref this.fastACTables.GetAcTableReference(component);
 
             int mcu = 0;
@@ -296,8 +295,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                     // Scan an interleaved mcu... process components in order
                     for (int k = 0; k < this.componentsLength; k++)
                     {
-                        PdfJsFrameComponent component = this.components[k];
-                        ref PdfJsHuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
+                        JpegComponent component = this.components[k];
+                        ref HuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
                         int h = component.HorizontalSamplingFactor;
                         int v = component.VerticalSamplingFactor;
 
@@ -345,13 +344,13 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         /// </summary>
         private void ParseProgressiveDataNonInterleaved()
         {
-            PdfJsFrameComponent component = this.components[this.componentIndex];
+            JpegComponent component = this.components[this.componentIndex];
 
             int w = component.WidthInBlocks;
             int h = component.HeightInBlocks;
 
-            ref PdfJsHuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
-            ref PdfJsHuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
+            ref HuffmanTable dcHuffmanTable = ref this.dcHuffmanTables[component.DCHuffmanTableId];
+            ref HuffmanTable acHuffmanTable = ref this.acHuffmanTables[component.ACHuffmanTableId];
             ref short fastACRef = ref this.fastACTables.GetAcTableReference(component);
 
             int mcu = 0;
@@ -396,11 +395,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         private void DecodeBlockBaseline(
-            PdfJsFrameComponent component,
+            JpegComponent component,
             int row,
             int col,
-            ref PdfJsHuffmanTable dcTable,
-            ref PdfJsHuffmanTable acTable,
+            ref HuffmanTable dcTable,
+            ref HuffmanTable acTable,
             ref short fastACRef)
         {
             this.CheckBits();
@@ -411,7 +410,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 JpegThrowHelper.ThrowBadHuffmanCode();
             }
 
-            ref short blockDataRef = ref component.GetBlockDataReference(row, col);
+            ref short blockDataRef = ref component.GetBlockDataReference(col, row);
 
             int diff = t != 0 ? this.ExtendReceive(t) : 0;
             int dc = component.DcPredictor + diff;
@@ -475,10 +474,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         private void DecodeBlockProgressiveDC(
-            PdfJsFrameComponent component,
+            JpegComponent component,
             int row,
             int col,
-            ref PdfJsHuffmanTable dcTable)
+            ref HuffmanTable dcTable)
         {
             if (this.spectralEnd != 0)
             {
@@ -487,7 +486,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 
             this.CheckBits();
 
-            ref short blockDataRef = ref component.GetBlockDataReference(row, col);
+            ref short blockDataRef = ref component.GetBlockDataReference(col, row);
 
             if (this.successiveHigh == 0)
             {
@@ -511,10 +510,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         private void DecodeBlockProgressiveAC(
-            PdfJsFrameComponent component,
+            JpegComponent component,
             int row,
             int col,
-            ref PdfJsHuffmanTable acTable,
+            ref HuffmanTable acTable,
             ref short fastACRef)
         {
             if (this.spectralStart == 0)
@@ -522,7 +521,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
                 JpegThrowHelper.ThrowImageFormatException("Can't merge DC and AC.");
             }
 
-            ref short blockDataRef = ref component.GetBlockDataReference(row, col);
+            ref short blockDataRef = ref component.GetBlockDataReference(col, row);
 
             if (this.successiveHigh == 0)
             {
@@ -603,7 +602,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
             }
         }
 
-        private void DecodeBlockProgressiveACRefined(ref short blockDataRef, ref PdfJsHuffmanTable acTable)
+        private void DecodeBlockProgressiveACRefined(ref short blockDataRef, ref HuffmanTable acTable)
         {
             int k;
 
@@ -805,7 +804,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         [MethodImpl(InliningOptions.ShortMethod)]
-        private int DecodeHuffman(ref PdfJsHuffmanTable table)
+        private int DecodeHuffman(ref HuffmanTable table)
         {
             this.CheckBits();
 
@@ -830,7 +829,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         }
 
         [MethodImpl(InliningOptions.ColdPath)]
-        private int DecodeHuffmanSlow(ref PdfJsHuffmanTable table)
+        private int DecodeHuffmanSlow(ref HuffmanTable table)
         {
             // Naive test is to shift the code_buffer down so k bits are
             // valid, then test against MaxCode. To speed this up, we've
@@ -941,7 +940,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
 
             for (int i = 0; i < this.components.Length; i++)
             {
-                PdfJsFrameComponent c = this.components[i];
+                JpegComponent c = this.components[i];
                 c.DcPredictor = 0;
             }
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs
deleted file mode 100644
index 353eb01fe..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Holds the unprocessed bits that have been taken from the byte-stream.
-    /// The n least significant bits of a form the unread bits, to be read in MSB to
-    /// LSB order.
-    /// </summary>
-    internal struct Bits
-    {
-        /// <summary>
-        /// Gets or sets the accumulator.
-        /// </summary>
-        public int Accumulator;
-
-        /// <summary>
-        /// Gets or sets the mask.
-        /// <![CDATA[mask==1<<(unreadbits-1) when unreadbits>0, with mask==0 when unreadbits==0.]]>
-        /// </summary>
-        public int Mask;
-
-        /// <summary>
-        /// Gets or sets the  number of unread bits in the accumulator.
-        /// </summary>
-        public int UnreadBits;
-
-        /// <summary>
-        /// Reads bytes from the byte buffer to ensure that bits.UnreadBits is at
-        /// least n. For best performance (avoiding function calls inside hot loops),
-        /// the caller is the one responsible for first checking that bits.UnreadBits &lt; n.
-        /// </summary>
-        /// <param name="n">The number of bits to ensure.</param>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void EnsureNBits(int n, ref InputProcessor inputProcessor)
-        {
-            GolangDecoderErrorCode errorCode = this.EnsureNBitsUnsafe(n, ref inputProcessor);
-            errorCode.EnsureNoError();
-        }
-
-        /// <summary>
-        /// Reads bytes from the byte buffer to ensure that bits.UnreadBits is at
-        /// least n. For best performance (avoiding function calls inside hot loops),
-        /// the caller is the one responsible for first checking that bits.UnreadBits &lt; n.
-        /// This method does not throw. Returns <see cref="GolangDecoderErrorCode"/> instead.
-        /// </summary>
-        /// <param name="n">The number of bits to ensure.</param>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        /// <returns>Error code</returns>
-        public GolangDecoderErrorCode EnsureNBitsUnsafe(int n, ref InputProcessor inputProcessor)
-        {
-            while (true)
-            {
-                GolangDecoderErrorCode errorCode = this.EnsureBitsStepImpl(ref inputProcessor);
-                if (errorCode != GolangDecoderErrorCode.NoError || this.UnreadBits >= n)
-                {
-                    return errorCode;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Unrolled version of <see cref="EnsureNBitsUnsafe"/> for n==8
-        /// </summary>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        /// <returns>A <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode Ensure8BitsUnsafe(ref InputProcessor inputProcessor)
-        {
-            return this.EnsureBitsStepImpl(ref inputProcessor);
-        }
-
-        /// <summary>
-        /// Unrolled version of <see cref="EnsureNBitsUnsafe"/> for n==1
-        /// </summary>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        /// <returns>A <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode Ensure1BitUnsafe(ref InputProcessor inputProcessor)
-        {
-            return this.EnsureBitsStepImpl(ref inputProcessor);
-        }
-
-        /// <summary>
-        /// Receive extend
-        /// </summary>
-        /// <param name="t">Byte</param>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        /// <returns>Read bits value</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReceiveExtend(int t, ref InputProcessor inputProcessor)
-        {
-            GolangDecoderErrorCode errorCode = this.ReceiveExtendUnsafe(t, ref inputProcessor, out int x);
-            errorCode.EnsureNoError();
-            return x;
-        }
-
-        /// <summary>
-        /// Receive extend
-        /// </summary>
-        /// <param name="t">Byte</param>
-        /// <param name="inputProcessor">The <see cref="InputProcessor"/></param>
-        /// <param name="x">Read bits value</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode ReceiveExtendUnsafe(int t, ref InputProcessor inputProcessor, out int x)
-        {
-            if (this.UnreadBits < t)
-            {
-                GolangDecoderErrorCode errorCode = this.EnsureNBitsUnsafe(t, ref inputProcessor);
-                if (errorCode != GolangDecoderErrorCode.NoError)
-                {
-                    x = int.MaxValue;
-                    return errorCode;
-                }
-            }
-
-            this.UnreadBits -= t;
-            this.Mask >>= t;
-            int s = 1 << t;
-            x = (this.Accumulator >> this.UnreadBits) & (s - 1);
-
-            if (x < (s >> 1))
-            {
-                x += ((-1) << t) + 1;
-            }
-
-            return GolangDecoderErrorCode.NoError;
-        }
-
-        private GolangDecoderErrorCode EnsureBitsStepImpl(ref InputProcessor inputProcessor)
-        {
-            GolangDecoderErrorCode errorCode = inputProcessor.Bytes.ReadByteStuffedByteUnsafe(inputProcessor.InputStream, out int c);
-
-            if (errorCode != GolangDecoderErrorCode.NoError)
-            {
-                return errorCode;
-            }
-
-            this.Accumulator = (this.Accumulator << 8) | c;
-            this.UnreadBits += 8;
-            if (this.Mask == 0)
-            {
-                this.Mask = 1 << 7;
-            }
-            else
-            {
-                this.Mask <<= 8;
-            }
-
-            return errorCode;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
deleted file mode 100644
index c8c68aa7e..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Bytes is a byte buffer, similar to a stream, except that it
-    /// has to be able to unread more than 1 byte, due to byte stuffing.
-    /// Byte stuffing is specified in section F.1.2.3.
-    /// TODO: Optimize buffer management inside this class!
-    /// </summary>
-    internal struct Bytes : IDisposable
-    {
-        /// <summary>
-        /// Specifies the buffer size for <see cref="Buffer"/> and <see cref="BufferAsInt"/>
-        /// </summary>
-        public const int BufferSize = 4096;
-
-        /// <summary>
-        /// Gets or sets the buffer.
-        /// buffer[i:j] are the buffered bytes read from the underlying
-        /// stream that haven't yet been passed further on.
-        /// </summary>
-        public byte[] Buffer;
-
-        /// <summary>
-        /// Values of <see cref="Buffer"/> converted to <see cref="int"/>-s
-        /// </summary>
-        public int[] BufferAsInt;
-
-        /// <summary>
-        /// Start of bytes read
-        /// </summary>
-        public int I;
-
-        /// <summary>
-        /// End of bytes read
-        /// </summary>
-        public int J;
-
-        /// <summary>
-        /// Gets or sets the unreadable bytes. The number of bytes to back up i after
-        /// overshooting. It can be 0, 1 or 2.
-        /// </summary>
-        public int UnreadableBytes;
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Bytes"/>, and initializes it's buffer.
-        /// </summary>
-        /// <returns>The bytes created</returns>
-        public static Bytes Create()
-        {
-            // DO NOT bother with buffers and array pooling here!
-            // It only makes things worse!
-            return new Bytes
-            {
-                Buffer = new byte[BufferSize],
-                BufferAsInt = new int[BufferSize]
-            };
-        }
-
-        /// <summary>
-        /// Disposes of the underlying buffer
-        /// </summary>
-        public void Dispose()
-        {
-            this.Buffer = null;
-            this.BufferAsInt = null;
-        }
-
-        /// <summary>
-        /// ReadByteStuffedByte is like ReadByte but is for byte-stuffed Huffman data.
-        /// </summary>
-        /// <param name="inputStream">Input stream</param>
-        /// <param name="x">The result byte as <see cref="int"/></param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode ReadByteStuffedByteUnsafe(Stream inputStream, out int x)
-        {
-            // Take the fast path if bytes.buf contains at least two bytes.
-            if (this.I + 2 <= this.J)
-            {
-                x = this.BufferAsInt[this.I];
-                this.I++;
-                this.UnreadableBytes = 1;
-                if (x != JpegConstants.Markers.XFFInt)
-                {
-                    return GolangDecoderErrorCode.NoError;
-                }
-
-                if (this.BufferAsInt[this.I] != 0x00)
-                {
-                    return GolangDecoderErrorCode.MissingFF00;
-                }
-
-                this.I++;
-                this.UnreadableBytes = 2;
-                x = JpegConstants.Markers.XFF;
-                return GolangDecoderErrorCode.NoError;
-            }
-
-            this.UnreadableBytes = 0;
-
-            GolangDecoderErrorCode errorCode = this.ReadByteAsIntUnsafe(inputStream, out x);
-            this.UnreadableBytes = 1;
-            if (errorCode != GolangDecoderErrorCode.NoError)
-            {
-                return errorCode;
-            }
-
-            if (x != JpegConstants.Markers.XFF)
-            {
-                return GolangDecoderErrorCode.NoError;
-            }
-
-            errorCode = this.ReadByteAsIntUnsafe(inputStream, out x);
-            this.UnreadableBytes = 2;
-            if (errorCode != GolangDecoderErrorCode.NoError)
-            {
-                return errorCode;
-            }
-
-            if (x != 0x00)
-            {
-                return GolangDecoderErrorCode.MissingFF00;
-            }
-
-            x = JpegConstants.Markers.XFF;
-            return GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Returns the next byte, whether buffered or not buffered. It does not care about byte stuffing.
-        /// </summary>
-        /// <param name="inputStream">Input stream</param>
-        /// <returns>The <see cref="byte"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public byte ReadByte(Stream inputStream)
-        {
-            GolangDecoderErrorCode errorCode = this.ReadByteUnsafe(inputStream, out byte result);
-            errorCode.EnsureNoError();
-            return result;
-        }
-
-        /// <summary>
-        /// Extracts the next byte, whether buffered or not buffered into the result out parameter. It does not care about byte stuffing.
-        /// This method does not throw on format error, it returns a <see cref="GolangDecoderErrorCode"/> instead.
-        /// </summary>
-        /// <param name="inputStream">Input stream</param>
-        /// <param name="result">The result <see cref="byte"/> as out parameter</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode ReadByteUnsafe(Stream inputStream, out byte result)
-        {
-            GolangDecoderErrorCode errorCode = GolangDecoderErrorCode.NoError;
-            while (this.I == this.J)
-            {
-                errorCode = this.FillUnsafe(inputStream);
-                if (errorCode != GolangDecoderErrorCode.NoError)
-                {
-                    result = 0;
-                    return errorCode;
-                }
-            }
-
-            result = this.Buffer[this.I];
-            this.I++;
-            this.UnreadableBytes = 0;
-            return errorCode;
-        }
-
-        /// <summary>
-        /// Same as <see cref="ReadByteUnsafe"/> but the result is an <see cref="int"/>
-        /// </summary>
-        /// <param name="inputStream">The input stream</param>
-        /// <param name="result">The result <see cref="int"/></param>
-        /// <returns>A <see cref="GolangDecoderErrorCode"/></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public GolangDecoderErrorCode ReadByteAsIntUnsafe(Stream inputStream, out int result)
-        {
-            GolangDecoderErrorCode errorCode = GolangDecoderErrorCode.NoError;
-            while (this.I == this.J)
-            {
-                errorCode = this.FillUnsafe(inputStream);
-                if (errorCode != GolangDecoderErrorCode.NoError)
-                {
-                    result = 0;
-                    return errorCode;
-                }
-            }
-
-            result = this.BufferAsInt[this.I];
-            this.I++;
-            this.UnreadableBytes = 0;
-            return errorCode;
-        }
-
-        /// <summary>
-        /// Fills up the bytes buffer from the underlying stream.
-        /// It should only be called when there are no unread bytes in bytes.
-        /// </summary>
-        /// <exception cref="EOFException">Thrown when reached end of stream unexpectedly.</exception>
-        /// <param name="inputStream">Input stream</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Fill(Stream inputStream)
-        {
-            GolangDecoderErrorCode errorCode = this.FillUnsafe(inputStream);
-            errorCode.EnsureNoError();
-        }
-
-        /// <summary>
-        /// Fills up the bytes buffer from the underlying stream.
-        /// It should only be called when there are no unread bytes in bytes.
-        /// This method does not throw <see cref="EOFException"/>, returns a <see cref="GolangDecoderErrorCode"/> instead!
-        /// </summary>
-        /// <param name="inputStream">Input stream</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode FillUnsafe(Stream inputStream)
-        {
-            if (this.I != this.J)
-            {
-                // Unrecoverable error in the input, throwing!
-                DecoderThrowHelper.ThrowImageFormatException.FillCalledWhenUnreadBytesExist();
-            }
-
-            // Move the last 2 bytes to the start of the buffer, in case we need
-            // to call UnreadByteStuffedByte.
-            if (this.J > 2)
-            {
-                this.Buffer[0] = this.Buffer[this.J - 2];
-                this.Buffer[1] = this.Buffer[this.J - 1];
-                this.I = 2;
-                this.J = 2;
-            }
-
-            // Fill in the rest of the buffer.
-            int n = inputStream.Read(this.Buffer, this.J, this.Buffer.Length - this.J);
-            if (n == 0)
-            {
-                return GolangDecoderErrorCode.UnexpectedEndOfStream;
-            }
-
-            this.J += n;
-
-            for (int i = 0; i < this.Buffer.Length; i++)
-            {
-                this.BufferAsInt[i] = this.Buffer[i];
-            }
-
-            return GolangDecoderErrorCode.NoError;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs
deleted file mode 100644
index 2b2bc61ba..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Encapsulates exception thrower methods for the Jpeg Encoder
-    /// </summary>
-    internal static class DecoderThrowHelper
-    {
-        /// <summary>
-        /// Throws an exception that belongs to the given <see cref="GolangDecoderErrorCode"/>
-        /// </summary>
-        /// <param name="errorCode">The <see cref="GolangDecoderErrorCode"/></param>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public static void ThrowExceptionForErrorCode(this GolangDecoderErrorCode errorCode)
-        {
-            // REMARK: If this method throws for an image that is expected to be decodable,
-            // consider using the ***Unsafe variant of the parsing method that asks for ThrowExceptionForErrorCode()
-            // then verify the error code + implement fallback logic manually!
-            switch (errorCode)
-            {
-                case GolangDecoderErrorCode.NoError:
-                    throw new ArgumentException("ThrowExceptionForErrorCode() called with NoError!", nameof(errorCode));
-                case GolangDecoderErrorCode.MissingFF00:
-                    throw new MissingFF00Exception();
-                case GolangDecoderErrorCode.UnexpectedEndOfStream:
-                    throw new EOFException();
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(errorCode), errorCode, null);
-            }
-        }
-
-        /// <summary>
-        /// Throws an exception if the given <see cref="GolangDecoderErrorCode"/> defines an error.
-        /// </summary>
-        /// <param name="errorCode">The <see cref="GolangDecoderErrorCode"/></param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void EnsureNoError(this GolangDecoderErrorCode errorCode)
-        {
-            if (errorCode != GolangDecoderErrorCode.NoError)
-            {
-                ThrowExceptionForErrorCode(errorCode);
-            }
-        }
-
-        /// <summary>
-        /// Throws an exception if the given <see cref="GolangDecoderErrorCode"/> is <see cref="GolangDecoderErrorCode.UnexpectedEndOfStream"/>.
-        /// </summary>
-        /// <param name="errorCode">The <see cref="GolangDecoderErrorCode"/></param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void EnsureNoEOF(this GolangDecoderErrorCode errorCode)
-        {
-            if (errorCode == GolangDecoderErrorCode.UnexpectedEndOfStream)
-            {
-                errorCode.ThrowExceptionForErrorCode();
-            }
-        }
-
-        /// <summary>
-        /// Encapsulates methods throwing different flavours of <see cref="ImageFormatException"/>-s.
-        /// </summary>
-        public static class ThrowImageFormatException
-        {
-            /// <summary>
-            /// Throws "Fill called when unread bytes exist".
-            /// </summary>
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            public static void FillCalledWhenUnreadBytesExist()
-            {
-                throw new ImageFormatException("Fill called when unread bytes exist!");
-            }
-
-            /// <summary>
-            /// Throws "Bad Huffman code".
-            /// </summary>
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            public static void BadHuffmanCode()
-            {
-                throw new ImageFormatException("Bad Huffman code!");
-            }
-
-            /// <summary>
-            /// Throws "Uninitialized Huffman table".
-            /// </summary>
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            public static void UninitializedHuffmanTable()
-            {
-                throw new ImageFormatException("Uninitialized Huffman table");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs
deleted file mode 100644
index 60d9b1e1a..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// The EOF (End of File exception).
-    /// Thrown when the decoder encounters an EOF marker without a proceeding EOI (End Of Image) marker
-    /// TODO: Rename to UnexpectedEndOfStreamException
-    /// </summary>
-    internal class EOFException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EOFException"/> class.
-        /// </summary>
-        public EOFException()
-            : base("Reached end of stream before proceeding EOI marker!")
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs
deleted file mode 100644
index 75cea5551..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponent.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Runtime.CompilerServices;
-
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-using SixLabors.Memory;
-using SixLabors.Primitives;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <inheritdoc cref="IJpegComponent" />
-    /// <summary>
-    /// Represents a single color component
-    /// </summary>
-    internal class GolangComponent : IDisposable, IJpegComponent
-    {
-        public GolangComponent(byte identifier, int index)
-        {
-            this.Identifier = identifier;
-            this.Index = index;
-        }
-
-        /// <summary>
-        /// Gets the identifier
-        /// </summary>
-        public byte Identifier { get; }
-
-        /// <inheritdoc />
-        public int Index { get; }
-
-        public Size SizeInBlocks { get; private set; }
-
-        public Size SamplingFactors { get; private set; }
-
-        public Size SubSamplingDivisors { get; private set; }
-
-        public int HorizontalSamplingFactor => this.SamplingFactors.Width;
-
-        public int VerticalSamplingFactor => this.SamplingFactors.Height;
-
-        /// <inheritdoc />
-        public int QuantizationTableIndex { get; private set; }
-
-        /// <inheritdoc />
-        /// <summary>
-        /// Gets the <see cref="T:SixLabors.ImageSharp.Memory.Buffer`1" /> storing the "raw" frequency-domain decoded blocks.
-        /// We need to apply IDCT, dequantiazition and unzigging to transform them into color-space blocks.
-        /// This is done by <see cref="M:SixLabors.ImageSharp.Formats.Jpeg.GolangPort.OrigJpegDecoderCore.ProcessBlocksIntoJpegImageChannels" />.
-        /// When <see cref="P:SixLabors.ImageSharp.Formats.Jpeg.GolangPort.OrigJpegDecoderCore.IsProgressive" /> us true, we are touching these blocks multiple times - each time we process a Scan.
-        /// </summary>
-        public Buffer2D<Block8x8> SpectralBlocks { get; private set; }
-
-        /// <summary>
-        /// Initializes <see cref="SpectralBlocks"/>
-        /// </summary>
-        /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/> to use for buffer allocations.</param>
-        /// <param name="decoder">The <see cref="GolangJpegDecoderCore"/> instance</param>
-        public void InitializeDerivedData(MemoryAllocator memoryAllocator, GolangJpegDecoderCore decoder)
-        {
-            // For 4-component images (either CMYK or YCbCrK), we only support two
-            // hv vectors: [0x11 0x11 0x11 0x11] and [0x22 0x11 0x11 0x22].
-            // Theoretically, 4-component JPEG images could mix and match hv values
-            // but in practice, those two combinations are the only ones in use,
-            // and it simplifies the applyBlack code below if we can assume that:
-            // - for CMYK, the C and K channels have full samples, and if the M
-            // and Y channels subsample, they subsample both horizontally and
-            // vertically.
-            // - for YCbCrK, the Y and K channels have full samples.
-            this.SizeInBlocks = decoder.ImageSizeInMCU.MultiplyBy(this.SamplingFactors);
-
-            if (this.Index == 0 || this.Index == 3)
-            {
-                this.SubSamplingDivisors = new Size(1, 1);
-            }
-            else
-            {
-                GolangComponent c0 = decoder.Components[0];
-                this.SubSamplingDivisors = c0.SamplingFactors.DivideBy(this.SamplingFactors);
-            }
-
-            this.SpectralBlocks = memoryAllocator.Allocate2D<Block8x8>(this.SizeInBlocks.Width, this.SizeInBlocks.Height, true);
-        }
-
-        /// <summary>
-        /// Initializes all component data except <see cref="SpectralBlocks"/>.
-        /// </summary>
-        /// <param name="decoder">The <see cref="GolangJpegDecoderCore"/> instance</param>
-        public void InitializeCoreData(GolangJpegDecoderCore decoder)
-        {
-            // Section B.2.2 states that "the value of C_i shall be different from
-            // the values of C_1 through C_(i-1)".
-            int i = this.Index;
-
-            for (int j = 0; j < this.Index; j++)
-            {
-                if (this.Identifier == decoder.Components[j].Identifier)
-                {
-                    throw new ImageFormatException("Repeated component identifier");
-                }
-            }
-
-            this.QuantizationTableIndex = decoder.Temp[8 + (3 * i)];
-            if (this.QuantizationTableIndex > GolangJpegDecoderCore.MaxTq)
-            {
-                throw new ImageFormatException("Bad Tq value");
-            }
-
-            byte hv = decoder.Temp[7 + (3 * i)];
-            int h = hv >> 4;
-            int v = hv & 0x0f;
-            if (h < 1 || h > 4 || v < 1 || v > 4)
-            {
-                throw new ImageFormatException("Unsupported Luma/chroma subsampling ratio");
-            }
-
-            if (h == 3 || v == 3)
-            {
-                throw new ImageFormatException("Lnsupported subsampling ratio");
-            }
-
-            switch (decoder.ComponentCount)
-            {
-                case 1:
-
-                    // If a JPEG image has only one component, section A.2 says "this data
-                    // is non-interleaved by definition" and section A.2.2 says "[in this
-                    // case...] the order of data units within a scan shall be left-to-right
-                    // and top-to-bottom... regardless of the values of H_1 and V_1". Section
-                    // 4.8.2 also says "[for non-interleaved data], the MCU is defined to be
-                    // one data unit". Similarly, section A.1.1 explains that it is the ratio
-                    // of H_i to max_j(H_j) that matters, and similarly for V. For grayscale
-                    // images, H_1 is the maximum H_j for all components j, so that ratio is
-                    // always 1. The component's (h, v) is effectively always (1, 1): even if
-                    // the nominal (h, v) is (2, 1), a 20x5 image is encoded in three 8x8
-                    // MCUs, not two 16x8 MCUs.
-                    h = 1;
-                    v = 1;
-                    break;
-
-                case 3:
-
-                    // For YCbCr images, we only support 4:4:4, 4:4:0, 4:2:2, 4:2:0,
-                    // 4:1:1 or 4:1:0 chroma subsampling ratios. This implies that the
-                    // (h, v) values for the Y component are either (1, 1), (1, 2),
-                    // (2, 1), (2, 2), (4, 1) or (4, 2), and the Y component's values
-                    // must be a multiple of the Cb and Cr component's values. We also
-                    // assume that the two chroma components have the same subsampling
-                    // ratio.
-                    switch (i)
-                    {
-                        case 0:
-                            {
-                                // Y.
-                                // We have already verified, above, that h and v are both
-                                // either 1, 2 or 4, so invalid (h, v) combinations are those
-                                // with v == 4.
-                                if (v == 4)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                            }
-
-                        case 1:
-                            {
-                                // Cb.
-                                Size s0 = decoder.Components[0].SamplingFactors;
-
-                                if (s0.Width % h != 0 || s0.Height % v != 0)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                            }
-
-                        case 2:
-                            {
-                                // Cr.
-                                Size s1 = decoder.Components[1].SamplingFactors;
-
-                                if (s1.Width != h || s1.Height != v)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                            }
-                    }
-
-                    break;
-
-                case 4:
-
-                    // For 4-component images (either CMYK or YCbCrK), we only support two
-                    // hv vectors: [0x11 0x11 0x11 0x11] and [0x22 0x11 0x11 0x22].
-                    // Theoretically, 4-component JPEG images could mix and match hv values
-                    // but in practice, those two combinations are the only ones in use,
-                    // and it simplifies the applyBlack code below if we can assume that:
-                    // - for CMYK, the C and K channels have full samples, and if the M
-                    // and Y channels subsample, they subsample both horizontally and
-                    // vertically.
-                    // - for YCbCrK, the Y and K channels have full samples.
-                    switch (i)
-                    {
-                        case 0:
-                            if (hv != 0x11 && hv != 0x22)
-                            {
-                                throw new ImageFormatException("Unsupported subsampling ratio");
-                            }
-
-                            break;
-                        case 1:
-                        case 2:
-                            if (hv != 0x11)
-                            {
-                                throw new ImageFormatException("Unsupported subsampling ratio");
-                            }
-
-                            break;
-                        case 3:
-                            Size s0 = decoder.Components[0].SamplingFactors;
-
-                            if (s0.Width != h || s0.Height != v)
-                            {
-                                throw new ImageFormatException("Unsupported subsampling ratio");
-                            }
-
-                            break;
-                    }
-
-                    break;
-            }
-
-            this.SamplingFactors = new Size(h, v);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref Block8x8 GetBlockReference(int column, int row)
-        {
-            return ref this.SpectralBlocks[column, row];
-        }
-
-        public void Dispose()
-        {
-            this.SpectralBlocks?.Dispose();
-        }
-    }
-}
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponentScan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponentScan.cs
deleted file mode 100644
index 6752768ff..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangComponentScan.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Represents a component scan
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct GolangComponentScan
-    {
-        /// <summary>
-        /// Gets or sets the component index.
-        /// </summary>
-        public byte ComponentIndex;
-
-        /// <summary>
-        /// Gets or sets the DC table selector
-        /// </summary>
-        public byte DcTableSelector;
-
-        /// <summary>
-        /// Gets or sets the AC table selector
-        /// </summary>
-        public byte AcTableSelector;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangDecoderErrorCode.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangDecoderErrorCode.cs
deleted file mode 100644
index fa3364527..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangDecoderErrorCode.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Represents "recoverable" decoder errors.
-    /// </summary>
-    internal enum GolangDecoderErrorCode
-    {
-        /// <summary>
-        /// NoError
-        /// </summary>
-        NoError,
-
-        /// <summary>
-        /// MissingFF00
-        /// </summary>
-        // ReSharper disable once InconsistentNaming
-        MissingFF00,
-
-        /// <summary>
-        /// End of stream reached unexpectedly
-        /// </summary>
-        UnexpectedEndOfStream
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangHuffmanTree.cs
deleted file mode 100644
index dccce2aaa..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangHuffmanTree.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Represents a Huffman tree
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal unsafe struct GolangHuffmanTree
-    {
-        /// <summary>
-        /// The index of the AC table row
-        /// </summary>
-        public const int AcTableIndex = 1;
-
-        /// <summary>
-        /// The index of the DC table row
-        /// </summary>
-        public const int DcTableIndex = 0;
-
-        /// <summary>
-        /// The maximum (inclusive) number of codes in a Huffman tree.
-        /// </summary>
-        public const int MaxNCodes = 256;
-
-        /// <summary>
-        /// The maximum (inclusive) number of bits in a Huffman code.
-        /// </summary>
-        public const int MaxCodeLength = 16;
-
-        /// <summary>
-        /// The maximum number of Huffman table classes
-        /// </summary>
-        public const int MaxTc = 1;
-
-        /// <summary>
-        /// The maximum number of Huffman table identifiers
-        /// </summary>
-        public const int MaxTh = 3;
-
-        /// <summary>
-        /// Row size of the Huffman table
-        /// </summary>
-        public const int ThRowSize = MaxTh + 1;
-
-        /// <summary>
-        /// Number of Hufman Trees in the Huffman table
-        /// </summary>
-        public const int NumberOfTrees = (MaxTc + 1) * (MaxTh + 1);
-
-        /// <summary>
-        /// The log-2 size of the Huffman decoder's look-up table.
-        /// </summary>
-        public const int LutSizeLog2 = 8;
-
-        /// <summary>
-        /// Gets or sets the number of codes in the tree.
-        /// </summary>
-        public int Length;
-
-        /// <summary>
-        /// Gets the look-up table for the next LutSize bits in the bit-stream.
-        /// The high 8 bits of the uint16 are the encoded value. The low 8 bits
-        /// are 1 plus the code length, or 0 if the value is too large to fit in
-        /// lutSize bits.
-        /// </summary>
-        public FixedInt32Buffer256 Lut;
-
-        /// <summary>
-        /// Gets the the decoded values, sorted by their encoding.
-        /// </summary>
-        public FixedInt32Buffer256 Values;
-
-        /// <summary>
-        /// Gets the array of minimum codes.
-        /// MinCodes[i] is the minimum code of length i, or -1 if there are no codes of that length.
-        /// </summary>
-        public FixedInt32Buffer16 MinCodes;
-
-        /// <summary>
-        /// Gets the array of maximum codes.
-        /// MaxCodes[i] is the maximum code of length i, or -1 if there are no codes of that length.
-        /// </summary>
-        public FixedInt32Buffer16 MaxCodes;
-
-        /// <summary>
-        /// Gets the array of indices. Indices[i] is the index into Values of MinCodes[i].
-        /// </summary>
-        public FixedInt32Buffer16 Indices;
-
-        /// <summary>
-        /// Creates and initializes an array of <see cref="GolangHuffmanTree" /> instances of size <see cref="NumberOfTrees" />
-        /// </summary>
-        /// <returns>An array of <see cref="GolangHuffmanTree" /> instances representing the Huffman tables</returns>
-        public static GolangHuffmanTree[] CreateHuffmanTrees()
-        {
-            return new GolangHuffmanTree[NumberOfTrees];
-        }
-
-        /// <summary>
-        /// Internal part of the DHT processor, whatever does it mean
-        /// </summary>
-        /// <param name="inputProcessor">The decoder instance</param>
-        /// <param name="defineHuffmanTablesData">The temporary buffer that holds the data that has been read from the Jpeg stream</param>
-        /// <param name="remaining">Remaining bits</param>
-        public void ProcessDefineHuffmanTablesMarkerLoop(
-            ref InputProcessor inputProcessor,
-            byte[] defineHuffmanTablesData,
-            ref int remaining)
-        {
-            // Read nCodes and huffman.Valuess (and derive h.Length).
-            // nCodes[i] is the number of codes with code length i.
-            // h.Length is the total number of codes.
-            this.Length = 0;
-
-            int[] ncodes = new int[MaxCodeLength];
-            for (int i = 0; i < ncodes.Length; i++)
-            {
-                ncodes[i] = defineHuffmanTablesData[i + 1];
-                this.Length += ncodes[i];
-            }
-
-            if (this.Length == 0)
-            {
-                throw new ImageFormatException("Huffman table has zero length");
-            }
-
-            if (this.Length > MaxNCodes)
-            {
-                throw new ImageFormatException("Huffman table has excessive length");
-            }
-
-            remaining -= this.Length + 17;
-            if (remaining < 0)
-            {
-                throw new ImageFormatException("DHT has wrong length");
-            }
-
-            byte[] values = new byte[MaxNCodes];
-            inputProcessor.ReadFull(values, 0, this.Length);
-
-            fixed (int* valuesPtr = this.Values.Data)
-            fixed (int* lutPtr = this.Lut.Data)
-            {
-                for (int i = 0; i < values.Length; i++)
-                {
-                    valuesPtr[i] = values[i];
-                }
-
-                // Derive the look-up table.
-                for (int i = 0; i < MaxNCodes; i++)
-                {
-                    lutPtr[i] = 0;
-                }
-
-                int x = 0, code = 0;
-
-                for (int i = 0; i < LutSizeLog2; i++)
-                {
-                    code <<= 1;
-
-                    for (int j = 0; j < ncodes[i]; j++)
-                    {
-                        // The codeLength is 1+i, so shift code by 8-(1+i) to
-                        // calculate the high bits for every 8-bit sequence
-                        // whose codeLength's high bits matches code.
-                        // The high 8 bits of lutValue are the encoded value.
-                        // The low 8 bits are 1 plus the codeLength.
-                        int base2 = code << (7 - i);
-                        int lutValue = (valuesPtr[x] << 8) | (2 + i);
-
-                        for (int k = 0; k < 1 << (7 - i); k++)
-                        {
-                            lutPtr[base2 | k] = lutValue;
-                        }
-
-                        code++;
-                        x++;
-                    }
-                }
-            }
-
-            fixed (int* minCodesPtr = this.MinCodes.Data)
-            fixed (int* maxCodesPtr = this.MaxCodes.Data)
-            fixed (int* indicesPtr = this.Indices.Data)
-            {
-                // Derive minCodes, maxCodes, and indices.
-                int c = 0, index = 0;
-                for (int i = 0; i < ncodes.Length; i++)
-                {
-                    int nc = ncodes[i];
-                    if (nc == 0)
-                    {
-                        minCodesPtr[i] = -1;
-                        maxCodesPtr[i] = -1;
-                        indicesPtr[i] = -1;
-                    }
-                    else
-                    {
-                        minCodesPtr[i] = c;
-                        maxCodesPtr[i] = c + nc - 1;
-                        indicesPtr[i] = index;
-                        c += nc;
-                        index += nc;
-                    }
-
-                    c <<= 1;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the value for the given code and index.
-        /// </summary>
-        /// <param name="code">The code</param>
-        /// <param name="codeLength">The code length</param>
-        /// <returns>The value</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int GetValue(int code, int codeLength)
-        {
-            return this.Values[this.Indices[codeLength] + code - this.MinCodes[codeLength]];
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct FixedInt32Buffer256
-        {
-            public fixed int Data[256];
-
-            public int this[int idx]
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-                    ref int self = ref Unsafe.As<FixedInt32Buffer256, int>(ref this);
-                    return Unsafe.Add(ref self, idx);
-                }
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct FixedInt32Buffer16
-        {
-            public fixed int Data[16];
-
-            public int this[int idx]
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-                    ref int self = ref Unsafe.As<FixedInt32Buffer16, int>(ref this);
-                    return Unsafe.Add(ref self, idx);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
deleted file mode 100644
index f3c8aa91b..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.ComputationData.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.InteropServices;
-
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <content>
-    /// Conains the definition of <see cref="ComputationData"/>
-    /// </content>
-    internal unsafe partial struct GolangJpegScanDecoder
-    {
-        /// <summary>
-        /// Holds the "large" data blocks needed for computations.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct ComputationData
-        {
-            /// <summary>
-            /// The main input/working block
-            /// </summary>
-            public Block8x8 Block;
-
-            /// <summary>
-            /// The jpeg unzig data
-            /// </summary>
-            public ZigZag Unzig;
-
-            /// <summary>
-            /// The buffer storing the <see cref="GolangComponentScan"/>-s for each component
-            /// </summary>
-            public fixed byte ScanData[3 * GolangJpegDecoderCore.MaxComponents];
-
-            /// <summary>
-            /// The DC values for each component
-            /// </summary>
-            public fixed int Dc[GolangJpegDecoderCore.MaxComponents];
-
-            /// <summary>
-            /// Creates and initializes a new <see cref="ComputationData"/> instance
-            /// </summary>
-            /// <returns>The <see cref="ComputationData"/></returns>
-            public static ComputationData Create()
-            {
-                ComputationData data = default;
-                data.Unzig = ZigZag.CreateUnzigTable();
-                return data;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.DataPointers.cs
deleted file mode 100644
index a00da6fca..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.DataPointers.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <content>
-    /// Conains the definition of <see cref="DataPointers"/>
-    /// </content>
-    internal unsafe partial struct GolangJpegScanDecoder
-    {
-        /// <summary>
-        /// Contains pointers to the memory regions of <see cref="ComputationData"/> so they can be easily passed around to pointer based utility methods of <see cref="Block8x8F"/>
-        /// </summary>
-        public struct DataPointers
-        {
-            /// <summary>
-            /// Pointer to <see cref="ComputationData.Block"/>
-            /// </summary>
-            public Block8x8* Block;
-
-            /// <summary>
-            /// Pointer to <see cref="ComputationData.Unzig"/> as byte*
-            /// </summary>
-            public byte* Unzig;
-
-            /// <summary>
-            /// Pointer to <see cref="ComputationData.ScanData"/> as Scan*
-            /// </summary>
-            public GolangComponentScan* ComponentScan;
-
-            /// <summary>
-            /// Pointer to <see cref="ComputationData.Dc"/>
-            /// </summary>
-            public int* Dc;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="DataPointers" /> struct.
-            /// </summary>
-            /// <param name="basePtr">The pointer pointing to <see cref="ComputationData"/></param>
-            public DataPointers(ComputationData* basePtr)
-            {
-                this.Block = &basePtr->Block;
-                this.Unzig = basePtr->Unzig.Data;
-                this.ComponentScan = (GolangComponentScan*)basePtr->ScanData;
-                this.Dc = basePtr->Dc;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.cs
deleted file mode 100644
index 3a88cfad4..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/GolangJpegScanDecoder.cs
+++ /dev/null
@@ -1,705 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Encapsulates the impementation of Jpeg SOS Huffman decoding. See JpegScanDecoder.md!
-    ///
-    /// <see cref="zigStart"/> and <see cref="zigEnd"/> are the spectral selection bounds.
-    /// <see cref="ah"/> and <see cref="al"/> are the successive approximation high and low values.
-    /// The spec calls these values Ss, Se, Ah and Al.
-    /// For progressive JPEGs, these are the two more-or-less independent
-    /// aspects of progression. Spectral selection progression is when not
-    /// all of a block's 64 DCT coefficients are transmitted in one pass.
-    /// For example, three passes could transmit coefficient 0 (the DC
-    /// component), coefficients 1-5, and coefficients 6-63, in zig-zag
-    /// order. Successive approximation is when not all of the bits of a
-    /// band of coefficients are transmitted in one pass. For example,
-    /// three passes could transmit the 6 most significant bits, followed
-    /// by the second-least significant bit, followed by the least
-    /// significant bit.
-    /// For baseline JPEGs, these parameters are hard-coded to 0/63/0/0.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal unsafe partial struct GolangJpegScanDecoder
-    {
-        // The JpegScanDecoder members should be ordered in a way that results in optimal memory layout.
-#pragma warning disable SA1202 // ElementsMustBeOrderedByAccess
-
-        /// <summary>
-        /// The <see cref="ComputationData"/> buffer
-        /// </summary>
-        private ComputationData data;
-
-        /// <summary>
-        /// Pointers to elements of <see cref="data"/>
-        /// </summary>
-        private DataPointers pointers;
-
-        /// <summary>
-        /// The current component index
-        /// </summary>
-        public int ComponentIndex;
-
-        /// <summary>
-        /// X coordinate of the current block, in units of 8x8. (The third block in the first row has (bx, by) = (2, 0))
-        /// </summary>
-        private int bx;
-
-        /// <summary>
-        /// Y coordinate of the current block, in units of 8x8. (The third block in the first row has (bx, by) = (2, 0))
-        /// </summary>
-        private int by;
-
-        /// <summary>
-        /// Start index of the zig-zag selection bound
-        /// </summary>
-        private int zigStart;
-
-        /// <summary>
-        /// End index of the zig-zag selection bound
-        /// </summary>
-        private int zigEnd;
-
-        /// <summary>
-        /// Successive approximation high value
-        /// </summary>
-        private int ah;
-
-        /// <summary>
-        /// Successive approximation low value
-        /// </summary>
-        private int al;
-
-        /// <summary>
-        /// The number of component scans
-        /// </summary>
-        private int componentScanCount;
-
-        /// <summary>
-        /// Horizontal sampling factor at the current component index
-        /// </summary>
-        private int hi;
-
-        /// <summary>
-        /// End-of-Band run, specified in section G.1.2.2.
-        /// </summary>
-        private int eobRun;
-
-        /// <summary>
-        /// The block counter
-        /// </summary>
-        private int blockCounter;
-
-        /// <summary>
-        /// The MCU counter
-        /// </summary>
-        private int mcuCounter;
-
-        /// <summary>
-        /// The expected RST marker value
-        /// </summary>
-        private byte expectedRst;
-
-        /// <summary>
-        /// Initializes a default-constructed <see cref="GolangJpegScanDecoder"/> instance for reading data from <see cref="GolangJpegDecoderCore"/>-s stream.
-        /// </summary>
-        /// <param name="p">Pointer to <see cref="GolangJpegScanDecoder"/> on the stack</param>
-        /// <param name="decoder">The <see cref="GolangJpegDecoderCore"/> instance</param>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        public static void InitStreamReading(GolangJpegScanDecoder* p, GolangJpegDecoderCore decoder, int remaining)
-        {
-            p->data = ComputationData.Create();
-            p->pointers = new DataPointers(&p->data);
-            p->InitStreamReadingImpl(decoder, remaining);
-        }
-
-        /// <summary>
-        /// Read Huffman data from Jpeg scans in <see cref="GolangJpegDecoderCore.InputStream"/>,
-        /// and decode it as <see cref="Block8x8"/> into <see cref="GolangComponent.SpectralBlocks"/>.
-        ///
-        /// The blocks are traversed one MCU at a time. For 4:2:0 chroma
-        /// subsampling, there are four Y 8x8 blocks in every 16x16 MCU.
-        /// For a baseline 32x16 pixel image, the Y blocks visiting order is:
-        /// 0 1 4 5
-        /// 2 3 6 7
-        /// For progressive images, the interleaved scans (those with component count &gt; 1)
-        /// are traversed as above, but non-interleaved scans are traversed left
-        /// to right, top to bottom:
-        /// 0 1 2 3
-        /// 4 5 6 7
-        /// Only DC scans (zigStart == 0) can be interleave AC scans must have
-        /// only one component.
-        /// To further complicate matters, for non-interleaved scans, there is no
-        /// data for any blocks that are inside the image at the MCU level but
-        /// outside the image at the pixel level. For example, a 24x16 pixel 4:2:0
-        /// progressive image consists of two 16x16 MCUs. The interleaved scans
-        /// will process 8 Y blocks:
-        /// 0 1 4 5
-        /// 2 3 6 7
-        /// The non-interleaved scans will process only 6 Y blocks:
-        /// 0 1 2
-        /// 3 4 5
-        /// </summary>
-        /// <param name="decoder">The <see cref="GolangJpegDecoderCore"/> instance</param>
-        public void DecodeBlocks(GolangJpegDecoderCore decoder)
-        {
-            decoder.InputProcessor.ResetErrorState();
-
-            this.blockCounter = 0;
-            this.mcuCounter = 0;
-            this.expectedRst = JpegConstants.Markers.RST0;
-
-            for (int my = 0; my < decoder.MCUCountY; my++)
-            {
-                for (int mx = 0; mx < decoder.MCUCountX; mx++)
-                {
-                    this.DecodeBlocksAtMcuIndex(decoder, mx, my);
-
-                    this.mcuCounter++;
-
-                    // Handling restart intervals
-                    // Useful info: https://stackoverflow.com/a/8751802
-                    if (decoder.IsAtRestartInterval(this.mcuCounter))
-                    {
-                        this.ProcessRSTMarker(decoder);
-                        this.Reset(decoder);
-                    }
-                }
-            }
-        }
-
-        private void DecodeBlocksAtMcuIndex(GolangJpegDecoderCore decoder, int mx, int my)
-        {
-            for (int scanIndex = 0; scanIndex < this.componentScanCount; scanIndex++)
-            {
-                this.ComponentIndex = this.pointers.ComponentScan[scanIndex].ComponentIndex;
-                GolangComponent component = decoder.Components[this.ComponentIndex];
-
-                this.hi = component.HorizontalSamplingFactor;
-                int vi = component.VerticalSamplingFactor;
-
-                for (int j = 0; j < this.hi * vi; j++)
-                {
-                    if (this.componentScanCount != 1)
-                    {
-                        this.bx = (this.hi * mx) + (j % this.hi);
-                        this.by = (vi * my) + (j / this.hi);
-                    }
-                    else
-                    {
-                        int q = decoder.MCUCountX * this.hi;
-                        this.bx = this.blockCounter % q;
-                        this.by = this.blockCounter / q;
-                        this.blockCounter++;
-                        if (this.bx * 8 >= decoder.ImageWidth || this.by * 8 >= decoder.ImageHeight)
-                        {
-                            continue;
-                        }
-                    }
-
-                    // Find the block at (bx,by) in the component's buffer:
-                    ref Block8x8 blockRefOnHeap = ref component.GetBlockReference(this.bx, this.by);
-
-                    // Copy block to stack
-                    this.data.Block = blockRefOnHeap;
-
-                    if (!decoder.InputProcessor.ReachedEOF)
-                    {
-                        this.DecodeBlock(decoder, scanIndex);
-                    }
-
-                    // Store the result block:
-                    blockRefOnHeap = this.data.Block;
-                }
-            }
-        }
-
-        private void ProcessRSTMarker(GolangJpegDecoderCore decoder)
-        {
-            // Attempt to look for RST[0-7] markers to resynchronize from corrupt input.
-            if (!decoder.InputProcessor.ReachedEOF)
-            {
-                decoder.InputProcessor.ReadFullUnsafe(decoder.Temp, 0, 2);
-                if (decoder.InputProcessor.CheckEOFEnsureNoError())
-                {
-                    if (decoder.Temp[0] != 0xFF || decoder.Temp[1] != this.expectedRst)
-                    {
-                        bool invalidRst = true;
-
-                        // Most jpeg's containing well-formed input will have a RST[0-7] marker following immediately
-                        // but some, see Issue #481, contain padding bytes "0xFF" before the RST[0-7] marker.
-                        // If we identify that case we attempt to read until we have bypassed the padded bytes.
-                        // We then check again for our RST marker and throw if invalid.
-                        // No other methods are attempted to resynchronize from corrupt input.
-                        if (decoder.Temp[0] == 0xFF && decoder.Temp[1] == 0xFF)
-                        {
-                            while (decoder.Temp[0] == 0xFF && decoder.InputProcessor.CheckEOFEnsureNoError())
-                            {
-                                decoder.InputProcessor.ReadFullUnsafe(decoder.Temp, 0, 1);
-                                if (!decoder.InputProcessor.CheckEOFEnsureNoError())
-                                {
-                                    break;
-                                }
-                            }
-
-                            // Have we found a valid restart marker?
-                            invalidRst = decoder.Temp[0] != this.expectedRst;
-                        }
-
-                        if (invalidRst)
-                        {
-                            throw new ImageFormatException("Bad RST marker");
-                        }
-                    }
-
-                    this.expectedRst++;
-                    if (this.expectedRst == JpegConstants.Markers.RST7 + 1)
-                    {
-                        this.expectedRst = JpegConstants.Markers.RST0;
-                    }
-                }
-            }
-        }
-
-        private void Reset(GolangJpegDecoderCore decoder)
-        {
-            decoder.InputProcessor.ResetHuffmanDecoder();
-
-            this.ResetDcValues();
-
-            // Reset the progressive decoder state, as per section G.1.2.2.
-            this.eobRun = 0;
-        }
-
-        /// <summary>
-        /// Reset the DC components, as per section F.2.1.3.1.
-        /// </summary>
-        private void ResetDcValues()
-        {
-            Unsafe.InitBlock(this.pointers.Dc, default, sizeof(int) * GolangJpegDecoderCore.MaxComponents);
-        }
-
-        /// <summary>
-        /// The implementation part of <see cref="InitStreamReading"/> as an instance method.
-        /// </summary>
-        /// <param name="decoder">The <see cref="GolangJpegDecoderCore"/></param>
-        /// <param name="remaining">The remaining bytes</param>
-        private void InitStreamReadingImpl(GolangJpegDecoderCore decoder, int remaining)
-        {
-            if (decoder.ComponentCount == 0)
-            {
-                throw new ImageFormatException("Missing SOF marker");
-            }
-
-            if (remaining < 6 || 4 + (2 * decoder.ComponentCount) < remaining || remaining % 2 != 0)
-            {
-                throw new ImageFormatException("SOS has wrong length");
-            }
-
-            decoder.InputProcessor.ReadFull(decoder.Temp, 0, remaining);
-            this.componentScanCount = decoder.Temp[0];
-
-            int scanComponentCountX2 = 2 * this.componentScanCount;
-            if (remaining != 4 + scanComponentCountX2)
-            {
-                throw new ImageFormatException("SOS length inconsistent with number of components");
-            }
-
-            int totalHv = 0;
-
-            for (int i = 0; i < this.componentScanCount; i++)
-            {
-                this.InitComponentScan(decoder, i, ref this.pointers.ComponentScan[i], ref totalHv);
-            }
-
-            // Section B.2.3 states that if there is more than one component then the
-            // total H*V values in a scan must be <= 10.
-            if (decoder.ComponentCount > 1 && totalHv > 10)
-            {
-                throw new ImageFormatException("Total sampling factors too large.");
-            }
-
-            this.zigEnd = Block8x8F.Size - 1;
-
-            if (decoder.IsProgressive)
-            {
-                this.zigStart = decoder.Temp[1 + scanComponentCountX2];
-                this.zigEnd = decoder.Temp[2 + scanComponentCountX2];
-                this.ah = decoder.Temp[3 + scanComponentCountX2] >> 4;
-                this.al = decoder.Temp[3 + scanComponentCountX2] & 0x0f;
-
-                if ((this.zigStart == 0 && this.zigEnd != 0) || this.zigStart > this.zigEnd
-                    || this.zigEnd >= Block8x8F.Size)
-                {
-                    throw new ImageFormatException("Bad spectral selection bounds");
-                }
-
-                if (this.zigStart != 0 && this.componentScanCount != 1)
-                {
-                    throw new ImageFormatException("Progressive AC coefficients for more than one component");
-                }
-
-                if (this.ah != 0 && this.ah != this.al + 1)
-                {
-                    throw new ImageFormatException("Bad successive approximation values");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Read the current the current block at (<see cref="bx"/>, <see cref="by"/>) from the decoders stream
-        /// </summary>
-        /// <param name="decoder">The decoder</param>
-        /// <param name="scanIndex">The index of the scan</param>
-        private void DecodeBlock(GolangJpegDecoderCore decoder, int scanIndex)
-        {
-            Block8x8* b = this.pointers.Block;
-            int huffmannIdx = (GolangHuffmanTree.AcTableIndex * GolangHuffmanTree.ThRowSize) + this.pointers.ComponentScan[scanIndex].AcTableSelector;
-            if (this.ah != 0)
-            {
-                this.Refine(ref decoder.InputProcessor, ref decoder.HuffmanTrees[huffmannIdx], 1 << this.al);
-            }
-            else
-            {
-                int zig = this.zigStart;
-
-                if (zig == 0)
-                {
-                    zig++;
-
-                    // Decode the DC coefficient, as specified in section F.2.2.1.
-                    int huffmanIndex = (GolangHuffmanTree.DcTableIndex * GolangHuffmanTree.ThRowSize) + this.pointers.ComponentScan[scanIndex].DcTableSelector;
-                    decoder.InputProcessor.DecodeHuffmanUnsafe(
-                            ref decoder.HuffmanTrees[huffmanIndex],
-                            out int value);
-                    if (!decoder.InputProcessor.CheckEOF())
-                    {
-                        return;
-                    }
-
-                    if (value > 16)
-                    {
-                        throw new ImageFormatException("Excessive DC component");
-                    }
-
-                    decoder.InputProcessor.ReceiveExtendUnsafe(value, out int deltaDC);
-                    if (!decoder.InputProcessor.CheckEOFEnsureNoError())
-                    {
-                        return;
-                    }
-
-                    this.pointers.Dc[this.ComponentIndex] += deltaDC;
-
-                    // b[0] = dc[compIndex] << al;
-                    value = this.pointers.Dc[this.ComponentIndex] << this.al;
-                    Block8x8.SetScalarAt(b, 0, (short)value);
-                }
-
-                if (zig <= this.zigEnd && this.eobRun > 0)
-                {
-                    this.eobRun--;
-                }
-                else
-                {
-                    // Decode the AC coefficients, as specified in section F.2.2.2.
-                    for (; zig <= this.zigEnd; zig++)
-                    {
-                        decoder.InputProcessor.DecodeHuffmanUnsafe(ref decoder.HuffmanTrees[huffmannIdx], out int value);
-                        if (decoder.InputProcessor.HasError)
-                        {
-                            return;
-                        }
-
-                        int val0 = value >> 4;
-                        int val1 = value & 0x0f;
-                        if (val1 != 0)
-                        {
-                            zig += val0;
-                            if (zig > this.zigEnd)
-                            {
-                                break;
-                            }
-
-                            decoder.InputProcessor.ReceiveExtendUnsafe(val1, out int ac);
-                            if (decoder.InputProcessor.HasError)
-                            {
-                                return;
-                            }
-
-                            // b[Unzig[zig]] = ac << al;
-                            value = ac << this.al;
-                            Block8x8.SetScalarAt(b, this.pointers.Unzig[zig], (short)value);
-                        }
-                        else
-                        {
-                            if (val0 != 0x0f)
-                            {
-                                this.eobRun = (ushort)(1 << val0);
-                                if (val0 != 0)
-                                {
-                                    this.DecodeEobRun(val0, ref decoder.InputProcessor);
-                                    if (!decoder.InputProcessor.CheckEOFEnsureNoError())
-                                    {
-                                        return;
-                                    }
-                                }
-
-                                this.eobRun--;
-                                break;
-                            }
-
-                            zig += 0x0f;
-                        }
-                    }
-                }
-            }
-        }
-
-        private void DecodeEobRun(int count, ref InputProcessor processor)
-        {
-            processor.DecodeBitsUnsafe(count, out int bitsResult);
-            if (processor.LastErrorCode != GolangDecoderErrorCode.NoError)
-            {
-                return;
-            }
-
-            this.eobRun |= bitsResult;
-        }
-
-        private void InitComponentScan(GolangJpegDecoderCore decoder, int i, ref GolangComponentScan currentComponentScan, ref int totalHv)
-        {
-            // Component selector.
-            int cs = decoder.Temp[1 + (2 * i)];
-            int compIndex = -1;
-            for (int j = 0; j < decoder.ComponentCount; j++)
-            {
-                // Component compv = ;
-                if (cs == decoder.Components[j].Identifier)
-                {
-                    compIndex = j;
-                }
-            }
-
-            if (compIndex < 0)
-            {
-                throw new ImageFormatException("Unknown component selector");
-            }
-
-            currentComponentScan.ComponentIndex = (byte)compIndex;
-
-            this.ProcessComponentImpl(decoder, i, ref currentComponentScan, ref totalHv, decoder.Components[compIndex]);
-        }
-
-        private void ProcessComponentImpl(
-            GolangJpegDecoderCore decoder,
-            int i,
-            ref GolangComponentScan currentComponentScan,
-            ref int totalHv,
-            GolangComponent currentComponent)
-        {
-            // Section B.2.3 states that "the value of Cs_j shall be different from
-            // the values of Cs_1 through Cs_(j-1)". Since we have previously
-            // verified that a frame's component identifiers (C_i values in section
-            // B.2.2) are unique, it suffices to check that the implicit indexes
-            // into comp are unique.
-            for (int j = 0; j < i; j++)
-            {
-                if (currentComponentScan.ComponentIndex == this.pointers.ComponentScan[j].ComponentIndex)
-                {
-                    throw new ImageFormatException("Repeated component selector");
-                }
-            }
-
-            totalHv += currentComponent.HorizontalSamplingFactor * currentComponent.VerticalSamplingFactor;
-
-            currentComponentScan.DcTableSelector = (byte)(decoder.Temp[2 + (2 * i)] >> 4);
-            if (currentComponentScan.DcTableSelector > GolangHuffmanTree.MaxTh)
-            {
-                throw new ImageFormatException("Bad DC table selector value");
-            }
-
-            currentComponentScan.AcTableSelector = (byte)(decoder.Temp[2 + (2 * i)] & 0x0f);
-            if (currentComponentScan.AcTableSelector > GolangHuffmanTree.MaxTh)
-            {
-                throw new ImageFormatException("Bad AC table selector  value");
-            }
-        }
-
-        /// <summary>
-        /// Decodes a successive approximation refinement block, as specified in section G.1.2.
-        /// </summary>
-        /// <param name="bp">The <see cref="InputProcessor"/> instance</param>
-        /// <param name="h">The Huffman tree</param>
-        /// <param name="delta">The low transform offset</param>
-        private void Refine(ref InputProcessor bp, ref GolangHuffmanTree h, int delta)
-        {
-            Block8x8* b = this.pointers.Block;
-
-            // Refining a DC component is trivial.
-            if (this.zigStart == 0)
-            {
-                if (this.zigEnd != 0)
-                {
-                    throw new ImageFormatException("Invalid state for zig DC component");
-                }
-
-                bp.DecodeBitUnsafe(out bool bit);
-                if (!bp.CheckEOFEnsureNoError())
-                {
-                    return;
-                }
-
-                if (bit)
-                {
-                    int stuff = Block8x8.GetScalarAt(b, 0);
-
-                    // int stuff = (int)b[0];
-                    stuff |= delta;
-
-                    // b[0] = stuff;
-                    Block8x8.SetScalarAt(b, 0, (short)stuff);
-                }
-
-                return;
-            }
-
-            // Refining AC components is more complicated; see sections G.1.2.2 and G.1.2.3.
-            int zig = this.zigStart;
-            if (this.eobRun == 0)
-            {
-                for (; zig <= this.zigEnd; zig++)
-                {
-                    bool done = false;
-                    int z = 0;
-
-                    bp.DecodeHuffmanUnsafe(ref h, out int val);
-                    if (!bp.CheckEOF())
-                    {
-                        return;
-                    }
-
-                    int val0 = val >> 4;
-                    int val1 = val & 0x0f;
-
-                    switch (val1)
-                    {
-                        case 0:
-                            if (val0 != 0x0f)
-                            {
-                                this.eobRun = 1 << val0;
-                                if (val0 != 0)
-                                {
-                                    this.DecodeEobRun(val0, ref bp);
-                                    if (!bp.CheckEOFEnsureNoError())
-                                    {
-                                        return;
-                                    }
-                                }
-
-                                done = true;
-                            }
-
-                            break;
-                        case 1:
-                            z = delta;
-
-                            bp.DecodeBitUnsafe(out bool bit);
-                            if (!bp.CheckEOFEnsureNoError())
-                            {
-                                return;
-                            }
-
-                            if (!bit)
-                            {
-                                z = -z;
-                            }
-
-                            break;
-                        default:
-                            throw new ImageFormatException("Unexpected Huffman code");
-                    }
-
-                    if (done)
-                    {
-                        break;
-                    }
-
-                    zig = this.RefineNonZeroes(ref bp, zig, val0, delta);
-
-                    if (bp.ReachedEOF || bp.HasError)
-                    {
-                        return;
-                    }
-
-                    if (z != 0 && zig <= this.zigEnd)
-                    {
-                        // b[Unzig[zig]] = z;
-                        Block8x8.SetScalarAt(b, this.pointers.Unzig[zig], (short)z);
-                    }
-                }
-            }
-
-            if (this.eobRun > 0)
-            {
-                this.eobRun--;
-                this.RefineNonZeroes(ref bp, zig, -1, delta);
-            }
-        }
-
-        /// <summary>
-        /// Refines non-zero entries of b in zig-zag order.
-        /// If <paramref name="nz" /> >= 0, the first <paramref name="nz" /> zero entries are skipped over.
-        /// </summary>
-        /// <param name="bp">The <see cref="InputProcessor"/></param>
-        /// <param name="zig">The zig-zag start index</param>
-        /// <param name="nz">The non-zero entry</param>
-        /// <param name="delta">The low transform offset</param>
-        /// <returns>The <see cref="int" /></returns>
-        private int RefineNonZeroes(ref InputProcessor bp, int zig, int nz, int delta)
-        {
-            Block8x8* b = this.pointers.Block;
-            for (; zig <= this.zigEnd; zig++)
-            {
-                int u = this.pointers.Unzig[zig];
-                int bu = Block8x8.GetScalarAt(b, u);
-
-                // TODO: Are the equality comparsions OK with floating point values? Isn't an epsilon value necessary?
-                if (bu == 0)
-                {
-                    if (nz == 0)
-                    {
-                        break;
-                    }
-
-                    nz--;
-                    continue;
-                }
-
-                bp.DecodeBitUnsafe(out bool bit);
-                if (bp.HasError)
-                {
-                    return int.MinValue;
-                }
-
-                if (!bit)
-                {
-                    continue;
-                }
-
-                int val = bu >= 0 ? bu + delta : bu - delta;
-
-                Block8x8.SetScalarAt(b, u, (short)val);
-            }
-
-            return zig;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
deleted file mode 100644
index c7e14ee4f..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.IO;
-using System.Runtime.CompilerServices;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// Encapsulates stream reading and processing data and operations for <see cref="GolangJpegDecoderCore"/>.
-    /// It's a value type for imporved data locality, and reduced number of CALLVIRT-s
-    /// </summary>
-    internal struct InputProcessor : IDisposable
-    {
-        /// <summary>
-        /// Holds the unprocessed bits that have been taken from the byte-stream.
-        /// </summary>
-        public Bits Bits;
-
-        /// <summary>
-        /// The byte buffer
-        /// </summary>
-        public Bytes Bytes;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InputProcessor"/> struct.
-        /// </summary>
-        /// <param name="inputStream">The input <see cref="Stream"/></param>
-        /// <param name="temp">Temporal buffer, same as <see cref="GolangJpegDecoderCore.Temp"/></param>
-        public InputProcessor(Stream inputStream, byte[] temp)
-        {
-            this.Bits = default;
-            this.Bytes = Bytes.Create();
-            this.InputStream = inputStream;
-            this.Temp = temp;
-            this.LastErrorCode = GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Gets the input stream
-        /// </summary>
-        public Stream InputStream { get; }
-
-        /// <summary>
-        /// Gets the temporary buffer, same instance as <see cref="GolangJpegDecoderCore.Temp"/>
-        /// </summary>
-        public byte[] Temp { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether an unexpected EOF reached in <see cref="InputStream"/>.
-        /// </summary>
-        public bool ReachedEOF => this.LastErrorCode == GolangDecoderErrorCode.UnexpectedEndOfStream;
-
-        public bool HasError => this.LastErrorCode != GolangDecoderErrorCode.NoError;
-
-        public GolangDecoderErrorCode LastErrorCode { get; private set; }
-
-        public void ResetErrorState() => this.LastErrorCode = GolangDecoderErrorCode.NoError;
-
-        /// <summary>
-        /// If errorCode indicates unexpected EOF, sets <see cref="ReachedEOF"/> to true and returns false.
-        /// Calls <see cref="DecoderThrowHelper.EnsureNoError"/> and returns true otherwise.
-        /// </summary>
-        /// <returns>A <see cref="bool"/> indicating whether EOF reached</returns>
-        public bool CheckEOFEnsureNoError()
-        {
-            if (this.LastErrorCode == GolangDecoderErrorCode.UnexpectedEndOfStream)
-            {
-                return false;
-            }
-
-            this.LastErrorCode.EnsureNoError();
-            return true;
-        }
-
-        /// <summary>
-        /// If errorCode indicates unexpected EOF, sets <see cref="ReachedEOF"/> to true and returns false.
-        /// Returns true otherwise.
-        /// </summary>
-        /// <returns>A <see cref="bool"/> indicating whether EOF reached</returns>
-        public bool CheckEOF()
-        {
-            if (this.LastErrorCode == GolangDecoderErrorCode.UnexpectedEndOfStream)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            this.Bytes.Dispose();
-        }
-
-        /// <summary>
-        /// Returns the next byte, whether buffered or not buffered. It does not care about byte stuffing.
-        /// </summary>
-        /// <returns>The <see cref="byte" /></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public byte ReadByte()
-        {
-            return this.Bytes.ReadByte(this.InputStream);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public GolangDecoderErrorCode ReadByteUnsafe(out byte result)
-        {
-            this.LastErrorCode = this.Bytes.ReadByteUnsafe(this.InputStream, out result);
-            return this.LastErrorCode;
-        }
-
-        /// <summary>
-        /// Decodes a single bit
-        /// TODO: This method (and also the usages) could be optimized by batching!
-        /// </summary>
-        /// <param name="result">The decoded bit as a <see cref="bool"/></param>
-        /// <returns>The <see cref="GolangDecoderErrorCode" /></returns>
-        public GolangDecoderErrorCode DecodeBitUnsafe(out bool result)
-        {
-            if (this.Bits.UnreadBits == 0)
-            {
-                this.LastErrorCode = this.Bits.Ensure1BitUnsafe(ref this);
-                if (this.LastErrorCode != GolangDecoderErrorCode.NoError)
-                {
-                    result = false;
-                    return this.LastErrorCode;
-                }
-            }
-
-            result = (this.Bits.Accumulator & this.Bits.Mask) != 0;
-            this.Bits.UnreadBits--;
-            this.Bits.Mask >>= 1;
-            return this.LastErrorCode = GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Reads exactly length bytes into data. It does not care about byte stuffing.
-        /// Does not throw on errors, returns <see cref="GolangJpegDecoderCore"/> instead!
-        /// </summary>
-        /// <param name="data">The data to write to.</param>
-        /// <param name="offset">The offset in the source buffer</param>
-        /// <param name="length">The number of bytes to read</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode ReadFullUnsafe(byte[] data, int offset, int length)
-        {
-            // Unread the overshot bytes, if any.
-            if (this.Bytes.UnreadableBytes != 0)
-            {
-                if (this.Bits.UnreadBits >= 8)
-                {
-                    this.UnreadByteStuffedByte();
-                }
-
-                this.Bytes.UnreadableBytes = 0;
-            }
-
-            this.LastErrorCode = GolangDecoderErrorCode.NoError;
-            while (length > 0 && this.LastErrorCode == GolangDecoderErrorCode.NoError)
-            {
-                if (this.Bytes.J - this.Bytes.I >= length)
-                {
-                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, length);
-                    this.Bytes.I += length;
-                    length -= length;
-                }
-                else
-                {
-                    Array.Copy(this.Bytes.Buffer, this.Bytes.I, data, offset, this.Bytes.J - this.Bytes.I);
-                    offset += this.Bytes.J - this.Bytes.I;
-                    length -= this.Bytes.J - this.Bytes.I;
-                    this.Bytes.I += this.Bytes.J - this.Bytes.I;
-
-                    this.LastErrorCode = this.Bytes.FillUnsafe(this.InputStream);
-                }
-            }
-
-            return this.LastErrorCode;
-        }
-
-        /// <summary>
-        /// Decodes the given number of bits
-        /// </summary>
-        /// <param name="count">The number of bits to decode.</param>
-        /// <param name="result">The <see cref="uint" /> result</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode DecodeBitsUnsafe(int count, out int result)
-        {
-            if (this.Bits.UnreadBits < count)
-            {
-                this.LastErrorCode = this.Bits.EnsureNBitsUnsafe(count, ref this);
-                if (this.LastErrorCode != GolangDecoderErrorCode.NoError)
-                {
-                    result = 0;
-                    return this.LastErrorCode;
-                }
-            }
-
-            result = this.Bits.Accumulator >> (this.Bits.UnreadBits - count);
-            result = result & ((1 << count) - 1);
-            this.Bits.UnreadBits -= count;
-            this.Bits.Mask >>= count;
-            return this.LastErrorCode = GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Extracts the next Huffman-coded value from the bit-stream into result, decoded according to the given value.
-        /// </summary>
-        /// <param name="huffmanTree">The huffman value</param>
-        /// <param name="result">The decoded <see cref="byte" /></param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode DecodeHuffmanUnsafe(ref GolangHuffmanTree huffmanTree, out int result)
-        {
-            result = 0;
-
-            if (huffmanTree.Length == 0)
-            {
-                DecoderThrowHelper.ThrowImageFormatException.UninitializedHuffmanTable();
-            }
-
-            if (this.Bits.UnreadBits < 8)
-            {
-                this.LastErrorCode = this.Bits.Ensure8BitsUnsafe(ref this);
-
-                if (this.LastErrorCode == GolangDecoderErrorCode.NoError)
-                {
-                    int lutIndex = (this.Bits.Accumulator >> (this.Bits.UnreadBits - GolangHuffmanTree.LutSizeLog2)) & 0xFF;
-                    int v = huffmanTree.Lut[lutIndex];
-
-                    if (v != 0)
-                    {
-                        int n = (v & 0xFF) - 1;
-                        this.Bits.UnreadBits -= n;
-                        this.Bits.Mask >>= n;
-                        result = v >> 8;
-                        return this.LastErrorCode;
-                    }
-                }
-                else
-                {
-                    this.UnreadByteStuffedByte();
-                    return this.LastErrorCode;
-                }
-            }
-
-            int code = 0;
-            for (int i = 0; i < GolangHuffmanTree.MaxCodeLength; i++)
-            {
-                if (this.Bits.UnreadBits == 0)
-                {
-                    this.LastErrorCode = this.Bits.EnsureNBitsUnsafe(1, ref this);
-
-                    if (this.HasError)
-                    {
-                        return this.LastErrorCode;
-                    }
-                }
-
-                if ((this.Bits.Accumulator & this.Bits.Mask) != 0)
-                {
-                    code |= 1;
-                }
-
-                this.Bits.UnreadBits--;
-                this.Bits.Mask >>= 1;
-
-                if (code <= huffmanTree.MaxCodes[i])
-                {
-                    result = huffmanTree.GetValue(code, i);
-                    return this.LastErrorCode = GolangDecoderErrorCode.NoError;
-                }
-
-                code <<= 1;
-            }
-
-            // Unrecoverable error, throwing:
-            DecoderThrowHelper.ThrowImageFormatException.BadHuffmanCode();
-
-            // DUMMY RETURN! C# doesn't know we have thrown an exception!
-            return GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Skips the next n bytes.
-        /// </summary>
-        /// <param name="count">The number of bytes to ignore.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Skip(int count)
-        {
-            this.LastErrorCode = this.SkipUnsafe(count);
-            this.LastErrorCode.EnsureNoError();
-        }
-
-        /// <summary>
-        /// Skips the next n bytes.
-        /// Does not throw, returns <see cref="GolangDecoderErrorCode"/> instead!
-        /// </summary>
-        /// <param name="count">The number of bytes to ignore.</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode SkipUnsafe(int count)
-        {
-            // Unread the overshot bytes, if any.
-            if (this.Bytes.UnreadableBytes != 0)
-            {
-                if (this.Bits.UnreadBits >= 8)
-                {
-                    this.UnreadByteStuffedByte();
-                }
-
-                this.Bytes.UnreadableBytes = 0;
-            }
-
-            while (true)
-            {
-                int m = this.Bytes.J - this.Bytes.I;
-                if (m > count)
-                {
-                    m = count;
-                }
-
-                this.Bytes.I += m;
-                count -= m;
-                if (count == 0)
-                {
-                    break;
-                }
-
-                this.LastErrorCode = this.Bytes.FillUnsafe(this.InputStream);
-                if (this.LastErrorCode != GolangDecoderErrorCode.NoError)
-                {
-                    return this.LastErrorCode;
-                }
-            }
-
-            return this.LastErrorCode = GolangDecoderErrorCode.NoError;
-        }
-
-        /// <summary>
-        /// Reads exactly length bytes into data. It does not care about byte stuffing.
-        /// </summary>
-        /// <param name="data">The data to write to.</param>
-        /// <param name="offset">The offset in the source buffer</param>
-        /// <param name="length">The number of bytes to read</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void ReadFull(byte[] data, int offset, int length)
-        {
-            this.LastErrorCode = this.ReadFullUnsafe(data, offset, length);
-            this.LastErrorCode.EnsureNoError();
-        }
-
-        /// <summary>
-        /// Undoes the most recent ReadByteStuffedByte call,
-        /// giving a byte of data back from bits to bytes. The Huffman look-up table
-        /// requires at least 8 bits for look-up, which means that Huffman decoding can
-        /// sometimes overshoot and read one or two too many bytes. Two-byte overshoot
-        /// can happen when expecting to read a 0xff 0x00 byte-stuffed byte.
-        /// </summary>
-        public void UnreadByteStuffedByte()
-        {
-            this.Bytes.I -= this.Bytes.UnreadableBytes;
-            this.Bytes.UnreadableBytes = 0;
-            if (this.Bits.UnreadBits >= 8)
-            {
-                this.Bits.Accumulator >>= 8;
-                this.Bits.UnreadBits -= 8;
-                this.Bits.Mask >>= 8;
-            }
-        }
-
-        /// <summary>
-        /// Receive extend
-        /// </summary>
-        /// <param name="t">Byte</param>
-        /// <param name="x">Read bits value</param>
-        /// <returns>The <see cref="GolangDecoderErrorCode"/></returns>
-        public GolangDecoderErrorCode ReceiveExtendUnsafe(int t, out int x)
-        {
-            this.LastErrorCode = this.Bits.ReceiveExtendUnsafe(t, ref this, out x);
-            return this.LastErrorCode;
-        }
-
-        /// <summary>
-        /// Reset the Huffman decoder.
-        /// </summary>
-        public void ResetHuffmanDecoder()
-        {
-            this.Bits = default;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.md b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.md
deleted file mode 100644
index 4ca4d1f64..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## JpegScanDecoder
-Encapsulates the impementation of the Jpeg top-to bottom scan decoder triggered by the `SOS` marker. 
-The implementation is optimized to hold most of the necessary data in a single value type, which is intended to be used as an on-stack object.
-
-#### Benefits:
-- Maximized locality of reference by keeping most of the operation data on the stack
-- Achieving this without long parameter lists, most of the values describing the state of the decoder algorithm 
-are members of the `JpegScanDecoder` struct
-- Most of the logic related to Scan decoding is refactored & simplified now to live in the methods of `JpegScanDecoder`
-- The first step is done towards separating the stream reading from block processing. They can be refactored later to be executed in two disctinct loops.
-  - The input processing loop can be `async`
-  - The block processing loop can be parallelized
-
-#### Data layout
-
-|JpegScanDecoder    |
-|-------------------|
-|Variables          |
-|DataPointers       |
-|ComputationData    |
-
-- **ComputationData** holds the "large" data blocks needed for computations (Mostly `Block8x8F`-s)
-- **DataPointers** contains pointers to the memory regions of `ComponentData` so they can be easily passed around to pointer based utility methods of `Block8x8F`
-
-
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs
deleted file mode 100644
index 005034b9d..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
-{
-    /// <summary>
-    /// The missing ff00 exception.
-    /// </summary>
-    // ReSharper disable once InconsistentNaming
-    internal class MissingFF00Exception : Exception
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoder.cs
deleted file mode 100644
index 29255204b..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoder.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.IO;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
-{
-    /// <summary>
-    /// Image decoder for generating an image out of a jpg stream.
-    /// </summary>
-    internal sealed class GolangJpegDecoder : IImageDecoder, IJpegDecoderOptions, IImageInfoDetector
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
-        /// </summary>
-        public bool IgnoreMetadata { get; set; }
-
-        /// <inheritdoc/>
-        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            using (var decoder = new GolangJpegDecoderCore(configuration, this))
-            {
-                return decoder.Decode<TPixel>(stream);
-            }
-        }
-
-        /// <inheritdoc/>
-        public IImageInfo Identify(Configuration configuration, Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            using (var decoder = new GolangJpegDecoderCore(configuration, this))
-            {
-                return decoder.Identify(stream);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
deleted file mode 100644
index 46cdcddb4..000000000
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs
+++ /dev/null
@@ -1,824 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.Collections.Generic;
-using System.IO;
-
-using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-using SixLabors.ImageSharp.MetaData;
-using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-using SixLabors.ImageSharp.MetaData.Profiles.Icc;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Primitives;
-using SixLabors.Primitives;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
-{
-    /// <inheritdoc />
-    /// <summary>
-    /// Performs the jpeg decoding operation.
-    /// </summary>
-    internal sealed unsafe class GolangJpegDecoderCore : IRawJpegData
-    {
-        /// <summary>
-        /// The maximum number of color components
-        /// </summary>
-        public const int MaxComponents = 4;
-
-        /// <summary>
-        /// The maximum number of quantization tables
-        /// </summary>
-        public const int MaxTq = 3;
-
-        /// <summary>
-        /// The only supported precision
-        /// </summary>
-        public const int SupportedPrecision = 8;
-
-        // Complex value type field + mutable + available to other classes = the field MUST NOT be private :P
-#pragma warning disable SA1401 // FieldsMustBePrivate
-
-        /// <summary>
-        /// Encapsulates stream reading and processing data and operations for <see cref="GolangJpegDecoderCore"/>.
-        /// It's a value type for improved data locality, and reduced number of CALLVIRT-s
-        /// </summary>
-        public InputProcessor InputProcessor;
-#pragma warning restore SA401
-
-        /// <summary>
-        /// The global configuration
-        /// </summary>
-        private readonly Configuration configuration;
-
-        /// <summary>
-        /// Whether the image has a JFIF header
-        /// It's faster to check this than to use the equality operator on the struct
-        /// </summary>
-        private bool isJFif;
-
-        /// <summary>
-        /// Contains information about the JFIF marker
-        /// </summary>
-        private JFifMarker jFif;
-
-        /// <summary>
-        /// Whether the image has a EXIF header
-        /// </summary>
-        private bool isExif;
-
-        /// <summary>
-        /// Whether the image has an Adobe marker.
-        /// It's faster to check this than to use the equality operator on the struct
-        /// </summary>
-        private bool isAdobe;
-
-        /// <summary>
-        /// Contains information about the Adobe marker
-        /// </summary>
-        private AdobeMarker adobe;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GolangJpegDecoderCore" /> class.
-        /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        /// <param name="options">The options.</param>
-        public GolangJpegDecoderCore(Configuration configuration, IJpegDecoderOptions options)
-        {
-            this.IgnoreMetadata = options.IgnoreMetadata;
-            this.configuration = configuration ?? Configuration.Default;
-            this.Temp = new byte[2 * Block8x8F.Size];
-        }
-
-        /// <inheritdoc />
-        public JpegColorSpace ColorSpace { get; private set; }
-
-        /// <summary>
-        /// Gets the component array
-        /// </summary>
-        public GolangComponent[] Components { get; private set; }
-
-        /// <summary>
-        /// Gets the huffman trees
-        /// </summary>
-        public GolangHuffmanTree[] HuffmanTrees { get; private set; }
-
-        /// <inheritdoc />
-        public Block8x8F[] QuantizationTables { get; private set; }
-
-        /// <summary>
-        /// Gets the temporary buffer used to store bytes read from the stream.
-        /// TODO: Should be stack allocated, fixed sized buffer!
-        /// </summary>
-        public byte[] Temp { get; }
-
-        /// <inheritdoc />
-        public Size ImageSizeInPixels { get; private set; }
-
-        /// <summary>
-        /// Gets the number of MCU blocks in the image as <see cref="Size"/>.
-        /// </summary>
-        public Size ImageSizeInMCU { get; private set; }
-
-        /// <inheritdoc />
-        public int ComponentCount { get; private set; }
-
-        IEnumerable<IJpegComponent> IRawJpegData.Components => this.Components;
-
-        /// <summary>
-        /// Gets the color depth, in number of bits per pixel.
-        /// </summary>
-        public int BitsPerPixel => this.ComponentCount * SupportedPrecision;
-
-        /// <summary>
-        /// Gets the image height
-        /// </summary>
-        public int ImageHeight => this.ImageSizeInPixels.Height;
-
-        /// <summary>
-        /// Gets the image width
-        /// </summary>
-        public int ImageWidth => this.ImageSizeInPixels.Width;
-
-        /// <summary>
-        /// Gets the input stream.
-        /// </summary>
-        public Stream InputStream { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the image is interlaced (progressive)
-        /// </summary>
-        public bool IsProgressive { get; private set; }
-
-        /// <summary>
-        /// Gets the restart interval
-        /// </summary>
-        public int RestartInterval { get; private set; }
-
-        /// <summary>
-        /// Gets the number of MCU-s (Minimum Coded Units) in the image along the X axis
-        /// </summary>
-        public int MCUCountX => this.ImageSizeInMCU.Width;
-
-        /// <summary>
-        /// Gets the number of MCU-s (Minimum Coded Units) in the image along the Y axis
-        /// </summary>
-        public int MCUCountY => this.ImageSizeInMCU.Height;
-
-        /// <summary>
-        /// Gets the total number of MCU-s (Minimum Coded Units) in the image.
-        /// </summary>
-        public int TotalMCUCount => this.MCUCountX * this.MCUCountY;
-
-        /// <summary>
-        /// Gets a value indicating whether the metadata should be ignored when the image is being decoded.
-        /// </summary>
-        public bool IgnoreMetadata { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ImageMetaData"/> decoded by this decoder instance.
-        /// </summary>
-        public ImageMetaData MetaData { get; private set; }
-
-        /// <summary>
-        /// Decodes the image from the specified <see cref="Stream"/> and sets
-        /// the data to image.
-        /// </summary>
-        /// <typeparam name="TPixel">The pixel format.</typeparam>
-        /// <param name="stream">The stream, where the image should be.</param>
-        /// <returns>The decoded image.</returns>
-        public Image<TPixel> Decode<TPixel>(Stream stream)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            this.ParseStream(stream);
-            return this.PostProcessIntoImage<TPixel>();
-        }
-
-        /// <summary>
-        /// Reads the raw image information from the specified stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        public IImageInfo Identify(Stream stream)
-        {
-            this.ParseStream(stream, true);
-            return new ImageInfo(new PixelTypeInfo(this.BitsPerPixel), this.ImageWidth, this.ImageHeight, this.MetaData);
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            if (this.Components != null)
-            {
-                foreach (GolangComponent component in this.Components)
-                {
-                    component?.Dispose();
-                }
-            }
-
-            this.InputProcessor.Dispose();
-        }
-
-        /// <summary>
-        /// Read metadata from stream and read the blocks in the scans into <see cref="GolangComponent.SpectralBlocks"/>.
-        /// </summary>
-        /// <param name="stream">The stream</param>
-        /// <param name="metadataOnly">Whether to decode metadata only.</param>
-        public void ParseStream(Stream stream, bool metadataOnly = false)
-        {
-            this.MetaData = new ImageMetaData();
-            this.InputStream = stream;
-            this.InputProcessor = new InputProcessor(stream, this.Temp);
-
-            if (!metadataOnly)
-            {
-                this.HuffmanTrees = GolangHuffmanTree.CreateHuffmanTrees();
-                this.QuantizationTables = new Block8x8F[MaxTq + 1];
-            }
-
-            // Check for the Start Of Image marker.
-            this.InputProcessor.ReadFull(this.Temp, 0, 2);
-
-            if (this.Temp[0] != JpegConstants.Markers.XFF || this.Temp[1] != JpegConstants.Markers.SOI)
-            {
-                throw new ImageFormatException("Missing SOI marker.");
-            }
-
-            // Process the remaining segments until the End Of Image marker.
-            bool processBytes = true;
-
-            // we can't currently short circute progressive images so don't try.
-            while (processBytes)
-            {
-                this.InputProcessor.ReadFull(this.Temp, 0, 2);
-
-                if (this.InputProcessor.ReachedEOF)
-                {
-                    // We've reached the end of the stream.
-                    processBytes = false;
-                }
-
-                while (this.Temp[0] != 0xff)
-                {
-                    // Strictly speaking, this is a format error. However, libjpeg is
-                    // liberal in what it accepts. As of version 9, next_marker in
-                    // jdmarker.c treats this as a warning (JWRN_EXTRANEOUS_DATA) and
-                    // continues to decode the stream. Even before next_marker sees
-                    // extraneous data, jpeg_fill_bit_buffer in jdhuff.c reads as many
-                    // bytes as it can, possibly past the end of a scan's data. It
-                    // effectively puts back any markers that it overscanned (e.g. an
-                    // "\xff\xd9" EOI marker), but it does not put back non-marker data,
-                    // and thus it can silently ignore a small number of extraneous
-                    // non-marker bytes before next_marker has a chance to see them (and
-                    // print a warning).
-                    // We are therefore also liberal in what we accept. Extraneous data
-                    // is silently ignore
-                    // This is similar to, but not exactly the same as, the restart
-                    // mechanism within a scan (the RST[0-7] markers).
-                    // Note that extraneous 0xff bytes in e.g. SOS data are escaped as
-                    // "\xff\x00", and so are detected a little further down below.
-                    this.Temp[0] = this.Temp[1];
-                    this.Temp[1] = this.InputProcessor.ReadByte();
-                }
-
-                byte marker = this.Temp[1];
-                if (marker == 0)
-                {
-                    // Treat "\xff\x00" as extraneous data.
-                    continue;
-                }
-
-                while (marker == 0xff)
-                {
-                    // Section B.1.1.2 says, "Any marker may optionally be preceded by any
-                    // number of fill bytes, which are bytes assigned code X'FF'".
-                    this.InputProcessor.ReadByteUnsafe(out marker);
-
-                    if (this.InputProcessor.ReachedEOF)
-                    {
-                        // We've reached the end of the stream.
-                        processBytes = false;
-                        break;
-                    }
-                }
-
-                // End Of Image.
-                if (marker == JpegConstants.Markers.EOI)
-                {
-                    break;
-                }
-
-                if (marker >= JpegConstants.Markers.RST0 && marker <= JpegConstants.Markers.RST7)
-                {
-                    // Figures B.2 and B.16 of the specification suggest that restart markers should
-                    // only occur between Entropy Coded Segments and not after the final ECS.
-                    // However, some encoders may generate incorrect JPEGs with a final restart
-                    // marker. That restart marker will be seen here instead of inside the ProcessSOS
-                    // method, and is ignored as a harmless error. Restart markers have no extra data,
-                    // so we check for this before we read the 16-bit length of the segment.
-                    continue;
-                }
-
-                // Read the 16-bit length of the segment. The value includes the 2 bytes for the
-                // length itself, so we subtract 2 to get the number of remaining bytes.
-                this.InputProcessor.ReadFullUnsafe(this.Temp, 0, 2);
-                int remaining = (this.Temp[0] << 8) + this.Temp[1] - 2;
-                if (remaining < 0)
-                {
-                    throw new ImageFormatException("Short segment length.");
-                }
-
-                switch (marker)
-                {
-                    case JpegConstants.Markers.SOF0:
-                    case JpegConstants.Markers.SOF1:
-                    case JpegConstants.Markers.SOF2:
-                        this.IsProgressive = marker == JpegConstants.Markers.SOF2;
-                        this.ProcessStartOfFrameMarker(remaining, metadataOnly);
-
-                        break;
-                    case JpegConstants.Markers.DHT:
-
-                        if (metadataOnly)
-                        {
-                            this.InputProcessor.Skip(remaining);
-                        }
-                        else
-                        {
-                            this.ProcessDefineHuffmanTablesMarker(remaining);
-                        }
-
-                        break;
-                    case JpegConstants.Markers.DQT:
-                        if (metadataOnly)
-                        {
-                            this.InputProcessor.Skip(remaining);
-                        }
-                        else
-                        {
-                            this.ProcessDefineQuantizationTablesMarker(remaining);
-                        }
-
-                        break;
-                    case JpegConstants.Markers.SOS:
-                        if (!metadataOnly)
-                        {
-                            this.ProcessStartOfScanMarker(remaining);
-                            if (this.InputProcessor.ReachedEOF)
-                            {
-                                // If unexpected EOF reached. We can stop processing bytes as we now have the image data.
-                                processBytes = false;
-                            }
-                        }
-                        else
-                        {
-                            // It's highly unlikely that APPn related data will be found after the SOS marker
-                            // We should have gathered everything we need by now.
-                            processBytes = false;
-                        }
-
-                        break;
-
-                    case JpegConstants.Markers.DRI:
-                        if (metadataOnly)
-                        {
-                            this.InputProcessor.Skip(remaining);
-                        }
-                        else
-                        {
-                            this.ProcessDefineRestartIntervalMarker(remaining);
-                        }
-
-                        break;
-                    case JpegConstants.Markers.APP0:
-                        this.ProcessApplicationHeaderMarker(remaining);
-                        break;
-                    case JpegConstants.Markers.APP1:
-                        this.ProcessApp1Marker(remaining);
-                        break;
-                    case JpegConstants.Markers.APP2:
-                        this.ProcessApp2Marker(remaining);
-                        break;
-                    case JpegConstants.Markers.APP14:
-                        this.ProcessApp14Marker(remaining);
-                        break;
-                    default:
-                        if ((marker >= JpegConstants.Markers.APP0 && marker <= JpegConstants.Markers.APP15)
-                            || marker == JpegConstants.Markers.COM)
-                        {
-                            this.InputProcessor.Skip(remaining);
-                        }
-
-                        break;
-                }
-            }
-
-            this.InitDerivedMetaDataProperties();
-        }
-
-        /// <summary>
-        /// Returns true if 'mcuCounter' is at restart interval
-        /// </summary>
-        public bool IsAtRestartInterval(int mcuCounter)
-        {
-            return this.RestartInterval > 0 && mcuCounter % this.RestartInterval == 0
-                                            && mcuCounter < this.TotalMCUCount;
-        }
-
-        /// <summary>
-        /// Assigns derived metadata properties to <see cref="MetaData"/>, eg. horizontal and vertical resolution if it has a JFIF header.
-        /// </summary>
-        private void InitDerivedMetaDataProperties()
-        {
-            if (this.isJFif)
-            {
-                this.MetaData.HorizontalResolution = this.jFif.XDensity;
-                this.MetaData.VerticalResolution = this.jFif.YDensity;
-            }
-            else if (this.isExif)
-            {
-                double horizontalValue = this.MetaData.ExifProfile.TryGetValue(ExifTag.XResolution, out ExifValue horizonalTag)
-                    ? ((Rational)horizonalTag.Value).ToDouble()
-                    : 0;
-
-                double verticalValue = this.MetaData.ExifProfile.TryGetValue(ExifTag.YResolution, out ExifValue verticalTag)
-                    ? ((Rational)verticalTag.Value).ToDouble()
-                    : 0;
-
-                if (horizontalValue > 0 && verticalValue > 0)
-                {
-                    this.MetaData.HorizontalResolution = horizontalValue;
-                    this.MetaData.VerticalResolution = verticalValue;
-                }
-            }
-
-            if (this.MetaData.IccProfile?.CheckIsValid() == false)
-            {
-                this.MetaData.IccProfile = null;
-            }
-        }
-
-        /// <summary>
-        /// Processes the application header containing the JFIF identifier plus extra data.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessApplicationHeaderMarker(int remaining)
-        {
-            if (remaining < 5)
-            {
-                this.InputProcessor.Skip(remaining);
-                return;
-            }
-
-            const int MarkerLength = JFifMarker.Length;
-            this.InputProcessor.ReadFull(this.Temp, 0, MarkerLength);
-            remaining -= MarkerLength;
-
-            this.isJFif = JFifMarker.TryParse(this.Temp, out this.jFif);
-
-            if (remaining > 0)
-            {
-                this.InputProcessor.Skip(remaining);
-            }
-        }
-
-        /// <summary>
-        /// Processes the App1 marker retrieving any stored metadata
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessApp1Marker(int remaining)
-        {
-            if (remaining < 6 || this.IgnoreMetadata)
-            {
-                this.InputProcessor.Skip(remaining);
-                return;
-            }
-
-            byte[] profile = new byte[remaining];
-            this.InputProcessor.ReadFull(profile, 0, remaining);
-
-            if (ProfileResolver.IsProfile(profile, ProfileResolver.ExifMarker))
-            {
-                this.isExif = true;
-                this.MetaData.ExifProfile = new ExifProfile(profile);
-            }
-        }
-
-        /// <summary>
-        /// Processes the App2 marker retrieving any stored ICC profile information
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessApp2Marker(int remaining)
-        {
-            // Length is 14 though we only need to check 12.
-            const int Icclength = 14;
-            if (remaining < Icclength || this.IgnoreMetadata)
-            {
-                this.InputProcessor.Skip(remaining);
-                return;
-            }
-
-            byte[] identifier = new byte[Icclength];
-            this.InputProcessor.ReadFull(identifier, 0, Icclength);
-            remaining -= Icclength; // We have read it by this point
-
-            if (ProfileResolver.IsProfile(identifier, ProfileResolver.IccMarker))
-            {
-                byte[] profile = new byte[remaining];
-                this.InputProcessor.ReadFull(profile, 0, remaining);
-
-                if (this.MetaData.IccProfile == null)
-                {
-                    this.MetaData.IccProfile = new IccProfile(profile);
-                }
-                else
-                {
-                    this.MetaData.IccProfile.Extend(profile);
-                }
-            }
-            else
-            {
-                // Not an ICC profile we can handle. Skip the remaining bytes so we can carry on and ignore this.
-                this.InputProcessor.Skip(remaining);
-            }
-        }
-
-        /// <summary>
-        /// Processes the application header containing the Adobe identifier
-        /// which stores image encoding information for DCT filters.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessApp14Marker(int remaining)
-        {
-            const int MarkerLength = AdobeMarker.Length;
-            if (remaining < MarkerLength)
-            {
-                // Skip the application header length
-                this.InputProcessor.Skip(remaining);
-                return;
-            }
-
-            this.InputProcessor.ReadFull(this.Temp, 0, MarkerLength);
-            remaining -= MarkerLength;
-
-            this.isAdobe = AdobeMarker.TryParse(this.Temp, out this.adobe);
-
-            if (remaining > 0)
-            {
-                this.InputProcessor.Skip(remaining);
-            }
-        }
-
-        /// <summary>
-        /// Processes the Define Quantization Marker and tables. Specified in section B.2.4.1.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the tables do not match the header
-        /// </exception>
-        private void ProcessDefineQuantizationTablesMarker(int remaining)
-        {
-            while (remaining > 0)
-            {
-                bool done = false;
-
-                remaining--;
-                byte x = this.InputProcessor.ReadByte();
-                int tq = x & 0x0F;
-                if (tq > MaxTq)
-                {
-                    throw new ImageFormatException("Bad Tq value");
-                }
-
-                switch (x >> 4)
-                {
-                    case 0:
-                        if (remaining < Block8x8F.Size)
-                        {
-                            done = true;
-                            break;
-                        }
-
-                        remaining -= Block8x8F.Size;
-                        this.InputProcessor.ReadFull(this.Temp, 0, Block8x8F.Size);
-
-                        for (int i = 0; i < Block8x8F.Size; i++)
-                        {
-                            this.QuantizationTables[tq][i] = this.Temp[i];
-                        }
-
-                        break;
-                    case 1:
-                        if (remaining < 2 * Block8x8F.Size)
-                        {
-                            done = true;
-                            break;
-                        }
-
-                        remaining -= 2 * Block8x8F.Size;
-                        this.InputProcessor.ReadFull(this.Temp, 0, 2 * Block8x8F.Size);
-
-                        for (int i = 0; i < Block8x8F.Size; i++)
-                        {
-                            this.QuantizationTables[tq][i] = (this.Temp[2 * i] << 8) | this.Temp[(2 * i) + 1];
-                        }
-
-                        break;
-                    default:
-                        throw new ImageFormatException("Bad Pq value");
-                }
-
-                if (done)
-                {
-                    break;
-                }
-            }
-
-            if (remaining != 0)
-            {
-                throw new ImageFormatException("DQT has wrong length");
-            }
-        }
-
-        /// <summary>
-        /// Processes the Start of Frame marker.  Specified in section B.2.2.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <param name="metadataOnly">Whether to decode metadata only.</param>
-        private void ProcessStartOfFrameMarker(int remaining, bool metadataOnly)
-        {
-            if (this.ComponentCount != 0)
-            {
-                throw new ImageFormatException("Multiple SOF markers");
-            }
-
-            switch (remaining)
-            {
-                case 6 + (3 * 1): // grayscale image.
-                    this.ComponentCount = 1;
-                    break;
-                case 6 + (3 * 3): // YCbCr or RGB image.
-                    this.ComponentCount = 3;
-                    break;
-                case 6 + (3 * 4): // YCbCrK or CMYK image.
-                    this.ComponentCount = 4;
-                    break;
-                default:
-                    throw new ImageFormatException("Incorrect number of components");
-            }
-
-            this.InputProcessor.ReadFull(this.Temp, 0, remaining);
-
-            // We only support 8-bit precision.
-            if (this.Temp[0] != SupportedPrecision)
-            {
-                throw new ImageFormatException("Only 8-Bit precision supported.");
-            }
-
-            int height = (this.Temp[1] << 8) + this.Temp[2];
-            int width = (this.Temp[3] << 8) + this.Temp[4];
-
-            this.ImageSizeInPixels = new Size(width, height);
-
-            if (this.Temp[5] != this.ComponentCount)
-            {
-                throw new ImageFormatException("SOF has wrong length");
-            }
-
-            if (!metadataOnly)
-            {
-                this.Components = new GolangComponent[this.ComponentCount];
-
-                for (int i = 0; i < this.ComponentCount; i++)
-                {
-                    byte componentIdentifier = this.Temp[6 + (3 * i)];
-                    var component = new GolangComponent(componentIdentifier, i);
-                    component.InitializeCoreData(this);
-                    this.Components[i] = component;
-                }
-
-                int h0 = this.Components[0].HorizontalSamplingFactor;
-                int v0 = this.Components[0].VerticalSamplingFactor;
-
-                this.ImageSizeInMCU = this.ImageSizeInPixels.DivideRoundUp(8 * h0, 8 * v0);
-
-                this.ColorSpace = this.DeduceJpegColorSpace();
-
-                foreach (GolangComponent component in this.Components)
-                {
-                    component.InitializeDerivedData(this.configuration.MemoryAllocator, this);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Processes a Define Huffman Table marker, and initializes a huffman
-        /// struct from its contents. Specified in section B.2.4.2.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessDefineHuffmanTablesMarker(int remaining)
-        {
-            while (remaining > 0)
-            {
-                if (remaining < 17)
-                {
-                    throw new ImageFormatException($"DHT has wrong length. {remaining}");
-                }
-
-                this.InputProcessor.ReadFull(this.Temp, 0, 17);
-
-                int tc = this.Temp[0] >> 4;
-                if (tc > GolangHuffmanTree.MaxTc)
-                {
-                    throw new ImageFormatException("Bad Tc value");
-                }
-
-                int th = this.Temp[0] & 0x0f;
-                if (th > GolangHuffmanTree.MaxTh)
-                {
-                    throw new ImageFormatException("Bad Th value");
-                }
-
-                int huffTreeIndex = (tc * GolangHuffmanTree.ThRowSize) + th;
-                this.HuffmanTrees[huffTreeIndex].ProcessDefineHuffmanTablesMarkerLoop(
-                    ref this.InputProcessor,
-                    this.Temp,
-                    ref remaining);
-            }
-        }
-
-        /// <summary>
-        /// Processes the DRI (Define Restart Interval Marker) Which specifies the interval between RSTn markers, in
-        /// macroblocks
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessDefineRestartIntervalMarker(int remaining)
-        {
-            if (remaining != 2)
-            {
-                throw new ImageFormatException("DRI has wrong length");
-            }
-
-            this.InputProcessor.ReadFull(this.Temp, 0, remaining);
-            this.RestartInterval = (this.Temp[0] << 8) + this.Temp[1];
-        }
-
-        /// <summary>
-        /// Processes the SOS (Start of scan marker).
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <exception cref="ImageFormatException">
-        /// Missing SOF Marker
-        /// SOS has wrong length
-        /// </exception>
-        private void ProcessStartOfScanMarker(int remaining)
-        {
-            GolangJpegScanDecoder scan = default;
-            GolangJpegScanDecoder.InitStreamReading(&scan, this, remaining);
-            this.InputProcessor.Bits = default;
-            scan.DecodeBlocks(this);
-        }
-
-        private JpegColorSpace DeduceJpegColorSpace()
-        {
-            switch (this.ComponentCount)
-            {
-                case 1:
-                    return JpegColorSpace.Grayscale;
-                case 3:
-                    if (!this.isAdobe || this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformYCbCr)
-                    {
-                        return JpegColorSpace.YCbCr;
-                    }
-
-                    if (this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformUnknown)
-                    {
-                        return JpegColorSpace.RGB;
-                    }
-
-                    break;
-                case 4:
-                    if (this.adobe.ColorTransform == JpegConstants.Adobe.ColorTransformYcck)
-                    {
-                        return JpegColorSpace.Ycck;
-                    }
-
-                    return JpegColorSpace.Cmyk;
-            }
-
-            throw new ImageFormatException($"Unsupported color mode. Max components 4; found {this.ComponentCount}."
-                                           + "JpegDecoder only supports YCbCr, RGB, YccK, CMYK and grayscale color spaces.");
-        }
-
-        private Image<TPixel> PostProcessIntoImage<TPixel>()
-            where TPixel : struct, IPixel<TPixel>
-        {
-            using (var postProcessor = new JpegImagePostProcessor(this.configuration.MemoryAllocator, this))
-            {
-                var image = new Image<TPixel>(this.configuration, this.ImageWidth, this.ImageHeight, this.MetaData);
-                postProcessor.PostProcess(image.Frames.RootFrame);
-                return image;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
index eafbb391c..57b70dd26 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
-
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg
@@ -24,7 +22,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         {
             Guard.NotNull(stream, nameof(stream));
 
-            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
+            using (var decoder = new JpegDecoderCore(configuration, this))
             {
                 return decoder.Decode<TPixel>(stream);
             }
@@ -35,7 +33,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         {
             Guard.NotNull(stream, nameof(stream));
 
-            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
+            using (var decoder = new JpegDecoderCore(configuration, this))
             {
                 return decoder.Identify(stream);
             }
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
similarity index 92%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
rename to src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index a360d5477..3b34719a8 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -7,10 +7,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
+using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
@@ -19,14 +19,14 @@ using SixLabors.ImageSharp.Primitives;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Performs the jpeg decoding operation.
     /// Originally ported from <see href="https://github.com/mozilla/pdf.js/blob/master/src/core/jpg.js"/>
     /// with additional fixes for both performance and common encoding errors.
     /// </summary>
-    internal sealed class PdfJsJpegDecoderCore : IRawJpegData
+    internal sealed class JpegDecoderCore : IRawJpegData
     {
         /// <summary>
         /// The only supported precision
@@ -51,12 +51,12 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <summary>
         /// The DC HUffman tables
         /// </summary>
-        private PdfJsHuffmanTables dcHuffmanTables;
+        private HuffmanTables dcHuffmanTables;
 
         /// <summary>
         /// The AC HUffman tables
         /// </summary>
-        private PdfJsHuffmanTables acHuffmanTables;
+        private HuffmanTables acHuffmanTables;
 
         /// <summary>
         /// The fast AC tables used for entropy decoding
@@ -84,11 +84,11 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         private AdobeMarker adobe;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PdfJsJpegDecoderCore" /> class.
+        /// Initializes a new instance of the <see cref="JpegDecoderCore" /> class.
         /// </summary>
         /// <param name="configuration">The configuration.</param>
         /// <param name="options">The options.</param>
-        public PdfJsJpegDecoderCore(Configuration configuration, IJpegDecoderOptions options)
+        public JpegDecoderCore(Configuration configuration, IJpegDecoderOptions options)
         {
             this.configuration = configuration ?? Configuration.Default;
             this.IgnoreMetadata = options.IgnoreMetadata;
@@ -97,7 +97,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <summary>
         /// Gets the frame
         /// </summary>
-        public PdfJsFrame Frame { get; private set; }
+        public JpegFrame Frame { get; private set; }
 
         /// <inheritdoc/>
         public Size ImageSizeInPixels { get; private set; }
@@ -146,7 +146,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <summary>
         /// Gets the components.
         /// </summary>
-        public PdfJsFrameComponent[] Components => this.Frame.Components;
+        public JpegComponent[] Components => this.Frame.Components;
 
         /// <inheritdoc/>
         IEnumerable<IJpegComponent> IRawJpegData.Components => this.Components;
@@ -159,14 +159,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// </summary>
         /// <param name="marker">The buffer to read file markers to</param>
         /// <param name="stream">The input stream</param>
-        /// <returns>The <see cref="PdfJsFileMarker"/></returns>
-        public static PdfJsFileMarker FindNextFileMarker(byte[] marker, DoubleBufferedStreamReader stream)
+        /// <returns>The <see cref="JpegFileMarker"/></returns>
+        public static JpegFileMarker FindNextFileMarker(byte[] marker, DoubleBufferedStreamReader stream)
         {
             int value = stream.Read(marker, 0, 2);
 
             if (value == 0)
             {
-                return new PdfJsFileMarker(JpegConstants.Markers.EOI, stream.Length - 2);
+                return new JpegFileMarker(JpegConstants.Markers.EOI, stream.Length - 2);
             }
 
             if (marker[0] == JpegConstants.Markers.XFF)
@@ -179,16 +179,16 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                     int suffix = stream.ReadByte();
                     if (suffix == -1)
                     {
-                        return new PdfJsFileMarker(JpegConstants.Markers.EOI, stream.Length - 2);
+                        return new JpegFileMarker(JpegConstants.Markers.EOI, stream.Length - 2);
                     }
 
                     m = suffix;
                 }
 
-                return new PdfJsFileMarker((byte)m, stream.Position - 2);
+                return new JpegFileMarker((byte)m, stream.Position - 2);
             }
 
-            return new PdfJsFileMarker(marker[1], stream.Position - 2, true);
+            return new JpegFileMarker(marker[1], stream.Position - 2, true);
         }
 
         /// <summary>
@@ -228,7 +228,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
 
             // Check for the Start Of Image marker.
             this.InputStream.Read(this.markerBuffer, 0, 2);
-            var fileMarker = new PdfJsFileMarker(this.markerBuffer[1], 0);
+            var fileMarker = new JpegFileMarker(this.markerBuffer[1], 0);
             if (fileMarker.Marker != JpegConstants.Markers.SOI)
             {
                 throw new ImageFormatException("Missing SOI marker.");
@@ -236,14 +236,14 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
 
             this.InputStream.Read(this.markerBuffer, 0, 2);
             byte marker = this.markerBuffer[1];
-            fileMarker = new PdfJsFileMarker(marker, (int)this.InputStream.Position - 2);
+            fileMarker = new JpegFileMarker(marker, (int)this.InputStream.Position - 2);
 
             // Only assign what we need
             if (!metadataOnly)
             {
                 this.QuantizationTables = new Block8x8F[4];
-                this.dcHuffmanTables = new PdfJsHuffmanTables();
-                this.acHuffmanTables = new PdfJsHuffmanTables();
+                this.dcHuffmanTables = new HuffmanTables();
+                this.acHuffmanTables = new HuffmanTables();
                 this.fastACTables = new FastACTables(this.configuration.MemoryAllocator);
             }
 
@@ -412,6 +412,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
             {
                 this.MetaData.HorizontalResolution = this.jFif.XDensity;
                 this.MetaData.VerticalResolution = this.jFif.YDensity;
+                this.MetaData.ResolutionUnits = this.jFif.DensityUnits;
             }
             else if (this.isExif)
             {
@@ -427,6 +428,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 {
                     this.MetaData.HorizontalResolution = horizontalValue;
                     this.MetaData.VerticalResolution = verticalValue;
+                    this.MetaData.ResolutionUnits = UnitConverter.ExifProfileToResolutionUnit(this.MetaData.ExifProfile);
                 }
             }
 
@@ -628,7 +630,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <param name="remaining">The remaining bytes in the segment block.</param>
         /// <param name="frameMarker">The current frame marker.</param>
         /// <param name="metadataOnly">Whether to parse metadata only</param>
-        private void ProcessStartOfFrameMarker(int remaining, PdfJsFileMarker frameMarker, bool metadataOnly)
+        private void ProcessStartOfFrameMarker(int remaining, JpegFileMarker frameMarker, bool metadataOnly)
         {
             if (this.Frame != null)
             {
@@ -643,7 +645,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                 throw new ImageFormatException("Only 8-Bit precision supported.");
             }
 
-            this.Frame = new PdfJsFrame
+            this.Frame = new JpegFrame
             {
                 Extended = frameMarker.Marker == JpegConstants.Markers.SOF1,
                 Progressive = frameMarker.Marker == JpegConstants.Markers.SOF2,
@@ -665,7 +667,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
             {
                 // No need to pool this. They max out at 4
                 this.Frame.ComponentIds = new byte[this.Frame.ComponentCount];
-                this.Frame.Components = new PdfJsFrameComponent[this.Frame.ComponentCount];
+                this.Frame.Components = new JpegComponent[this.Frame.ComponentCount];
                 this.ColorSpace = this.DeduceJpegColorSpace();
 
                 for (int i = 0; i < this.Frame.ComponentCount; i++)
@@ -684,7 +686,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                         maxV = v;
                     }
 
-                    var component = new PdfJsFrameComponent(this.configuration.MemoryAllocator, this.Frame, this.temp[index], h, v, this.temp[index + 2], i);
+                    var component = new JpegComponent(this.configuration.MemoryAllocator, this.Frame, this.temp[index], h, v, this.temp[index + 2], i);
 
                     this.Frame.Components[i] = component;
                     this.Frame.ComponentIds[i] = component.Id;
@@ -707,7 +709,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <param name="remaining">The remaining bytes in the segment block.</param>
         private void ProcessDefineHuffmanTablesMarker(int remaining)
         {
-            using (IManagedByteBuffer huffmanData = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(256))
+            using (IManagedByteBuffer huffmanData = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(256, AllocationOptions.Clean))
             {
                 ref byte huffmanDataRef = ref MemoryMarshal.GetReference(huffmanData.GetSpan());
                 for (int i = 2; i < remaining;)
@@ -715,7 +717,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                     byte huffmanTableSpec = (byte)this.InputStream.ReadByte();
                     this.InputStream.Read(huffmanData.Array, 0, 16);
 
-                    using (IManagedByteBuffer codeLengths = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(17))
+                    using (IManagedByteBuffer codeLengths = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(17, AllocationOptions.Clean))
                     {
                         ref byte codeLengthsRef = ref MemoryMarshal.GetReference(codeLengths.GetSpan());
                         int codeLengthSum = 0;
@@ -725,7 +727,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                             codeLengthSum += Unsafe.Add(ref codeLengthsRef, j) = Unsafe.Add(ref huffmanDataRef, j - 1);
                         }
 
-                        using (IManagedByteBuffer huffmanValues = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(256))
+                        using (IManagedByteBuffer huffmanValues = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(256, AllocationOptions.Clean))
                         {
                             this.InputStream.Read(huffmanValues.Array, 0, codeLengthSum);
 
@@ -792,7 +794,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
                     throw new ImageFormatException("Unknown component selector");
                 }
 
-                ref PdfJsFrameComponent component = ref this.Frame.Components[componentIndex];
+                ref JpegComponent component = ref this.Frame.Components[componentIndex];
                 int tableSpec = this.InputStream.ReadByte();
                 component.DCHuffmanTableId = tableSpec >> 4;
                 component.ACHuffmanTableId = tableSpec & 15;
@@ -829,9 +831,9 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
         /// <param name="codeLengths">The codelengths</param>
         /// <param name="values">The values</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void BuildHuffmanTable(PdfJsHuffmanTables tables, int index, ReadOnlySpan<byte> codeLengths, ReadOnlySpan<byte> values)
+        private void BuildHuffmanTable(HuffmanTables tables, int index, ReadOnlySpan<byte> codeLengths, ReadOnlySpan<byte> values)
         {
-            tables[index] = new PdfJsHuffmanTable(this.configuration.MemoryAllocator, codeLengths, values);
+            tables[index] = new HuffmanTable(this.configuration.MemoryAllocator, codeLengths, values);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
index 1310d90d2..ada33f2b8 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -2,11 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers.Binary;
 using System.IO;
 using System.Runtime.CompilerServices;
-
+using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;
@@ -210,7 +212,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
             int componentCount = 3;
 
             // Write the Start Of Image marker.
-            this.WriteApplicationHeader((short)image.MetaData.HorizontalResolution, (short)image.MetaData.VerticalResolution);
+            this.WriteApplicationHeader(image.MetaData);
 
             this.WriteProfiles(image);
 
@@ -425,9 +427,8 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         /// <summary>
         /// Writes the application header containing the JFIF identifier plus extra data.
         /// </summary>
-        /// <param name="horizontalResolution">The resolution of the image in the x- direction.</param>
-        /// <param name="verticalResolution">The resolution of the image in the y- direction.</param>
-        private void WriteApplicationHeader(short horizontalResolution, short verticalResolution)
+        /// <param name="meta">The image meta data.</param>
+        private void WriteApplicationHeader(ImageMetaData meta)
         {
             // Write the start of image marker. Markers are always prefixed with with 0xff.
             this.buffer[0] = JpegConstants.Markers.XFF;
@@ -445,13 +446,25 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
             this.buffer[10] = 0x00; // = "JFIF",'\0'
             this.buffer[11] = 0x01; // versionhi
             this.buffer[12] = 0x01; // versionlo
-            this.buffer[13] = 0x01; // xyunits as dpi
 
             // Resolution. Big Endian
-            this.buffer[14] = (byte)(horizontalResolution >> 8);
-            this.buffer[15] = (byte)horizontalResolution;
-            this.buffer[16] = (byte)(verticalResolution >> 8);
-            this.buffer[17] = (byte)verticalResolution;
+            Span<byte> hResolution = this.buffer.AsSpan(14, 2);
+            Span<byte> vResolution = this.buffer.AsSpan(16, 2);
+
+            if (meta.ResolutionUnits == PixelResolutionUnit.PixelsPerMeter)
+            {
+                // Scale down to PPI
+                this.buffer[13] = (byte)PixelResolutionUnit.PixelsPerInch; // xyunits
+                BinaryPrimitives.WriteInt16BigEndian(hResolution, (short)Math.Round(UnitConverter.MeterToInch(meta.HorizontalResolution)));
+                BinaryPrimitives.WriteInt16BigEndian(vResolution, (short)Math.Round(UnitConverter.MeterToInch(meta.VerticalResolution)));
+            }
+            else
+            {
+                // We can simply pass the value.
+                this.buffer[13] = (byte)meta.ResolutionUnits; // xyunits
+                BinaryPrimitives.WriteInt16BigEndian(hResolution, (short)Math.Round(meta.HorizontalResolution));
+                BinaryPrimitives.WriteInt16BigEndian(vResolution, (short)Math.Round(meta.VerticalResolution));
+            }
 
             // No thumbnail
             this.buffer[18] = 0x00; // Thumbnail width
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs
deleted file mode 100644
index e12278cc7..000000000
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoder.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System.IO;
-using SixLabors.ImageSharp.PixelFormats;
-
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
-{
-    /// <summary>
-    /// Image decoder for generating an image out of a jpg stream.
-    /// </summary>
-    internal sealed class PdfJsJpegDecoder : IImageDecoder, IJpegDecoderOptions, IImageInfoDetector
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
-        /// </summary>
-        public bool IgnoreMetadata { get; set; }
-
-        /// <inheritdoc/>
-        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
-            {
-                return decoder.Decode<TPixel>(stream);
-            }
-        }
-
-        /// <inheritdoc/>
-        public IImageInfo Identify(Configuration configuration, Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            using (var decoder = new PdfJsJpegDecoderCore(configuration, this))
-            {
-                return decoder.Identify(stream);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/README.md b/src/ImageSharp/Formats/Jpeg/README.md
index 54bc14847..2f766ca0c 100644
--- a/src/ImageSharp/Formats/Jpeg/README.md
+++ b/src/ImageSharp/Formats/Jpeg/README.md
@@ -1,3 +1,8 @@
-Encoder/Decoder adapted and extended from:
+Encoder adapted and extended from:
+https://golang.org/src/image/jpeg/
 
-https://golang.org/src/image/jpeg/
\ No newline at end of file
+Decoder orchestration code is based on:
+https://github.com/mozilla/pdf.js
+
+Huffmann decoder is based on:
+https://github.com/rds1983/StbSharp
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs b/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
index 3b8aea669..f3231fa22 100644
--- a/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Png
 {
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 04d4f057c..83c195eec 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -10,6 +10,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.Formats.Png.Filters;
 using SixLabors.ImageSharp.Formats.Png.Zlib;
 using SixLabors.ImageSharp.MetaData;
@@ -233,7 +234,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                                     this.ValidateHeader();
                                     break;
                                 case PngChunkType.Physical:
-                                    this.ReadPhysicalChunk(metadata, chunk.Data.Array);
+                                    this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
                                     break;
                                 case PngChunkType.Data:
                                     if (image == null)
@@ -307,7 +308,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                                 this.ValidateHeader();
                                 break;
                             case PngChunkType.Physical:
-                                this.ReadPhysicalChunk(metadata, chunk.Data.Array);
+                                this.ReadPhysicalChunk(metadata, chunk.Data.GetSpan());
                                 break;
                             case PngChunkType.Data:
                                 this.SkipChunkDataAndCrc(chunk);
@@ -369,7 +370,7 @@ namespace SixLabors.ImageSharp.Formats.Png
                 return false;
             }
 
-            buffer = this.MemoryAllocator.AllocateCleanManagedByteBuffer(bytesPerScanline * 8 / bits);
+            buffer = this.MemoryAllocator.AllocateManagedByteBuffer(bytesPerScanline * 8 / bits, AllocationOptions.Clean);
             byte[] result = buffer.Array;
             int mask = 0xFF >> (8 - bits);
             int resultOffset = 0;
@@ -396,9 +397,26 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <param name="data">The data containing physical data.</param>
         private void ReadPhysicalChunk(ImageMetaData metadata, ReadOnlySpan<byte> data)
         {
-            // 39.3700787 = inches in a meter.
-            metadata.HorizontalResolution = BinaryPrimitives.ReadInt32BigEndian(data.Slice(0, 4)) / 39.3700787d;
-            metadata.VerticalResolution = BinaryPrimitives.ReadInt32BigEndian(data.Slice(4, 4)) / 39.3700787d;
+            // The pHYs chunk specifies the intended pixel size or aspect ratio for display of the image. It contains:
+            // Pixels per unit, X axis: 4 bytes (unsigned integer)
+            // Pixels per unit, Y axis: 4 bytes (unsigned integer)
+            // Unit specifier:          1 byte
+            //
+            // The following values are legal for the unit specifier:
+            //   0: unit is unknown
+            //   1: unit is the meter
+            //
+            // When the unit specifier is 0, the pHYs chunk defines pixel aspect ratio only; the actual size of the pixels remains unspecified.
+            int hResolution = BinaryPrimitives.ReadInt32BigEndian(data.Slice(0, 4));
+            int vResolution = BinaryPrimitives.ReadInt32BigEndian(data.Slice(4, 4));
+            byte unit = data[8];
+
+            metadata.ResolutionUnits = unit == byte.MinValue
+                ? PixelResolutionUnit.AspectRatio
+                : PixelResolutionUnit.PixelsPerMeter;
+
+            metadata.HorizontalResolution = hResolution;
+            metadata.VerticalResolution = vResolution;
         }
 
         /// <summary>
@@ -419,8 +437,8 @@ namespace SixLabors.ImageSharp.Formats.Png
                 this.bytesPerSample = this.header.BitDepth / 8;
             }
 
-            this.previousScanline = this.MemoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
-            this.scanline = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
+            this.previousScanline = this.MemoryAllocator.AllocateManagedByteBuffer(this.bytesPerScanline, AllocationOptions.Clean);
+            this.scanline = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(this.bytesPerScanline, AllocationOptions.Clean);
         }
 
         /// <summary>
@@ -1427,7 +1445,7 @@ namespace SixLabors.ImageSharp.Formats.Png
         private IManagedByteBuffer ReadChunkData(int length)
         {
             // We rent the buffer here to return it afterwards in Decode()
-            IManagedByteBuffer buffer = this.configuration.MemoryAllocator.AllocateCleanManagedByteBuffer(length);
+            IManagedByteBuffer buffer = this.configuration.MemoryAllocator.AllocateManagedByteBuffer(length, AllocationOptions.Clean);
 
             this.currentStream.Read(buffer.Array, 0, length);
 
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index babda2eff..109e6ad77 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Formats.Png
 {
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 1b3e84b85..e696e1f68 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -6,10 +6,12 @@ using System.Buffers.Binary;
 using System.IO;
 using System.Linq;
 using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Common.Helpers;
 using SixLabors.ImageSharp.Formats.Png.Filters;
 using SixLabors.ImageSharp.Formats.Png.Zlib;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.Memory;
 
 namespace SixLabors.ImageSharp.Formats.Png
@@ -598,19 +600,52 @@ namespace SixLabors.ImageSharp.Formats.Png
         private void WritePhysicalChunk<TPixel>(Stream stream, Image<TPixel> image)
             where TPixel : struct, IPixel<TPixel>
         {
-            if (image.MetaData.HorizontalResolution > 0 && image.MetaData.VerticalResolution > 0)
+            // The pHYs chunk specifies the intended pixel size or aspect ratio for display of the image. It contains:
+            // Pixels per unit, X axis: 4 bytes (unsigned integer)
+            // Pixels per unit, Y axis: 4 bytes (unsigned integer)
+            // Unit specifier:          1 byte
+            //
+            // The following values are legal for the unit specifier:
+            //   0: unit is unknown
+            //   1: unit is the meter
+            //
+            // When the unit specifier is 0, the pHYs chunk defines pixel aspect ratio only; the actual size of the pixels remains unspecified.
+            ImageMetaData meta = image.MetaData;
+            Span<byte> hResolution = this.chunkDataBuffer.AsSpan(0, 4);
+            Span<byte> vResolution = this.chunkDataBuffer.AsSpan(4, 4);
+
+            switch (meta.ResolutionUnits)
             {
-                // 39.3700787 = inches in a meter.
-                int dpmX = (int)Math.Round(image.MetaData.HorizontalResolution * 39.3700787D);
-                int dpmY = (int)Math.Round(image.MetaData.VerticalResolution * 39.3700787D);
+                case PixelResolutionUnit.AspectRatio:
 
-                BinaryPrimitives.WriteInt32BigEndian(this.chunkDataBuffer.AsSpan(0, 4), dpmX);
-                BinaryPrimitives.WriteInt32BigEndian(this.chunkDataBuffer.AsSpan(4, 4), dpmY);
+                    this.chunkDataBuffer[8] = 0;
+                    BinaryPrimitives.WriteInt32BigEndian(hResolution, (int)Math.Round(meta.HorizontalResolution));
+                    BinaryPrimitives.WriteInt32BigEndian(vResolution, (int)Math.Round(meta.VerticalResolution));
+                    break;
+
+                case PixelResolutionUnit.PixelsPerInch:
+
+                    this.chunkDataBuffer[8] = 1; // Per meter
+                    BinaryPrimitives.WriteInt32BigEndian(hResolution, (int)Math.Round(UnitConverter.InchToMeter(meta.HorizontalResolution)));
+                    BinaryPrimitives.WriteInt32BigEndian(vResolution, (int)Math.Round(UnitConverter.InchToMeter(meta.VerticalResolution)));
+                    break;
+
+                case PixelResolutionUnit.PixelsPerCentimeter:
 
-                this.chunkDataBuffer[8] = 1;
+                    this.chunkDataBuffer[8] = 1; // Per meter
+                    BinaryPrimitives.WriteInt32BigEndian(hResolution, (int)Math.Round(UnitConverter.CmToMeter(meta.HorizontalResolution)));
+                    BinaryPrimitives.WriteInt32BigEndian(vResolution, (int)Math.Round(UnitConverter.CmToMeter(meta.VerticalResolution)));
+                    break;
+
+                default:
 
-                this.WriteChunk(stream, PngChunkType.Physical, this.chunkDataBuffer, 0, 9);
+                    this.chunkDataBuffer[8] = 1; // Per meter
+                    BinaryPrimitives.WriteInt32BigEndian(hResolution, (int)Math.Round(meta.HorizontalResolution));
+                    BinaryPrimitives.WriteInt32BigEndian(vResolution, (int)Math.Round(meta.VerticalResolution));
+                    break;
             }
+
+            this.WriteChunk(stream, PngChunkType.Physical, this.chunkDataBuffer, 0, 9);
         }
 
         /// <summary>
@@ -643,9 +678,9 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.bytesPerScanline = this.width * this.bytesPerPixel;
             int resultLength = this.bytesPerScanline + 1;
 
-            this.previousScanline = this.memoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
-            this.rawScanline = this.memoryAllocator.AllocateCleanManagedByteBuffer(this.bytesPerScanline);
-            this.result = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+            this.previousScanline = this.memoryAllocator.AllocateManagedByteBuffer(this.bytesPerScanline, AllocationOptions.Clean);
+            this.rawScanline = this.memoryAllocator.AllocateManagedByteBuffer(this.bytesPerScanline, AllocationOptions.Clean);
+            this.result = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
 
             switch (this.pngFilterMethod)
             {
@@ -654,29 +689,29 @@ namespace SixLabors.ImageSharp.Formats.Png
 
                 case PngFilterMethod.Sub:
 
-                    this.sub = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+                    this.sub = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
                     break;
 
                 case PngFilterMethod.Up:
 
-                    this.up = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+                    this.up = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
                     break;
 
                 case PngFilterMethod.Average:
 
-                    this.average = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+                    this.average = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
                     break;
 
                 case PngFilterMethod.Paeth:
 
-                    this.paeth = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+                    this.paeth = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
                     break;
                 case PngFilterMethod.Adaptive:
 
-                    this.sub = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
-                    this.up = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
-                    this.average = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
-                    this.paeth = this.memoryAllocator.AllocateCleanManagedByteBuffer(resultLength);
+                    this.sub = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
+                    this.up = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
+                    this.average = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
+                    this.paeth = this.memoryAllocator.AllocateManagedByteBuffer(resultLength, AllocationOptions.Clean);
                     break;
             }
 
diff --git a/src/ImageSharp/IConfigurationModule.cs b/src/ImageSharp/IConfigurationModule.cs
index 93c40497d..3ca8ed918 100644
--- a/src/ImageSharp/IConfigurationModule.cs
+++ b/src/ImageSharp/IConfigurationModule.cs
@@ -14,4 +14,4 @@ namespace SixLabors.ImageSharp
         /// <param name="configuration">The configuration that will retain the encoders, decodes and mime type detectors.</param>
         void Configure(Configuration configuration);
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs b/src/ImageSharp/IO/DoubleBufferedStreamReader.cs
similarity index 97%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs
rename to src/ImageSharp/IO/DoubleBufferedStreamReader.cs
index 7aeee43c2..94a2f2cbf 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/DoubleBufferedStreamReader.cs
+++ b/src/ImageSharp/IO/DoubleBufferedStreamReader.cs
@@ -7,8 +7,7 @@ using System.Runtime.CompilerServices;
 
 using SixLabors.Memory;
 
-// TODO: This could be useful elsewhere.
-namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
+namespace SixLabors.ImageSharp.IO
 {
     /// <summary>
     /// A stream reader that add a secondary level buffer in addition to native stream buffered reading
@@ -44,7 +43,7 @@ namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components
         {
             this.stream = stream;
             this.length = (int)stream.Length;
-            this.managedBuffer = memoryAllocator.AllocateCleanManagedByteBuffer(ChunkLength);
+            this.managedBuffer = memoryAllocator.AllocateManagedByteBuffer(ChunkLength, AllocationOptions.Clean);
             this.bufferChunk = this.managedBuffer.Array;
         }
 
diff --git a/src/ImageSharp/Image.WrapMemory.cs b/src/ImageSharp/Image.WrapMemory.cs
index 3988120e6..77432c3ad 100644
--- a/src/ImageSharp/Image.WrapMemory.cs
+++ b/src/ImageSharp/Image.WrapMemory.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
+
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
@@ -13,8 +15,6 @@ namespace SixLabors.ImageSharp
     /// </content>
     public static partial class Image
     {
-        // TODO: This is a WIP API, should be public when finished.
-
         /// <summary>
         /// Wraps an existing contigous memory area of 'width'x'height' pixels,
         /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp
         /// <param name="height">The height of the memory image</param>
         /// <param name="metaData">The <see cref="ImageMetaData"/></param>
         /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
-        internal static Image<TPixel> WrapMemory<TPixel>(
+        public static Image<TPixel> WrapMemory<TPixel>(
             Configuration config,
             Memory<TPixel> pixelMemory,
             int width,
@@ -34,26 +34,117 @@ namespace SixLabors.ImageSharp
             ImageMetaData metaData)
             where TPixel : struct, IPixel<TPixel>
         {
-            var buffer = new ConsumedBuffer<TPixel>(pixelMemory);
-            return new Image<TPixel>(config, buffer, width, height, metaData);
+            var memorySource = new MemorySource<TPixel>(pixelMemory);
+            return new Image<TPixel>(config, memorySource, width, height, metaData);
+        }
+
+        /// <summary>
+        /// Wraps an existing contigous memory area of 'width'x'height' pixels,
+        /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
+        /// <param name="config">The <see cref="Configuration"/></param>
+        /// <param name="pixelMemory">The pixel memory</param>
+        /// <param name="width">The width of the memory image</param>
+        /// <param name="height">The height of the memory image</param>
+        /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
+        public static Image<TPixel> WrapMemory<TPixel>(
+            Configuration config,
+            Memory<TPixel> pixelMemory,
+            int width,
+            int height)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            return WrapMemory(config, pixelMemory, width, height, new ImageMetaData());
         }
 
         /// <summary>
         /// Wraps an existing contigous memory area of 'width'x'height' pixels,
         /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
+        /// The memory is being observed, the caller remains responsible for managing it's lifecycle.
         /// </summary>
         /// <typeparam name="TPixel">The pixel type</typeparam>
         /// <param name="pixelMemory">The pixel memory</param>
         /// <param name="width">The width of the memory image</param>
         /// <param name="height">The height of the memory image</param>
         /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
-        internal static Image<TPixel> WrapMemory<TPixel>(
+        public static Image<TPixel> WrapMemory<TPixel>(
             Memory<TPixel> pixelMemory,
             int width,
             int height)
             where TPixel : struct, IPixel<TPixel>
         {
-            return WrapMemory(Configuration.Default, pixelMemory, width, height, new ImageMetaData());
+            return WrapMemory(Configuration.Default, pixelMemory, width, height);
+        }
+
+        /// <summary>
+        /// Wraps an existing contigous memory area of 'width'x'height' pixels,
+        /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
+        /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transfered to the new <see cref="Image{TPixel}"/> instance,
+        /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
+        /// It will be disposed together with the result image.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
+        /// <param name="config">The <see cref="Configuration"/></param>
+        /// <param name="pixelMemoryOwner">The <see cref="IMemoryOwner{T}"/> that is being transfered to the image</param>
+        /// <param name="width">The width of the memory image</param>
+        /// <param name="height">The height of the memory image</param>
+        /// <param name="metaData">The <see cref="ImageMetaData"/></param>
+        /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
+        public static Image<TPixel> WrapMemory<TPixel>(
+            Configuration config,
+            IMemoryOwner<TPixel> pixelMemoryOwner,
+            int width,
+            int height,
+            ImageMetaData metaData)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            var memorySource = new MemorySource<TPixel>(pixelMemoryOwner, false);
+            return new Image<TPixel>(config, memorySource, width, height, metaData);
+        }
+
+        /// <summary>
+        /// Wraps an existing contigous memory area of 'width'x'height' pixels,
+        /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
+        /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transfered to the new <see cref="Image{TPixel}"/> instance,
+        /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
+        /// It will be disposed together with the result image.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
+        /// <param name="config">The <see cref="Configuration"/></param>
+        /// <param name="pixelMemoryOwner">The <see cref="IMemoryOwner{T}"/> that is being transfered to the image</param>
+        /// <param name="width">The width of the memory image</param>
+        /// <param name="height">The height of the memory image</param>
+        /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
+        public static Image<TPixel> WrapMemory<TPixel>(
+            Configuration config,
+            IMemoryOwner<TPixel> pixelMemoryOwner,
+            int width,
+            int height)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            return WrapMemory(config, pixelMemoryOwner, width, height, new ImageMetaData());
+        }
+
+        /// <summary>
+        /// Wraps an existing contigous memory area of 'width'x'height' pixels,
+        /// allowing to view/manipulate it as an ImageSharp <see cref="Image{TPixel}"/> instance.
+        /// The ownership of the <paramref name="pixelMemoryOwner"/> is being transfered to the new <see cref="Image{TPixel}"/> instance,
+        /// meaning that the caller is not allowed to dispose <paramref name="pixelMemoryOwner"/>.
+        /// It will be disposed together with the result image.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
+        /// <param name="pixelMemoryOwner">The <see cref="IMemoryOwner{T}"/> that is being transfered to the image</param>
+        /// <param name="width">The width of the memory image</param>
+        /// <param name="height">The height of the memory image</param>
+        /// <returns>An <see cref="Image{TPixel}"/> instance</returns>
+        public static Image<TPixel> WrapMemory<TPixel>(
+            IMemoryOwner<TPixel> pixelMemoryOwner,
+            int width,
+            int height)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            return WrapMemory(Configuration.Default, pixelMemoryOwner, width, height);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/ImageFrameCollection.cs b/src/ImageSharp/ImageFrameCollection.cs
index 14a16b691..154ef5014 100644
--- a/src/ImageSharp/ImageFrameCollection.cs
+++ b/src/ImageSharp/ImageFrameCollection.cs
@@ -30,14 +30,14 @@ namespace SixLabors.ImageSharp
             this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, backgroundColor));
         }
 
-        internal ImageFrameCollection(Image<TPixel> parent, int width, int height, IBuffer<TPixel> consumedBuffer)
+        internal ImageFrameCollection(Image<TPixel> parent, int width, int height, MemorySource<TPixel> memorySource)
         {
             Guard.NotNull(parent, nameof(parent));
 
             this.parent = parent;
 
             // Frames are already cloned within the caller
-            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, consumedBuffer));
+            this.frames.Add(new ImageFrame<TPixel>(parent.GetConfiguration(), width, height, memorySource));
         }
 
         internal ImageFrameCollection(Image<TPixel> parent, IEnumerable<ImageFrame<TPixel>> frames)
diff --git a/src/ImageSharp/ImageFrame{TPixel}.cs b/src/ImageSharp/ImageFrame{TPixel}.cs
index bd86b7dee..6c04d5aea 100644
--- a/src/ImageSharp/ImageFrame{TPixel}.cs
+++ b/src/ImageSharp/ImageFrame{TPixel}.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -86,7 +87,7 @@ namespace SixLabors.ImageSharp
 
             this.configuration = configuration;
             this.MemoryAllocator = configuration.MemoryAllocator;
-            this.PixelBuffer = this.MemoryAllocator.Allocate2D<TPixel>(width, height, false);
+            this.PixelBuffer = this.MemoryAllocator.Allocate2D<TPixel>(width, height);
             this.MetaData = metaData;
             this.Clear(configuration.ParallelOptions, backgroundColor);
         }
@@ -94,8 +95,8 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrame{TPixel}" /> class wrapping an existing buffer.
         /// </summary>
-        internal ImageFrame(Configuration configuration, int width, int height, IBuffer<TPixel> consumedBuffer)
-            : this(configuration, width, height, consumedBuffer, new ImageFrameMetaData())
+        internal ImageFrame(Configuration configuration, int width, int height, MemorySource<TPixel> memorySource)
+            : this(configuration, width, height, memorySource, new ImageFrameMetaData())
         {
         }
 
@@ -106,7 +107,7 @@ namespace SixLabors.ImageSharp
             Configuration configuration,
             int width,
             int height,
-            IBuffer<TPixel> consumedBuffer,
+            MemorySource<TPixel> memorySource,
             ImageFrameMetaData metaData)
         {
             Guard.NotNull(configuration, nameof(configuration));
@@ -116,7 +117,7 @@ namespace SixLabors.ImageSharp
 
             this.configuration = configuration;
             this.MemoryAllocator = configuration.MemoryAllocator;
-            this.PixelBuffer = new Buffer2D<TPixel>(consumedBuffer, width, height);
+            this.PixelBuffer = new Buffer2D<TPixel>(memorySource, width, height);
             this.MetaData = metaData;
         }
 
@@ -174,16 +175,10 @@ namespace SixLabors.ImageSharp
         public TPixel this[int x, int y]
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                return this.PixelBuffer[x, y];
-            }
+            get => this.PixelBuffer[x, y];
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            set
-            {
-                this.PixelBuffer[x, y] = value;
-            }
+            set => this.PixelBuffer[x, y] = value;
         }
 
         /// <summary>
@@ -278,7 +273,7 @@ namespace SixLabors.ImageSharp
                 this.Height,
                 this.configuration,
                 this.Width,
-                (int y, IBuffer<Vector4> tempRowBuffer) =>
+                (int y, IMemoryOwner<Vector4> tempRowBuffer) =>
                 {
                     Span<TPixel> sourceRow = this.GetPixelRowSpan(y);
                     Span<TPixel2> targetRow = target.GetPixelRowSpan(y);
diff --git a/src/ImageSharp/ImageInfoExtensions.cs b/src/ImageSharp/ImageInfoExtensions.cs
index 0f2b2ba97..dca5502d0 100644
--- a/src/ImageSharp/ImageInfoExtensions.cs
+++ b/src/ImageSharp/ImageInfoExtensions.cs
@@ -24,4 +24,4 @@ namespace SixLabors.ImageSharp
         /// <returns>The <see cref="Rectangle"/></returns>
         public static Rectangle Bounds(this IImageInfo info) => new Rectangle(0, 0, info.Width, info.Height);
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index b40884f4b..eca134101 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -29,7 +29,7 @@
     <DebugType Condition="$(codecov) == ''">portable</DebugType>
     <DebugSymbols>True</DebugSymbols>
     <Features>IOperation</Features>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>Latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
diff --git a/src/ImageSharp/Image{TPixel}.cs b/src/ImageSharp/Image{TPixel}.cs
index ad754bc75..5a5928d6b 100644
--- a/src/ImageSharp/Image{TPixel}.cs
+++ b/src/ImageSharp/Image{TPixel}.cs
@@ -84,23 +84,14 @@ namespace SixLabors.ImageSharp
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
-        /// consuming an external buffer instance.
+        /// wrapping an external <see cref="MemorySource{T}"/>
         /// </summary>
-        internal Image(Configuration configuration, IBuffer<TPixel> consumedBuffer, int width, int height)
-            : this(configuration, consumedBuffer, width, height, new ImageMetaData())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
-        /// consuming an external buffer instance.
-        /// </summary>
-        internal Image(Configuration configuration, IBuffer<TPixel> consumedBuffer, int width, int height, ImageMetaData metadata)
+        internal Image(Configuration configuration, MemorySource<TPixel> memorySource, int width, int height, ImageMetaData metadata)
         {
             this.configuration = configuration;
             this.PixelType = new PixelTypeInfo(Unsafe.SizeOf<TPixel>() * 8);
             this.MetaData = metadata;
-            this.frames = new ImageFrameCollection<TPixel>(this, width, height, consumedBuffer);
+            this.frames = new ImageFrameCollection<TPixel>(this, width, height, memorySource);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/AllocationOptions.cs b/src/ImageSharp/Memory/AllocationOptions.cs
new file mode 100644
index 000000000..5eda00505
--- /dev/null
+++ b/src/ImageSharp/Memory/AllocationOptions.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.Memory
+{
+    /// <summary>
+    /// Options for allocating buffers.
+    /// </summary>
+    public enum AllocationOptions
+    {
+        /// <summary>
+        /// Indicates that the buffer should just be allocated.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Indicates that the allocated buffer should be cleaned following allocation.
+        /// </summary>
+        Clean
+    }
+}
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs
index d0f68c9c6..adc8843a3 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.Buffer{T}.cs
@@ -14,7 +14,6 @@ namespace SixLabors.Memory
     {
         /// <summary>
         /// The buffer implementation of <see cref="ArrayPoolMemoryAllocator"/>.
-        /// In this implementation <see cref="IBuffer{T}.Memory"/> is owned.
         /// </summary>
         private class Buffer<T> : ManagedBufferBase<T>
             where T : struct
diff --git a/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs
index 90950d4b3..32c1c6d1d 100644
--- a/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs
+++ b/src/ImageSharp/Memory/ArrayPoolMemoryAllocator.cs
@@ -9,7 +9,7 @@ namespace SixLabors.Memory
     /// <summary>
     /// Implements <see cref="MemoryAllocator"/> by allocating memory from <see cref="ArrayPool{T}"/>.
     /// </summary>
-    public partial class ArrayPoolMemoryAllocator : MemoryAllocator
+    public sealed partial class ArrayPoolMemoryAllocator : MemoryAllocator
     {
         /// <summary>
         /// The <see cref="ArrayPool{T}"/> for small-to-medium buffers which is not kept clean.
@@ -89,7 +89,7 @@ namespace SixLabors.Memory
         }
 
         /// <inheritdoc />
-        internal override IBuffer<T> Allocate<T>(int length, bool clear)
+        internal override IMemoryOwner<T> Allocate<T>(int length, AllocationOptions options = AllocationOptions.None)
         {
             int itemSizeBytes = Unsafe.SizeOf<T>();
             int bufferSizeInBytes = length * itemSizeBytes;
@@ -98,7 +98,7 @@ namespace SixLabors.Memory
             byte[] byteArray = pool.Rent(bufferSizeInBytes);
 
             var buffer = new Buffer<T>(byteArray, length, pool);
-            if (clear)
+            if (options == AllocationOptions.Clean)
             {
                 buffer.Clear();
             }
@@ -107,13 +107,13 @@ namespace SixLabors.Memory
         }
 
         /// <inheritdoc />
-        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
+        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, AllocationOptions options)
         {
             ArrayPool<byte> pool = this.GetArrayPool(length);
             byte[] byteArray = pool.Rent(length);
 
             var buffer = new ManagedByteBuffer(byteArray, length, pool);
-            if (clear)
+            if (options == AllocationOptions.Clean)
             {
                 buffer.Clear();
             }
diff --git a/src/ImageSharp/Memory/BasicArrayBuffer.cs b/src/ImageSharp/Memory/BasicArrayBuffer.cs
index 5e3893d08..f40df7604 100644
--- a/src/ImageSharp/Memory/BasicArrayBuffer.cs
+++ b/src/ImageSharp/Memory/BasicArrayBuffer.cs
@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 namespace SixLabors.Memory
 {
     /// <summary>
-    /// Wraps an array as an <see cref="IBuffer{T}"/> instance. In this implementation <see cref="IBuffer{T}.Memory"/> is owned.
+    /// Wraps an array as an <see cref="IManagedByteBuffer"/> instance.
     /// </summary>
     internal class BasicArrayBuffer<T> : ManagedBufferBase<T>
         where T : struct
diff --git a/src/ImageSharp/Memory/BasicByteBuffer.cs b/src/ImageSharp/Memory/BasicByteBuffer.cs
index a8a30b1aa..9f995e347 100644
--- a/src/ImageSharp/Memory/BasicByteBuffer.cs
+++ b/src/ImageSharp/Memory/BasicByteBuffer.cs
@@ -3,7 +3,7 @@
 
 namespace SixLabors.Memory
 {
-    internal class BasicByteBuffer : BasicArrayBuffer<byte>, IManagedByteBuffer
+    internal sealed class BasicByteBuffer : BasicArrayBuffer<byte>, IManagedByteBuffer
     {
         internal BasicByteBuffer(byte[] array)
             : base(array)
diff --git a/src/ImageSharp/Memory/Buffer2DExtensions.cs b/src/ImageSharp/Memory/Buffer2DExtensions.cs
index c27752570..be4f0ef15 100644
--- a/src/ImageSharp/Memory/Buffer2DExtensions.cs
+++ b/src/ImageSharp/Memory/Buffer2DExtensions.cs
@@ -18,7 +18,7 @@ namespace SixLabors.Memory
         internal static Span<T> GetSpan<T>(this Buffer2D<T> buffer)
             where T : struct
         {
-            return buffer.Buffer.GetSpan();
+            return buffer.MemorySource.GetSpan();
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ namespace SixLabors.Memory
         public static Memory<T> GetRowMemory<T>(this Buffer2D<T> buffer, int y)
             where T : struct
         {
-            return buffer.Buffer.Memory.Slice(y * buffer.Width, buffer.Width);
+            return buffer.MemorySource.Memory.Slice(y * buffer.Width, buffer.Width);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Memory/Buffer2D{T}.cs b/src/ImageSharp/Memory/Buffer2D{T}.cs
index f8d75b54c..844ca1ad1 100644
--- a/src/ImageSharp/Memory/Buffer2D{T}.cs
+++ b/src/ImageSharp/Memory/Buffer2D{T}.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using SixLabors.Primitives;
 
@@ -12,18 +13,20 @@ namespace SixLabors.Memory
     /// interpreted as a 2D region of <see cref="Width"/> x <see cref="Height"/> elements.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
-    internal class Buffer2D<T> : IDisposable
+    internal sealed class Buffer2D<T> : IDisposable
         where T : struct
     {
+        private MemorySource<T> memorySource;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Buffer2D{T}"/> class.
         /// </summary>
-        /// <param name="wrappedBuffer">The buffer to wrap</param>
+        /// <param name="memorySource">The buffer to wrap</param>
         /// <param name="width">The number of elements in a row</param>
         /// <param name="height">The number of rows</param>
-        public Buffer2D(IBuffer<T> wrappedBuffer, int width, int height)
+        public Buffer2D(MemorySource<T> memorySource, int width, int height)
         {
-            this.Buffer = wrappedBuffer;
+            this.memorySource = memorySource;
             this.Width = width;
             this.Height = height;
         }
@@ -39,13 +42,13 @@ namespace SixLabors.Memory
         public int Height { get; private set; }
 
         /// <summary>
-        /// Gets the backing <see cref="IBuffer{T}"/>
+        /// Gets the backing <see cref="MemorySource{T}"/>
         /// </summary>
-        public IBuffer<T> Buffer { get; private set; }
+        public MemorySource<T> MemorySource => this.memorySource;
 
-        public Memory<T> Memory => this.Buffer.Memory;
+        public Memory<T> Memory => this.MemorySource.Memory;
 
-        public Span<T> Span => this.Buffer.GetSpan();
+        public Span<T> Span => this.Memory.Span;
 
         /// <summary>
         /// Gets a reference to the element at the specified position.
@@ -60,7 +63,7 @@ namespace SixLabors.Memory
             {
                 ImageSharp.DebugGuard.MustBeLessThan(x, this.Width, nameof(x));
                 DebugGuard.MustBeLessThan(y, this.Height, nameof(y));
-                Span<T> span = this.Buffer.GetSpan();
+                Span<T> span = this.Span;
                 return ref span[(this.Width * y) + x];
             }
         }
@@ -70,7 +73,7 @@ namespace SixLabors.Memory
         /// </summary>
         public void Dispose()
         {
-            this.Buffer?.Dispose();
+            this.MemorySource.Dispose();
         }
 
         /// <summary>
@@ -79,36 +82,15 @@ namespace SixLabors.Memory
         /// </summary>
         public static void SwapOrCopyContent(Buffer2D<T> destination, Buffer2D<T> source)
         {
-            if (source.Buffer.IsMemoryOwner && destination.Buffer.IsMemoryOwner)
-            {
-                SwapContents(destination, source);
-            }
-            else
-            {
-                if (destination.Size() != source.Size())
-                {
-                    throw new InvalidOperationException("SwapOrCopyContents(): buffers should both owned or the same size!");
-                }
-
-                source.Span.CopyTo(destination.Span);
-            }
+            MemorySource<T>.SwapOrCopyContent(ref destination.memorySource, ref source.memorySource);
+            SwapDimensionData(destination, source);
         }
 
-        /// <summary>
-        /// Swap the contents (<see cref="Buffer"/>, <see cref="Width"/>, <see cref="Height"/>) of the two buffers.
-        /// Useful to transfer the contents of a temporary <see cref="Buffer2D{T}"/> to a persistent <see cref="SixLabors.ImageSharp.ImageFrame{T}.PixelBuffer"/>
-        /// </summary>
-        /// <param name="a">The first buffer</param>
-        /// <param name="b">The second buffer</param>
-        private static void SwapContents(Buffer2D<T> a, Buffer2D<T> b)
+        private static void SwapDimensionData(Buffer2D<T> a, Buffer2D<T> b)
         {
             Size aSize = a.Size();
             Size bSize = b.Size();
 
-            IBuffer<T> temp = a.Buffer;
-            a.Buffer = b.Buffer;
-            b.Buffer = temp;
-
             b.Width = aSize.Width;
             b.Height = aSize.Height;
 
diff --git a/src/ImageSharp/Memory/BufferExtensions.cs b/src/ImageSharp/Memory/BufferExtensions.cs
index 8ebf866bc..800e0d975 100644
--- a/src/ImageSharp/Memory/BufferExtensions.cs
+++ b/src/ImageSharp/Memory/BufferExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -11,8 +12,12 @@ namespace SixLabors.Memory
     internal static class BufferExtensions
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Length<T>(this IBuffer<T> buffer)
-            where T : struct => buffer.GetSpan().Length;
+        public static Span<T> GetSpan<T>(this IMemoryOwner<T> buffer)
+            => buffer.Memory.Span;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int Length<T>(this IMemoryOwner<T> buffer)
+            => buffer.GetSpan().Length;
 
         /// <summary>
         /// Gets a <see cref="Span{T}"/> to an offseted position inside the buffer.
@@ -21,8 +26,7 @@ namespace SixLabors.Memory
         /// <param name="start">The start</param>
         /// <returns>The <see cref="Span{T}"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> Slice<T>(this IBuffer<T> buffer, int start)
-            where T : struct
+        public static Span<T> Slice<T>(this IMemoryOwner<T> buffer, int start)
         {
             return buffer.GetSpan().Slice(start);
         }
@@ -35,8 +39,7 @@ namespace SixLabors.Memory
         /// <param name="length">The length of the slice</param>
         /// <returns>The <see cref="Span{T}"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> Slice<T>(this IBuffer<T> buffer, int start, int length)
-            where T : struct
+        public static Span<T> Slice<T>(this IMemoryOwner<T> buffer, int start, int length)
         {
             return buffer.GetSpan().Slice(start, length);
         }
@@ -46,13 +49,12 @@ namespace SixLabors.Memory
         /// </summary>
         /// <param name="buffer">The buffer</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Clear<T>(this IBuffer<T> buffer)
-            where T : struct
+        public static void Clear<T>(this IMemoryOwner<T> buffer)
         {
             buffer.GetSpan().Clear();
         }
 
-        public static ref T GetReference<T>(this IBuffer<T> buffer)
+        public static ref T GetReference<T>(this IMemoryOwner<T> buffer)
             where T : struct =>
             ref MemoryMarshal.GetReference(buffer.GetSpan());
 
diff --git a/src/ImageSharp/Memory/ConsumedBuffer.cs b/src/ImageSharp/Memory/ConsumedBuffer.cs
deleted file mode 100644
index 73468a381..000000000
--- a/src/ImageSharp/Memory/ConsumedBuffer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-
-namespace SixLabors.Memory
-{
-    /// <summary>
-    /// A buffer implementation that consumes an existing <see cref="Memory{T}"/> instance.
-    /// The ownership of the memory remains external.
-    /// </summary>
-    /// <typeparam name="T">The value type</typeparam>
-    internal sealed class ConsumedBuffer<T> : IBuffer<T>
-        where T : struct
-    {
-        public ConsumedBuffer(Memory<T> memory)
-        {
-            this.Memory = memory;
-        }
-
-        public Memory<T> Memory { get; }
-
-        public bool IsMemoryOwner => false;
-
-        public Span<T> GetSpan()
-        {
-            return this.Memory.Span;
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/IBuffer{T}.cs b/src/ImageSharp/Memory/IBuffer{T}.cs
deleted file mode 100644
index 847f2741d..000000000
--- a/src/ImageSharp/Memory/IBuffer{T}.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using System;
-using System.Buffers;
-
-namespace SixLabors.Memory
-{
-    /// <summary>
-    /// Represents a contigous memory buffer of value-type items.
-    /// Depending on it's implementation, an <see cref="IBuffer{T}"/> can (1) OWN or (2) CONSUME the <see cref="Memory{T}"/> instance it wraps.
-    /// For a deeper understanding of the owner/consumer model, read the following docs: <br/>
-    /// https://gist.github.com/GrabYourPitchforks/4c3e1935fd4d9fa2831dbfcab35dffc6
-    /// TODO: We need more SOC here! For owned buffers we should use <see cref="IMemoryOwner{T}"/>.
-    /// For the consumption case we should not use buffers at all. We need to refactor Buffer2D{T} for this.
-    /// </summary>
-    /// <typeparam name="T">The value type</typeparam>
-    internal interface IBuffer<T> : IDisposable
-        where T : struct
-    {
-        /// <summary>
-        /// Gets the <see cref="Memory{T}"/> ownerd/consumed by this buffer.
-        /// </summary>
-        Memory<T> Memory { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is owning the <see cref="Memory"/>.
-        /// </summary>
-        bool IsMemoryOwner { get; }
-
-        /// <summary>
-        /// Gets the span to the memory "promised" by this buffer when it's OWNED (1).
-        /// Gets `this.Memory.Span` when the buffer CONSUMED (2).
-        /// </summary>
-        /// <returns>The <see cref="Span{T}"/></returns>
-        Span<T> GetSpan();
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/IManagedByteBuffer.cs b/src/ImageSharp/Memory/IManagedByteBuffer.cs
index a977eb68f..91c61424b 100644
--- a/src/ImageSharp/Memory/IManagedByteBuffer.cs
+++ b/src/ImageSharp/Memory/IManagedByteBuffer.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Buffers;
+
 namespace SixLabors.Memory
 {
     /// <summary>
     /// Represents a byte buffer backed by a managed array. Useful for interop with classic .NET API-s.
     /// </summary>
-    internal interface IManagedByteBuffer : IBuffer<byte>
+    internal interface IManagedByteBuffer : IMemoryOwner<byte>
     {
         /// <summary>
         /// Gets the managed array backing this buffer instance.
diff --git a/src/ImageSharp/Memory/ManagedBufferBase.cs b/src/ImageSharp/Memory/ManagedBufferBase.cs
index 606d1c962..8aaf199ff 100644
--- a/src/ImageSharp/Memory/ManagedBufferBase.cs
+++ b/src/ImageSharp/Memory/ManagedBufferBase.cs
@@ -7,9 +7,9 @@ using System.Runtime.InteropServices;
 namespace SixLabors.Memory
 {
     /// <summary>
-    /// Provides a base class for <see cref="IBuffer{T}"/> implementations by implementing pinning logic for <see cref="MemoryManager{T}"/> adaption.
+    /// Provides a base class for <see cref="IMemoryOwner{T}"/> implementations by implementing pinning logic for <see cref="MemoryManager{T}"/> adaption.
     /// </summary>
-    internal abstract class ManagedBufferBase<T> : System.Buffers.MemoryManager<T>, IBuffer<T>
+    internal abstract class ManagedBufferBase<T> : MemoryManager<T>
         where T : struct
     {
         private GCHandle pinHandle;
diff --git a/src/ImageSharp/Memory/MemoryAllocator.cs b/src/ImageSharp/Memory/MemoryAllocator.cs
index 2195444fd..57b721e48 100644
--- a/src/ImageSharp/Memory/MemoryAllocator.cs
+++ b/src/ImageSharp/Memory/MemoryAllocator.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Buffers;
+
 namespace SixLabors.Memory
 {
     /// <summary>
@@ -9,23 +11,22 @@ namespace SixLabors.Memory
     public abstract class MemoryAllocator
     {
         /// <summary>
-        /// Allocates an <see cref="IBuffer{T}"/> of size <paramref name="length"/>, optionally
-        /// clearing the buffer before it gets returned.
+        /// Allocates an <see cref="IMemoryOwner{T}" />, holding a <see cref="System.Memory{T}"/> of length <paramref name="length"/>.
         /// </summary>
         /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
         /// <param name="length">Size of the buffer to allocate</param>
-        /// <param name="clear">True to clear the backing memory of the buffer</param>
+        /// <param name="options">The allocation options.</param>
         /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        internal abstract IBuffer<T> Allocate<T>(int length, bool clear)
+        internal abstract IMemoryOwner<T> Allocate<T>(int length, AllocationOptions options = AllocationOptions.None)
             where T : struct;
 
         /// <summary>
-        /// Allocates an <see cref="IManagedByteBuffer"/>
+        /// Allocates an <see cref="IManagedByteBuffer"/>.
         /// </summary>
         /// <param name="length">The requested buffer length</param>
-        /// <param name="clear">A value indicating whether to clean the buffer</param>
+        /// <param name="options">The allocation options.</param>
         /// <returns>The <see cref="IManagedByteBuffer"/></returns>
-        internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear);
+        internal abstract IManagedByteBuffer AllocateManagedByteBuffer(int length, AllocationOptions options = AllocationOptions.None);
 
         /// <summary>
         /// Releases all retained resources not being in use.
diff --git a/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs b/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs
index ab4fc93b7..d8c1f51f4 100644
--- a/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs
+++ b/src/ImageSharp/Memory/MemoryAllocatorExtensions.cs
@@ -1,4 +1,6 @@
-using SixLabors.Primitives;
+using System.Buffers;
+
+using SixLabors.Primitives;
 
 namespace SixLabors.Memory
 {
@@ -7,56 +9,25 @@ namespace SixLabors.Memory
     /// </summary>
     internal static class MemoryAllocatorExtensions
     {
-        /// <summary>
-        /// Allocates a <see cref="IBuffer{T}"/> of size <paramref name="length"/>.
-        /// Note: Depending on the implementation, the buffer may not cleared before
-        /// returning, so it may contain data from an earlier use.
-        /// </summary>
-        /// <typeparam name="T">Type of the data stored in the buffer</typeparam>
-        /// <param name="memoryAllocator">The <see cref="MemoryAllocator"/></param>
-        /// <param name="length">Size of the buffer to allocate</param>
-        /// <returns>A buffer of values of type <typeparamref name="T"/>.</returns>
-        public static IBuffer<T> Allocate<T>(this MemoryAllocator memoryAllocator, int length)
-            where T : struct
-        {
-            return memoryAllocator.Allocate<T>(length, false);
-        }
-
-        public static IBuffer<T> AllocateClean<T>(this MemoryAllocator memoryAllocator, int length)
-            where T : struct
-        {
-            return memoryAllocator.Allocate<T>(length, true);
-        }
-
-        public static IManagedByteBuffer AllocateManagedByteBuffer(this MemoryAllocator memoryAllocator, int length)
-        {
-            return memoryAllocator.AllocateManagedByteBuffer(length, false);
-        }
-
-        public static IManagedByteBuffer AllocateCleanManagedByteBuffer(this MemoryAllocator memoryAllocator, int length)
-        {
-            return memoryAllocator.AllocateManagedByteBuffer(length, true);
-        }
-
-        public static Buffer2D<T> Allocate2D<T>(this MemoryAllocator memoryAllocator, int width, int height, bool clear)
+        public static Buffer2D<T> Allocate2D<T>(
+            this MemoryAllocator memoryAllocator,
+            int width,
+            int height,
+            AllocationOptions options = AllocationOptions.None)
             where T : struct
         {
-            IBuffer<T> buffer = memoryAllocator.Allocate<T>(width * height, clear);
+            IMemoryOwner<T> buffer = memoryAllocator.Allocate<T>(width * height, options);
+            var memorySource = new MemorySource<T>(buffer, true);
 
-            return new Buffer2D<T>(buffer, width, height);
+            return new Buffer2D<T>(memorySource, width, height);
         }
 
-        public static Buffer2D<T> Allocate2D<T>(this MemoryAllocator memoryAllocator, Size size)
-            where T : struct =>
-            Allocate2D<T>(memoryAllocator, size.Width, size.Height, false);
-
-        public static Buffer2D<T> Allocate2D<T>(this MemoryAllocator memoryAllocator, int width, int height)
-            where T : struct =>
-            Allocate2D<T>(memoryAllocator, width, height, false);
-
-        public static Buffer2D<T> AllocateClean2D<T>(this MemoryAllocator memoryAllocator, int width, int height)
+        public static Buffer2D<T> Allocate2D<T>(
+            this MemoryAllocator memoryAllocator,
+            Size size,
+            AllocationOptions options = AllocationOptions.None)
             where T : struct =>
-            Allocate2D<T>(memoryAllocator, width, height, true);
+            Allocate2D<T>(memoryAllocator, size.Width, size.Height, options);
 
         /// <summary>
         /// Allocates padded buffers for BMP encoder/decoder. (Replacing old PixelRow/PixelArea)
diff --git a/src/ImageSharp/Memory/MemorySource.cs b/src/ImageSharp/Memory/MemorySource.cs
new file mode 100644
index 000000000..c0a74b5f8
--- /dev/null
+++ b/src/ImageSharp/Memory/MemorySource.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+
+namespace SixLabors.Memory
+{
+    /// <summary>
+    /// Holds a <see cref="System.Memory{T}"/> that is either OWNED or CONSUMED.
+    /// When the memory is being owned, the <see cref="IMemoryOwner{T}"/> instance is also known.
+    /// Implements content transfer logic in  <see cref="SwapOrCopyContent"/> that depends on the ownership status.
+    /// This is needed to transfer the contents of a temporary <see cref="Buffer2D{T}"/>
+    /// to a persistent <see cref="SixLabors.ImageSharp.ImageFrame{T}.PixelBuffer"/> without copying the buffer.
+    /// </summary>
+    /// <remarks>
+    /// For a deeper understanding of the owner/consumer model, check out the following docs: <br/>
+    /// https://gist.github.com/GrabYourPitchforks/4c3e1935fd4d9fa2831dbfcab35dffc6
+    /// https://www.codemag.com/Article/1807051/Introducing-.NET-Core-2.1-Flagship-Types-Span-T-and-Memory-T
+    /// </remarks>
+    internal struct MemorySource<T> : IDisposable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MemorySource{T}"/> struct
+        /// by wrapping an existing <see cref="IMemoryOwner{T}"/>.
+        /// </summary>
+        /// <param name="memoryOwner">The <see cref="IMemoryOwner{T}"/> to wrap</param>
+        /// <param name="isInternalMemorySource">
+        /// A value indicating whether <paramref name="memoryOwner"/> is an internal memory source managed by ImageSharp.
+        /// Eg. allocated by a <see cref="MemoryAllocator"/>.
+        /// </param>
+        public MemorySource(IMemoryOwner<T> memoryOwner, bool isInternalMemorySource)
+        {
+            this.MemoryOwner = memoryOwner;
+            this.Memory = memoryOwner.Memory;
+            this.HasSwappableContents = isInternalMemorySource;
+        }
+
+        public MemorySource(Memory<T> memory)
+        {
+            this.Memory = memory;
+            this.MemoryOwner = null;
+            this.HasSwappableContents = false;
+        }
+
+        public IMemoryOwner<T> MemoryOwner { get; private set; }
+
+        public Memory<T> Memory { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether we are allowed to swap the contents of this buffer
+        /// with an other <see cref="MemorySource{T}"/> instance.
+        /// The value is true only and only if <see cref="MemoryOwner"/> is present,
+        /// and it's coming from an internal source managed by ImageSharp (<see cref="MemoryAllocator"/>).
+        /// </summary>
+        public bool HasSwappableContents { get; }
+
+        public Span<T> GetSpan() => this.Memory.Span;
+
+        public void Clear() => this.Memory.Span.Clear();
+
+        /// <summary>
+        /// Swaps the contents of 'destination' with 'source' if the buffers are owned (1),
+        /// copies the contents of 'source' to 'destination' otherwise (2). Buffers should be of same size in case 2!
+        /// </summary>
+        public static void SwapOrCopyContent(ref MemorySource<T> destination, ref MemorySource<T> source)
+        {
+            if (source.HasSwappableContents && destination.HasSwappableContents)
+            {
+                SwapContents(ref destination, ref source);
+            }
+            else
+            {
+                if (destination.Memory.Length != source.Memory.Length)
+                {
+                    throw new InvalidOperationException("SwapOrCopyContents(): buffers should both owned or the same size!");
+                }
+
+                source.Memory.CopyTo(destination.Memory);
+            }
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            this.MemoryOwner?.Dispose();
+        }
+
+        private static void SwapContents(ref MemorySource<T> a, ref MemorySource<T> b)
+        {
+            IMemoryOwner<T> tempOwner = a.MemoryOwner;
+            Memory<T> tempMemory = a.Memory;
+
+            a.MemoryOwner = b.MemoryOwner;
+            a.Memory = b.Memory;
+
+            b.MemoryOwner = tempOwner;
+            b.Memory = tempMemory;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs b/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs
index 2d339f4c7..612b53820 100644
--- a/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs
+++ b/src/ImageSharp/Memory/SimpleGcMemoryAllocator.cs
@@ -1,19 +1,21 @@
-namespace SixLabors.Memory
+using System.Buffers;
+
+namespace SixLabors.Memory
 {
     /// <summary>
     /// Implements <see cref="MemoryAllocator"/> by newing up arrays by the GC on every allocation requests.
     /// </summary>
-    public class SimpleGcMemoryAllocator : MemoryAllocator
+    public sealed class SimpleGcMemoryAllocator : MemoryAllocator
     {
         /// <inheritdoc />
-        internal override IBuffer<T> Allocate<T>(int length, bool clear)
+        internal override IMemoryOwner<T> Allocate<T>(int length, AllocationOptions options = AllocationOptions.None)
         {
             return new BasicArrayBuffer<T>(new T[length]);
         }
 
-        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
+        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, AllocationOptions options)
         {
             return new BasicByteBuffer(new byte[length]);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/ImageFrameMetaData.cs b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
index d507a5b3e..47a2fb775 100644
--- a/src/ImageSharp/MetaData/ImageFrameMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageFrameMetaData.cs
@@ -56,4 +56,4 @@ namespace SixLabors.ImageSharp.MetaData
             return new ImageFrameMetaData(this);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/ImageMetaData.cs b/src/ImageSharp/MetaData/ImageMetaData.cs
index af3cc5f5f..40880bd08 100644
--- a/src/ImageSharp/MetaData/ImageMetaData.cs
+++ b/src/ImageSharp/MetaData/ImageMetaData.cs
@@ -14,13 +14,13 @@ namespace SixLabors.ImageSharp.MetaData
     {
         /// <summary>
         /// The default horizontal resolution value (dots per inch) in x direction.
-        /// <remarks>The default value is 96 dots per inch.</remarks>
+        /// <remarks>The default value is 96 <see cref="PixelResolutionUnit.PixelsPerInch"/>.</remarks>
         /// </summary>
         public const double DefaultHorizontalResolution = 96;
 
         /// <summary>
         /// The default vertical resolution value (dots per inch) in y direction.
-        /// <remarks>The default value is 96 dots per inch.</remarks>
+        /// <remarks>The default value is 96 <see cref="PixelResolutionUnit.PixelsPerInch"/>.</remarks>
         /// </summary>
         public const double DefaultVerticalResolution = 96;
 
@@ -47,6 +47,7 @@ namespace SixLabors.ImageSharp.MetaData
         {
             this.HorizontalResolution = other.HorizontalResolution;
             this.VerticalResolution = other.VerticalResolution;
+            this.ResolutionUnits = other.ResolutionUnits;
             this.RepeatCount = other.RepeatCount;
 
             foreach (ImageProperty property in other.Properties)
@@ -99,6 +100,15 @@ namespace SixLabors.ImageSharp.MetaData
             }
         }
 
+        /// <summary>
+        /// Gets or sets unit of measure used when reporting resolution.
+        ///  00 : No units; width:height pixel aspect ratio = Ydensity:Xdensity
+        ///  01 : Pixels per inch (2.54 cm)
+        ///  02 : Pixels per centimeter
+        ///  03 : Pixels per meter
+        /// </summary>
+        public PixelResolutionUnit ResolutionUnits { get; set; } = PixelResolutionUnit.PixelsPerInch;
+
         /// <summary>
         /// Gets or sets the Exif profile.
         /// </summary>
diff --git a/src/ImageSharp/MetaData/ImageProperty.cs b/src/ImageSharp/MetaData/ImageProperty.cs
index 3e0cccd42..a08a95fed 100644
--- a/src/ImageSharp/MetaData/ImageProperty.cs
+++ b/src/ImageSharp/MetaData/ImageProperty.cs
@@ -136,4 +136,4 @@ namespace SixLabors.ImageSharp.MetaData
             return this.Name.Equals(other.Name) && Equals(this.Value, other.Value);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/PixelResolutionUnit.cs b/src/ImageSharp/MetaData/PixelResolutionUnit.cs
new file mode 100644
index 000000000..ce848004f
--- /dev/null
+++ b/src/ImageSharp/MetaData/PixelResolutionUnit.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.MetaData
+{
+    /// <summary>
+    /// Provides enumeration of available pixel density units.
+    /// </summary>
+    public enum PixelResolutionUnit : byte
+    {
+        /// <summary>
+        /// No units; width:height pixel aspect ratio.
+        /// </summary>
+        AspectRatio = 0,
+
+        /// <summary>
+        /// Pixels per inch (2.54 cm).
+        /// </summary>
+        PixelsPerInch = 1,
+
+        /// <summary>
+        /// Pixels per centimeter.
+        /// </summary>
+        PixelsPerCentimeter = 2,
+
+        /// <summary>
+        /// Pixels per meter (100 cm).
+        /// </summary>
+        PixelsPerMeter = 3
+    }
+}
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
index d475959c6..87e3e4494 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
@@ -147,12 +147,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
         /// </returns>
         public static bool operator ==(ExifValue left, ExifValue right)
         {
-            if (ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            return left.Equals(right);
+            return ReferenceEquals(left, right) || left.Equals(right);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
index a7ce0e809..2ad9079e1 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccOneDimensionalCurve.cs
@@ -51,7 +51,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return this.BreakPoints.SequenceEqual(other.BreakPoints)
+            return this.BreakPoints.AsSpan().SequenceEqual(other.BreakPoints)
                 && this.Segments.SequenceEqual(other.Segments);
         }
     }
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
index e15d8a434..6873c5f4d 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccResponseCurve.cs
@@ -60,7 +60,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             }
 
             return this.CurveType == other.CurveType
-                && this.XyzValues.SequenceEqual(other.XyzValues)
+                && this.XyzValues.AsSpan().SequenceEqual(other.XyzValues)
                 && this.EqualsResponseArray(other);
         }
 
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
index 572c4a8f7..d9badf5a8 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Curves/IccSampledCurveElement.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -34,7 +33,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         {
             if (base.Equals(other) && other is IccSampledCurveElement segment)
             {
-                return this.CurveEntries.SequenceEqual(segment.CurveEntries);
+                return this.CurveEntries.AsSpan().SequenceEqual(segment.CurveEntries);
             }
 
             return false;
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
index d6df9e666..49b453a46 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/DataReader/IccDataReader.cs
@@ -35,10 +35,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <summary>
         /// Gets the length in bytes of the raw data
         /// </summary>
-        public int DataLength
-        {
-            get { return this.data.Length; }
-        }
+        public int DataLength => this.data.Length;
 
         /// <summary>
         /// Sets the reading position to the given value
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
index f6ed9325a..da47b565e 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccReader.cs
@@ -146,4 +146,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return table.ToArray();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
index d7221e8cf..c42e32d55 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/IccWriter.cs
@@ -93,4 +93,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return table.ToArray();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
index 13b58161c..e6170f768 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/MultiProcessElements/IccMatrixProcessElement.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 using SixLabors.ImageSharp.Primitives;
 
@@ -47,7 +46,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             if (base.Equals(other) && other is IccMatrixProcessElement element)
             {
                 return this.EqualsMatrix(element)
-                    && this.MatrixOx1.SequenceEqual(element.MatrixOx1);
+                    && this.MatrixOx1.AsSpan().SequenceEqual(element.MatrixOx1);
             }
 
             return false;
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
index 2194b8ab4..6df2f556f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccColorantOrderTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -59,7 +58,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.ColorantNumber.SequenceEqual(other.ColorantNumber);
+            return base.Equals(other) && this.ColorantNumber.AsSpan().SequenceEqual(other.ColorantNumber);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
index 154afd8ed..40666934f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccCurveTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -107,7 +106,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.CurveData.SequenceEqual(other.CurveData);
+            return base.Equals(other) && this.CurveData.AsSpan().SequenceEqual(other.CurveData);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
index a1addaa90..7f034cebf 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccDataTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 using System.Text;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
@@ -83,7 +82,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data) && this.IsAscii == other.IsAscii;
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data) && this.IsAscii == other.IsAscii;
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
index b0d9e1ef9..8a7d068f9 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccFix16ArrayTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
index f6b0582fb..333615524 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccProfileSequenceIdentifierTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -57,7 +56,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc />
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
index c93781d9e..de6264824 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccScreeningTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -68,7 +67,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 
             return base.Equals(other)
                 && this.Flags == other.Flags
-                && this.Channels.SequenceEqual(other.Channels);
+                && this.Channels.AsSpan().SequenceEqual(other.Channels);
         }
 
         /// <inheritdoc />
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
index 63a19d6d4..4d9979a4f 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUFix16ArrayTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
index d082df39a..b0c225d85 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt16ArrayTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
index 2e3efe1c7..c8b95d835 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt32ArrayTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
index 85ae2f9fa..b780183df 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt64ArrayTagDataEntry.cs
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
index a673abf68..920b9efc0 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUInt8ArrayTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
index fd38e659b..28759a54c 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUcrBgTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -77,8 +76,8 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             }
 
             return base.Equals(other)
-                && this.UcrCurve.SequenceEqual(other.UcrCurve)
-                && this.BgCurve.SequenceEqual(other.BgCurve)
+                && this.UcrCurve.AsSpan().SequenceEqual(other.UcrCurve)
+                && this.BgCurve.AsSpan().SequenceEqual(other.BgCurve)
                 && string.Equals(this.Description, other.Description);
         }
 
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
index 0f0a9d218..68a0ff2f4 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccUnknownTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -56,7 +55,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return base.Equals(other) && this.Data.SequenceEqual(other.Data);
+            return base.Equals(other) && this.Data.AsSpan().SequenceEqual(other.Data);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
index b776cc4c0..162392326 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/TagDataEntries/IccXyzTagDataEntry.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 using System.Numerics;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
@@ -15,7 +14,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <summary>
         /// Initializes a new instance of the <see cref="IccXyzTagDataEntry"/> class.
         /// </summary>
-        /// <param name="data">The XYZ numbers</param>
+        /// <param name="data">The XYZ numbers.</param>
         public IccXyzTagDataEntry(Vector3[] data)
             : this(data, IccProfileTag.Unknown)
         {
@@ -34,7 +33,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         }
 
         /// <summary>
-        /// Gets the XYZ numbers
+        /// Gets the XYZ numbers.
         /// </summary>
         public Vector3[] Data { get; }
 
@@ -43,7 +42,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         {
             if (base.Equals(other) && other is IccXyzTagDataEntry entry)
             {
-                return this.Data.SequenceEqual(entry.Data);
+                return this.Data.AsSpan().SequenceEqual(entry.Data);
             }
 
             return false;
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
index e88115438..3f9d865b7 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccClut.cs
@@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 && this.DataType == other.DataType
                 && this.InputChannelCount == other.InputChannelCount
                 && this.OutputChannelCount == other.OutputChannelCount
-                && this.GridPointCount.SequenceEqual(other.GridPointCount);
+                && this.GridPointCount.AsSpan().SequenceEqual(other.GridPointCount);
         }
 
         /// <inheritdoc/>
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 
             for (int i = 0; i < this.Values.Length; i++)
             {
-                if (!this.Values[i].SequenceEqual(other.Values[i]))
+                if (!this.Values[i].AsSpan().SequenceEqual(other.Values[i]))
                 {
                     return false;
                 }
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
index c263ffe27..a84631143 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccLut.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Linq;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
@@ -68,7 +67,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
                 return true;
             }
 
-            return this.Values.SequenceEqual(other.Values);
+            return this.Values.AsSpan().SequenceEqual(other.Values);
         }
     }
 }
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
index 67911936f..138999710 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccProfileId.cs
@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <summary>
         /// A profile ID with all values set to zero
         /// </summary>
-        public static readonly IccProfileId Zero = new IccProfileId(0, 0, 0, 0);
+        public static readonly IccProfileId Zero = default;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="IccProfileId"/> struct.
@@ -53,16 +53,7 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
         /// <summary>
         /// Gets a value indicating whether the ID is set or just consists of zeros
         /// </summary>
-        public bool IsSet
-        {
-            get
-            {
-                return this.Part1 != 0
-                    && this.Part2 != 0
-                    && this.Part3 != 0
-                    && this.Part4 != 0;
-            }
-        }
+        public bool IsSet => !this.Equals(Zero);
 
         /// <summary>
         /// Compares two <see cref="IccProfileId"/> objects for equality.
@@ -131,4 +122,4 @@ namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
             return value.ToString("X").PadLeft(8, '0');
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
index 79c647bf1..1c4ac8465 100644
--- a/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
+++ b/src/ImageSharp/MetaData/Profiles/ICC/Various/IccScreeningChannel.cs
@@ -2,12 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Runtime.InteropServices;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Icc
 {
     /// <summary>
     /// A single channel of a <see cref="IccScreeningTagDataEntry"/>
     /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
     internal readonly struct IccScreeningChannel : IEquatable<IccScreeningChannel>
     {
         /// <summary>
diff --git a/src/ImageSharp/PixelFormats/Bgra32.cs b/src/ImageSharp/PixelFormats/Bgra32.cs
index f951be881..14b2da07c 100644
--- a/src/ImageSharp/PixelFormats/Bgra32.cs
+++ b/src/ImageSharp/PixelFormats/Bgra32.cs
@@ -11,6 +11,7 @@ namespace SixLabors.ImageSharp.PixelFormats
     /// <summary>
     /// Packed pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
     /// The color components are stored in blue, green, red, and alpha order (least significant to most significant byte).
+    /// The format is binary compatible with System.Drawing.Imaging.PixelFormat.Format32bppArgb
     /// <para>
     /// Ranges from [0, 0, 0, 0] to [1, 1, 1, 1] in vector form.
     /// </para>
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
index c5bed2b27..1ee9848d6 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.cs
@@ -1,21 +1,14 @@
-
-
-
-
-
-
-
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 // <auto-generated />
+using System;
+using System.Numerics;
+using System.Buffers;
+using SixLabors.Memory;
+
 namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
 {
-    using System;
-    using System.Numerics;
-    using SixLabors.Memory;
-
-
     /// <summary>
     /// Collection of Porter Duff alpha blending functions applying different composition models.
     /// </summary>
@@ -31,7 +24,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
         where TPixel : struct, IPixel<TPixel>
     {
 
-
             internal class Normal_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -52,7 +44,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -71,7 +63,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -92,7 +83,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -111,7 +102,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -132,7 +122,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -151,7 +141,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -172,7 +161,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -191,7 +180,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -212,7 +200,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -231,7 +219,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -252,7 +239,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -271,7 +258,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -292,7 +278,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -311,7 +297,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -332,7 +317,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -351,7 +336,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_Src : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -372,7 +356,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -391,7 +375,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -412,7 +395,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -431,7 +414,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -452,7 +434,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -471,7 +453,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -492,7 +473,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -511,7 +492,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -532,7 +512,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -551,7 +531,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -572,7 +551,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -591,7 +570,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -612,7 +590,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -631,7 +609,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -652,7 +629,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -671,7 +648,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -692,7 +668,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -711,7 +687,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_SrcAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -732,7 +707,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -751,7 +726,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -772,7 +746,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -791,7 +765,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -812,7 +785,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -831,7 +804,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -852,7 +824,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -871,7 +843,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -892,7 +863,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -911,7 +882,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -932,7 +902,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -951,7 +921,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -972,7 +941,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -991,7 +960,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1012,7 +980,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1031,7 +999,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1052,7 +1019,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1071,7 +1038,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_SrcOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1092,7 +1058,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1111,7 +1077,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1132,7 +1097,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1151,7 +1116,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1172,7 +1136,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1191,7 +1155,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1212,7 +1175,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1231,7 +1194,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1252,7 +1214,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1271,7 +1233,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1292,7 +1253,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1311,7 +1272,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1332,7 +1292,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1351,7 +1311,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1372,7 +1331,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1391,7 +1350,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1412,7 +1370,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1431,7 +1389,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_SrcIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1452,7 +1409,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1471,7 +1428,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1492,7 +1448,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1511,7 +1467,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1532,7 +1487,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1551,7 +1506,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1572,7 +1526,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1591,7 +1545,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1612,7 +1565,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1631,7 +1584,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1652,7 +1604,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1671,7 +1623,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1692,7 +1643,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1711,7 +1662,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1732,7 +1682,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1751,7 +1701,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1772,7 +1721,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1791,7 +1740,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_SrcOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1812,7 +1760,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1831,7 +1779,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1852,7 +1799,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1871,7 +1818,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1892,7 +1838,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1911,7 +1857,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1932,7 +1877,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1951,7 +1896,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -1972,7 +1916,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -1991,7 +1935,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2012,7 +1955,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2031,7 +1974,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2052,7 +1994,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2071,7 +2013,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2092,7 +2033,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2111,7 +2052,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2132,7 +2072,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2151,7 +2091,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_Dest : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2172,7 +2111,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2191,7 +2130,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2212,7 +2150,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2231,7 +2169,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2252,7 +2189,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2271,7 +2208,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2292,7 +2228,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2311,7 +2247,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2332,7 +2267,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2351,7 +2286,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2372,7 +2306,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2391,7 +2325,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2412,7 +2345,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2431,7 +2364,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2452,7 +2384,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2471,7 +2403,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2492,7 +2423,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2511,7 +2442,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_DestAtop : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2532,7 +2462,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2551,7 +2481,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2572,7 +2501,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2591,7 +2520,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2612,7 +2540,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2631,7 +2559,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2652,7 +2579,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2671,7 +2598,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2692,7 +2618,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2711,7 +2637,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2732,7 +2657,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2751,7 +2676,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2772,7 +2696,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2791,7 +2715,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2812,7 +2735,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2831,7 +2754,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2852,7 +2774,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2871,7 +2793,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_DestOver : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2892,7 +2813,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2911,7 +2832,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2932,7 +2852,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2951,7 +2871,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -2972,7 +2891,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -2991,7 +2910,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3012,7 +2930,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3031,7 +2949,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3052,7 +2969,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3071,7 +2988,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3092,7 +3008,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3111,7 +3027,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3132,7 +3047,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3151,7 +3066,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3172,7 +3086,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3191,7 +3105,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3212,7 +3125,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3231,7 +3144,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_DestIn : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3252,7 +3164,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3271,7 +3183,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3292,7 +3203,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3311,7 +3222,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3332,7 +3242,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3351,7 +3261,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3372,7 +3281,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3391,7 +3300,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3412,7 +3320,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3431,7 +3339,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3452,7 +3359,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3471,7 +3378,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3492,7 +3398,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3511,7 +3417,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3532,7 +3437,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3551,7 +3456,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3572,7 +3476,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3591,7 +3495,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_DestOut : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3612,7 +3515,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3631,7 +3534,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3652,7 +3554,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3671,7 +3573,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3692,7 +3593,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3711,7 +3612,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3732,7 +3632,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3751,7 +3651,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3772,7 +3671,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3791,7 +3690,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3812,7 +3710,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3831,7 +3729,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3852,7 +3749,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3871,7 +3768,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3892,7 +3788,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3911,7 +3807,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3932,7 +3827,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3951,7 +3846,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_Clear : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -3972,7 +3866,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -3991,7 +3885,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Normal_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4012,7 +3905,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4031,7 +3924,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Multiply_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4052,7 +3944,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4071,7 +3963,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Add_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4092,7 +3983,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4111,7 +4002,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Subtract_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4132,7 +4022,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4151,7 +4041,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Screen_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4172,7 +4061,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4191,7 +4080,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Darken_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4212,7 +4100,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4231,7 +4119,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Lighten_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4252,7 +4139,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4271,7 +4158,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class Overlay_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4292,7 +4178,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4311,7 +4197,6 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
             internal class HardLight_Xor : PixelBlender<TPixel>
             {
                 /// <summary>
@@ -4332,7 +4217,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -4351,6 +4236,5 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                 }
             }
 
-
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
index c2afc6cf6..e60d8ca90 100644
--- a/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
+++ b/src/ImageSharp/PixelFormats/PixelBlenders/DefaultPixelBlenders.Generated.tt
@@ -12,13 +12,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 // <auto-generated />
+using System;
+using System.Numerics;
+using System.Buffers;
+using SixLabors.Memory;
+
 namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
 {
-    using System;
-    using System.Numerics;
-    using SixLabors.Memory;
-
-
     /// <summary>
     /// Collection of Porter Duff alpha blending functions applying different composition models.
     /// </summary>
@@ -90,7 +90,7 @@ namespace SixLabors.ImageSharp.PixelFormats.PixelBlenders
                     Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
                     Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-                    using (IBuffer<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3, false))
+                    using (IMemoryOwner<Vector4> buffer = memoryManager.Allocate<Vector4>(destination.Length * 3))
                     {
                         Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                         Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
diff --git a/src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs b/src/ImageSharp/Processing/AnchorPositionMode.cs
similarity index 96%
rename from src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs
rename to src/ImageSharp/Processing/AnchorPositionMode.cs
index 793fc0dfc..ef9c0fdaf 100644
--- a/src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs
+++ b/src/ImageSharp/Processing/AnchorPositionMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerated anchor positions to apply to resized images.
diff --git a/src/ImageSharp/Processing/Transforms/AutoOrientExtensions.cs b/src/ImageSharp/Processing/AutoOrientExtensions.cs
similarity index 89%
rename from src/ImageSharp/Processing/Transforms/AutoOrientExtensions.cs
rename to src/ImageSharp/Processing/AutoOrientExtensions.cs
index d3ac16708..d11fc9623 100644
--- a/src/ImageSharp/Processing/Transforms/AutoOrientExtensions.cs
+++ b/src/ImageSharp/Processing/AutoOrientExtensions.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of auto-orientation operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Overlays/BackgroundColorExtensions.cs b/src/ImageSharp/Processing/BackgroundColorExtensions.cs
similarity index 97%
rename from src/ImageSharp/Processing/Overlays/BackgroundColorExtensions.cs
rename to src/ImageSharp/Processing/BackgroundColorExtensions.cs
index 1a8224769..1ad2c9237 100644
--- a/src/ImageSharp/Processing/Overlays/BackgroundColorExtensions.cs
+++ b/src/ImageSharp/Processing/BackgroundColorExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of a background color to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Binarization/BinaryDiffuseExtensions.cs b/src/ImageSharp/Processing/BinaryDiffuseExtensions.cs
similarity index 96%
rename from src/ImageSharp/Processing/Binarization/BinaryDiffuseExtensions.cs
rename to src/ImageSharp/Processing/BinaryDiffuseExtensions.cs
index a2859b011..788942dde 100644
--- a/src/ImageSharp/Processing/Binarization/BinaryDiffuseExtensions.cs
+++ b/src/ImageSharp/Processing/BinaryDiffuseExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary diffusion extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Binarization/BinaryDitherExtensions.cs b/src/ImageSharp/Processing/BinaryDitherExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Binarization/BinaryDitherExtensions.cs
rename to src/ImageSharp/Processing/BinaryDitherExtensions.cs
index e66be55de..617770196 100644
--- a/src/ImageSharp/Processing/Binarization/BinaryDitherExtensions.cs
+++ b/src/ImageSharp/Processing/BinaryDitherExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary dithering extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Binarization/BinaryThresholdExtensions.cs b/src/ImageSharp/Processing/BinaryThresholdExtensions.cs
similarity index 97%
rename from src/ImageSharp/Processing/Binarization/BinaryThresholdExtensions.cs
rename to src/ImageSharp/Processing/BinaryThresholdExtensions.cs
index 005061394..31f81ba4b 100644
--- a/src/ImageSharp/Processing/Binarization/BinaryThresholdExtensions.cs
+++ b/src/ImageSharp/Processing/BinaryThresholdExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds binary thresholding extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/BlackWhiteExtensions.cs b/src/ImageSharp/Processing/BlackWhiteExtensions.cs
similarity index 93%
rename from src/ImageSharp/Processing/Filters/BlackWhiteExtensions.cs
rename to src/ImageSharp/Processing/BlackWhiteExtensions.cs
index f30cefb86..0484fa84e 100644
--- a/src/ImageSharp/Processing/Filters/BlackWhiteExtensions.cs
+++ b/src/ImageSharp/Processing/BlackWhiteExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of black and white toning to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Convolution/BoxBlurExtensions.cs b/src/ImageSharp/Processing/BoxBlurExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Convolution/BoxBlurExtensions.cs
rename to src/ImageSharp/Processing/BoxBlurExtensions.cs
index edb798fb4..624da239b 100644
--- a/src/ImageSharp/Processing/Convolution/BoxBlurExtensions.cs
+++ b/src/ImageSharp/Processing/BoxBlurExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds box blurring extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/BrightnessExtensions.cs b/src/ImageSharp/Processing/BrightnessExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/BrightnessExtensions.cs
rename to src/ImageSharp/Processing/BrightnessExtensions.cs
index a36d588d5..2f252ad30 100644
--- a/src/ImageSharp/Processing/Filters/BrightnessExtensions.cs
+++ b/src/ImageSharp/Processing/BrightnessExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the brightness component to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs b/src/ImageSharp/Processing/ColorBlindnessExtensions.cs
similarity index 96%
rename from src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs
rename to src/ImageSharp/Processing/ColorBlindnessExtensions.cs
index d70064097..331635895 100644
--- a/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs
+++ b/src/ImageSharp/Processing/ColorBlindnessExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that simulate the effects of various color blindness disorders to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs b/src/ImageSharp/Processing/ColorBlindnessMode.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs
rename to src/ImageSharp/Processing/ColorBlindnessMode.cs
index 584c9fa08..2ff19e77e 100644
--- a/src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs
+++ b/src/ImageSharp/Processing/ColorBlindnessMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined color blindness filters.
diff --git a/src/ImageSharp/Processing/Filters/ContrastExtensions.cs b/src/ImageSharp/Processing/ContrastExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/ContrastExtensions.cs
rename to src/ImageSharp/Processing/ContrastExtensions.cs
index 16225039c..776aa6751 100644
--- a/src/ImageSharp/Processing/Filters/ContrastExtensions.cs
+++ b/src/ImageSharp/Processing/ContrastExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the contrast component to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/CropExtensions.cs b/src/ImageSharp/Processing/CropExtensions.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/CropExtensions.cs
rename to src/ImageSharp/Processing/CropExtensions.cs
index 9e347f51c..34c754a08 100644
--- a/src/ImageSharp/Processing/Transforms/CropExtensions.cs
+++ b/src/ImageSharp/Processing/CropExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of cropping operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Convolution/DetectEdgesExtensions.cs b/src/ImageSharp/Processing/DetectEdgesExtensions.cs
similarity index 98%
rename from src/ImageSharp/Processing/Convolution/DetectEdgesExtensions.cs
rename to src/ImageSharp/Processing/DetectEdgesExtensions.cs
index a2b2b244b..5ac89df29 100644
--- a/src/ImageSharp/Processing/Convolution/DetectEdgesExtensions.cs
+++ b/src/ImageSharp/Processing/DetectEdgesExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds edge detection extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs b/src/ImageSharp/Processing/DiffuseExtensions.cs
similarity index 97%
rename from src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs
rename to src/ImageSharp/Processing/DiffuseExtensions.cs
index adb678ee4..768d28116 100644
--- a/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs
+++ b/src/ImageSharp/Processing/DiffuseExtensions.cs
@@ -2,8 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Dithering
diff --git a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs b/src/ImageSharp/Processing/DitherExtensions.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/DitherExtensions.cs
rename to src/ImageSharp/Processing/DitherExtensions.cs
index 48dd87a3b..795561e70 100644
--- a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
+++ b/src/ImageSharp/Processing/DitherExtensions.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Dithering.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds dithering extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Convolution/EdgeDetectionOperators.cs b/src/ImageSharp/Processing/EdgeDetectionOperators.cs
similarity index 96%
rename from src/ImageSharp/Processing/Convolution/EdgeDetectionOperators.cs
rename to src/ImageSharp/Processing/EdgeDetectionOperators.cs
index 55cbbeaf7..1f3526760 100644
--- a/src/ImageSharp/Processing/Convolution/EdgeDetectionOperators.cs
+++ b/src/ImageSharp/Processing/EdgeDetectionOperators.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined edge detection filters.
diff --git a/src/ImageSharp/Processing/Transforms/EntropyCropExtensions.cs b/src/ImageSharp/Processing/EntropyCropExtensions.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/EntropyCropExtensions.cs
rename to src/ImageSharp/Processing/EntropyCropExtensions.cs
index 3ca4c72bc..157e69ef2 100644
--- a/src/ImageSharp/Processing/Transforms/EntropyCropExtensions.cs
+++ b/src/ImageSharp/Processing/EntropyCropExtensions.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of entropy cropping operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/FilterExtensions.cs b/src/ImageSharp/Processing/FilterExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/FilterExtensions.cs
rename to src/ImageSharp/Processing/FilterExtensions.cs
index ae8bbda03..bfae4ae65 100644
--- a/src/ImageSharp/Processing/Filters/FilterExtensions.cs
+++ b/src/ImageSharp/Processing/FilterExtensions.cs
@@ -3,10 +3,10 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of composable filters to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/FlipExtensions.cs b/src/ImageSharp/Processing/FlipExtensions.cs
similarity index 89%
rename from src/ImageSharp/Processing/Transforms/FlipExtensions.cs
rename to src/ImageSharp/Processing/FlipExtensions.cs
index 0cbbdd95f..dfbff7e4d 100644
--- a/src/ImageSharp/Processing/Transforms/FlipExtensions.cs
+++ b/src/ImageSharp/Processing/FlipExtensions.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of flipping operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/FlipMode.cs b/src/ImageSharp/Processing/FlipMode.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/FlipMode.cs
rename to src/ImageSharp/Processing/FlipMode.cs
index 32c910c80..96cd38de4 100644
--- a/src/ImageSharp/Processing/Transforms/FlipMode.cs
+++ b/src/ImageSharp/Processing/FlipMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides enumeration over how a image should be flipped.
diff --git a/src/ImageSharp/Processing/Convolution/GaussianBlurExtensions.cs b/src/ImageSharp/Processing/GaussianBlurExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Convolution/GaussianBlurExtensions.cs
rename to src/ImageSharp/Processing/GaussianBlurExtensions.cs
index ae3eace64..165c4ce1a 100644
--- a/src/ImageSharp/Processing/Convolution/GaussianBlurExtensions.cs
+++ b/src/ImageSharp/Processing/GaussianBlurExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds Gaussian blurring extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Convolution/GaussianSharpenExtensions.cs b/src/ImageSharp/Processing/GaussianSharpenExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Convolution/GaussianSharpenExtensions.cs
rename to src/ImageSharp/Processing/GaussianSharpenExtensions.cs
index 334a02b79..675bbc142 100644
--- a/src/ImageSharp/Processing/Convolution/GaussianSharpenExtensions.cs
+++ b/src/ImageSharp/Processing/GaussianSharpenExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds Gaussian sharpening extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Overlays/GlowExtensions.cs b/src/ImageSharp/Processing/GlowExtensions.cs
similarity index 98%
rename from src/ImageSharp/Processing/Overlays/GlowExtensions.cs
rename to src/ImageSharp/Processing/GlowExtensions.cs
index 54af9f274..8b6e8ffc2 100644
--- a/src/ImageSharp/Processing/Overlays/GlowExtensions.cs
+++ b/src/ImageSharp/Processing/GlowExtensions.cs
@@ -3,10 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of a radial glow to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/GrayscaleExtensions.cs b/src/ImageSharp/Processing/GrayscaleExtensions.cs
similarity index 98%
rename from src/ImageSharp/Processing/Filters/GrayscaleExtensions.cs
rename to src/ImageSharp/Processing/GrayscaleExtensions.cs
index 34ee4d0f3..9ab664056 100644
--- a/src/ImageSharp/Processing/Filters/GrayscaleExtensions.cs
+++ b/src/ImageSharp/Processing/GrayscaleExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of grayscale toning to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/GrayscaleMode.cs b/src/ImageSharp/Processing/GrayscaleMode.cs
similarity index 89%
rename from src/ImageSharp/Processing/Filters/GrayscaleMode.cs
rename to src/ImageSharp/Processing/GrayscaleMode.cs
index db30e67ff..e42a2e633 100644
--- a/src/ImageSharp/Processing/Filters/GrayscaleMode.cs
+++ b/src/ImageSharp/Processing/GrayscaleMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various types of defined grayscale filters.
diff --git a/src/ImageSharp/Processing/HistogramEqualizationExtension.cs b/src/ImageSharp/Processing/HistogramEqualizationExtension.cs
new file mode 100644
index 000000000..8dabfcc05
--- /dev/null
+++ b/src/ImageSharp/Processing/HistogramEqualizationExtension.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Processors.Normalization;
+
+namespace SixLabors.ImageSharp.Processing
+{
+    /// <summary>
+    /// Adds extension that allow the adjustment of the contrast of an image via its histogram.
+    /// </summary>
+    public static class HistogramEqualizationExtension
+    {
+        /// <summary>
+        /// Equalizes the histogram of an image to increases the global contrast using 65536 luminance levels.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="source">The image this method extends.</param>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static IImageProcessingContext<TPixel> HistogramEqualization<TPixel>(this IImageProcessingContext<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
+            => HistogramEqualization(source, 65536);
+
+        /// <summary>
+        /// Equalizes the histogram of an image to increases the global contrast.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="luminanceLevels">The number of different luminance levels. Typical values are 256 for 8-bit grayscale images
+        /// or 65536 for 16-bit grayscale images.</param>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static IImageProcessingContext<TPixel> HistogramEqualization<TPixel>(this IImageProcessingContext<TPixel> source, int luminanceLevels)
+            where TPixel : struct, IPixel<TPixel>
+            => source.ApplyProcessor(new HistogramEqualizationProcessor<TPixel>(luminanceLevels));
+    }
+}
diff --git a/src/ImageSharp/Processing/Filters/HueExtensions.cs b/src/ImageSharp/Processing/HueExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/HueExtensions.cs
rename to src/ImageSharp/Processing/HueExtensions.cs
index 1b730d7f0..246d4bf2b 100644
--- a/src/ImageSharp/Processing/Filters/HueExtensions.cs
+++ b/src/ImageSharp/Processing/HueExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the hue component to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/InvertExtensions.cs b/src/ImageSharp/Processing/InvertExtensions.cs
similarity index 93%
rename from src/ImageSharp/Processing/Filters/InvertExtensions.cs
rename to src/ImageSharp/Processing/InvertExtensions.cs
index 784b37c56..9e031bc95 100644
--- a/src/ImageSharp/Processing/Filters/InvertExtensions.cs
+++ b/src/ImageSharp/Processing/InvertExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the inversion of colors to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Dithering/KnownDiffusers.cs b/src/ImageSharp/Processing/KnownDiffusers.cs
similarity index 94%
rename from src/ImageSharp/Processing/Dithering/KnownDiffusers.cs
rename to src/ImageSharp/Processing/KnownDiffusers.cs
index 250a543ec..2b10312fe 100644
--- a/src/ImageSharp/Processing/Dithering/KnownDiffusers.cs
+++ b/src/ImageSharp/Processing/KnownDiffusers.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known error diffusion algorithms
diff --git a/src/ImageSharp/Processing/Dithering/KnownDitherers.cs b/src/ImageSharp/Processing/KnownDitherers.cs
similarity index 88%
rename from src/ImageSharp/Processing/Dithering/KnownDitherers.cs
rename to src/ImageSharp/Processing/KnownDitherers.cs
index b268ae12c..dad5bb38c 100644
--- a/src/ImageSharp/Processing/Dithering/KnownDitherers.cs
+++ b/src/ImageSharp/Processing/KnownDitherers.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Dithering
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known ordered dither matrices
     /// </summary>
-    public class KnownDitherers
+    public static class KnownDitherers
     {
         /// <summary>
         /// Gets the order ditherer using the 2x2 Bayer dithering matrix
diff --git a/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs b/src/ImageSharp/Processing/KnownFilterMatrices.cs
similarity index 99%
rename from src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
rename to src/ImageSharp/Processing/KnownFilterMatrices.cs
index 9da4aaa65..4f5e3c869 100644
--- a/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
+++ b/src/ImageSharp/Processing/KnownFilterMatrices.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// A collection of known <see cref="Matrix4x4"/> values for composing filters
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
         public static Matrix4x4 CreateHueFilter(float degrees)
         {
             // Wrap the angle round at 360.
-            degrees = degrees % 360;
+            degrees %= 360;
 
             // Make sure it's not negative.
             while (degrees < 0)
diff --git a/src/ImageSharp/Processing/Quantization/KnownQuantizers.cs b/src/ImageSharp/Processing/KnownQuantizers.cs
similarity index 90%
rename from src/ImageSharp/Processing/Quantization/KnownQuantizers.cs
rename to src/ImageSharp/Processing/KnownQuantizers.cs
index 357cd5676..fe9806310 100644
--- a/src/ImageSharp/Processing/Quantization/KnownQuantizers.cs
+++ b/src/ImageSharp/Processing/KnownQuantizers.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
+
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known quantizing algorithms
diff --git a/src/ImageSharp/Processing/Transforms/KnownResamplers.cs b/src/ImageSharp/Processing/KnownResamplers.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/KnownResamplers.cs
rename to src/ImageSharp/Processing/KnownResamplers.cs
index 2b589d461..70a413ec0 100644
--- a/src/ImageSharp/Processing/Transforms/KnownResamplers.cs
+++ b/src/ImageSharp/Processing/KnownResamplers.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Contains reusable static instances of known resampling algorithms
diff --git a/src/ImageSharp/Processing/Filters/KodachromeExtensions.cs b/src/ImageSharp/Processing/KodachromeExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/KodachromeExtensions.cs
rename to src/ImageSharp/Processing/KodachromeExtensions.cs
index 94f1acc0c..e438b131e 100644
--- a/src/ImageSharp/Processing/Filters/KodachromeExtensions.cs
+++ b/src/ImageSharp/Processing/KodachromeExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Kodachrome camera effect to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/LomographExtensions.cs b/src/ImageSharp/Processing/LomographExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/LomographExtensions.cs
rename to src/ImageSharp/Processing/LomographExtensions.cs
index ed9e1cc29..7dff16402 100644
--- a/src/ImageSharp/Processing/Filters/LomographExtensions.cs
+++ b/src/ImageSharp/Processing/LomographExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Lomograph camera effect to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Effects/OilPaintExtensions.cs b/src/ImageSharp/Processing/OilPaintExtensions.cs
similarity index 97%
rename from src/ImageSharp/Processing/Effects/OilPaintExtensions.cs
rename to src/ImageSharp/Processing/OilPaintExtensions.cs
index a04bbec4e..b6fa4149a 100644
--- a/src/ImageSharp/Processing/Effects/OilPaintExtensions.cs
+++ b/src/ImageSharp/Processing/OilPaintExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds oil painting effect extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/OpacityExtensions.cs b/src/ImageSharp/Processing/OpacityExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/OpacityExtensions.cs
rename to src/ImageSharp/Processing/OpacityExtensions.cs
index e263fef4e..fc3fd331d 100644
--- a/src/ImageSharp/Processing/Filters/OpacityExtensions.cs
+++ b/src/ImageSharp/Processing/OpacityExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the opacity component to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/OrientationMode.cs b/src/ImageSharp/Processing/OrientationMode.cs
similarity index 96%
rename from src/ImageSharp/Processing/Transforms/OrientationMode.cs
rename to src/ImageSharp/Processing/OrientationMode.cs
index c6f05380b..ba55425b8 100644
--- a/src/ImageSharp/Processing/Transforms/OrientationMode.cs
+++ b/src/ImageSharp/Processing/OrientationMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the available orientation values supplied by EXIF metadata.
diff --git a/src/ImageSharp/Processing/Transforms/PadExtensions.cs b/src/ImageSharp/Processing/PadExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Transforms/PadExtensions.cs
rename to src/ImageSharp/Processing/PadExtensions.cs
index a231088dd..f73033968 100644
--- a/src/ImageSharp/Processing/Transforms/PadExtensions.cs
+++ b/src/ImageSharp/Processing/PadExtensions.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of padding operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Effects/PixelateExtensions.cs b/src/ImageSharp/Processing/PixelateExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Effects/PixelateExtensions.cs
rename to src/ImageSharp/Processing/PixelateExtensions.cs
index d6fcfe6f1..4507f6392 100644
--- a/src/ImageSharp/Processing/Effects/PixelateExtensions.cs
+++ b/src/ImageSharp/Processing/PixelateExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds pixelation effect extensions to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/PolaroidExtensions.cs b/src/ImageSharp/Processing/PolaroidExtensions.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/PolaroidExtensions.cs
rename to src/ImageSharp/Processing/PolaroidExtensions.cs
index 37f06f9cf..5d4beee22 100644
--- a/src/ImageSharp/Processing/Filters/PolaroidExtensions.cs
+++ b/src/ImageSharp/Processing/PolaroidExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the recreation of an old Polaroid camera effect to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryErrorDiffusionProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
rename to src/ImageSharp/Processing/Processors/Binarization/BinaryErrorDiffusionProcessor.cs
index 64763b657..5041dcf5a 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryErrorDiffusionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/BinaryErrorDiffusionProcessor.cs
@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs binary threshold filtering against an image using error diffusion.
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs
similarity index 95%
rename from src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
rename to src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs
index 3fe56ff44..95f4ef472 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryOrderedDitherProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/BinaryOrderedDitherProcessor.cs
@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs binary threshold filtering against an image using ordered dithering.
diff --git a/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
rename to src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
index dc1297d6f..57d4e00ae 100644
--- a/src/ImageSharp/Processing/Binarization/Processors/BinaryThresholdProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Binarization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Binarization
 {
     /// <summary>
     /// Performs simple binary threshold filtering against an image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/BoxBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Convolution/Processors/BoxBlurProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
index 886fb5d75..0ec62ac3d 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/BoxBlurProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
@@ -3,10 +3,9 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies box blur processing to the image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
index 48503e999..57f71a9ce 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/Convolution2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
@@ -7,11 +7,10 @@ using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses two one-dimensional matrices to perform convolution against an image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
index 4e14882ff..6d7147cf7 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
@@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses two one-dimensional matrices to perform two-pass convolution against an image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
index 221cf19ec..84a166545 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/ConvolutionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
@@ -11,7 +11,7 @@ using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that uses a 2 dimensional matrix to perform convolution against an image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetector2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetector2DProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Convolution/Processors/EdgeDetector2DProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetector2DProcessor.cs
index c3530647a..dd43d3e15 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetector2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetector2DProcessor.cs
@@ -3,11 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using two one-dimensional matrices.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorCompassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorCompassProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorCompassProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorCompassProcessor.cs
index b78145089..22297b8f2 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorCompassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorCompassProcessor.cs
@@ -8,12 +8,11 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using a eight two dimensional matrices.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorProcessor.cs
similarity index 91%
rename from src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorProcessor.cs
index e0ca83828..9173bc229 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/EdgeDetectorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetectorProcessor.cs
@@ -3,11 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Defines a processor that detects edges within an image using a single two dimensional matrix.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/GaussianBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Convolution/Processors/GaussianBlurProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
index 6f33e23ec..3045b9993 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/GaussianBlurProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies Gaussian blur processing to the image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/GaussianSharpenProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Convolution/Processors/GaussianSharpenProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
index 5f296e29e..18963c73c 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/GaussianSharpenProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
@@ -4,10 +4,9 @@
 using System;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies Gaussian sharpening processing to the image.
@@ -160,14 +159,14 @@ namespace SixLabors.ImageSharp.Processing.Convolution.Processors
             {
                 for (int i = 0; i < size; i++)
                 {
-                    kernel[0, i] = kernel[0, i] / sum;
+                    kernel[0, i] /= sum;
                 }
             }
             else
             {
                 for (int i = 0; i < size; i++)
                 {
-                    kernel[i, 0] = kernel[i, 0] / sum;
+                    kernel[i, 0] /= sum;
                 }
             }
 
diff --git a/src/ImageSharp/Processing/Convolution/Processors/IEdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/IEdgeDetectorProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/IEdgeDetectorProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/IEdgeDetectorProcessor.cs
index 486929e02..b2ecbf115 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/IEdgeDetectorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/IEdgeDetectorProcessor.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Provides properties and methods allowing the detection of edges within an image.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/KayyaliKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/KayyaliKernels.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/KayyaliKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/KayyaliKernels.cs
index e131cac38..dd4d02302 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/KayyaliKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/KayyaliKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Kayyali edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/KayyaliProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/KayyaliProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/KayyaliProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/KayyaliProcessor.cs
index 357c6c397..8652efa12 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/KayyaliProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/KayyaliProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Kayyali operator filter. <see href="http://edgedetection.webs.com/"/>
diff --git a/src/ImageSharp/Processing/Convolution/Processors/KirschProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/KirschProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Convolution/Processors/KirschProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/KirschProcessor.cs
index c9a21da0b..46cf00c22 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/KirschProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/KirschProcessor.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Kirsch operator filter. <see href="http://en.wikipedia.org/wiki/Kirsch_operator"/>
diff --git a/src/ImageSharp/Processing/Convolution/Processors/KirshKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/KirshKernels.cs
similarity index 97%
rename from src/ImageSharp/Processing/Convolution/Processors/KirshKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/KirshKernels.cs
index 8e52f8df4..d31587508 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/KirshKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/KirshKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the eight matrices used for Kirsh edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/Laplacian3x3Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/Laplacian3x3Processor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/Laplacian3x3Processor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/Laplacian3x3Processor.cs
index 657a93c81..f498d374c 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/Laplacian3x3Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Laplacian3x3Processor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Laplacian 3x3 operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/Laplacian5x5Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/Laplacian5x5Processor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/Laplacian5x5Processor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/Laplacian5x5Processor.cs
index 5b44773ad..558acf7b3 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/Laplacian5x5Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Laplacian5x5Processor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Laplacian 5x5 operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/LaplacianKernelFactory.cs b/src/ImageSharp/Processing/Processors/Convolution/LaplacianKernelFactory.cs
similarity index 94%
rename from src/ImageSharp/Processing/Convolution/Processors/LaplacianKernelFactory.cs
rename to src/ImageSharp/Processing/Processors/Convolution/LaplacianKernelFactory.cs
index 053033432..19f2d1161 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/LaplacianKernelFactory.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/LaplacianKernelFactory.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// A factory for creating Laplacian kernel matrices.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/LaplacianKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/LaplacianKernels.cs
similarity index 94%
rename from src/ImageSharp/Processing/Convolution/Processors/LaplacianKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/LaplacianKernels.cs
index 407736980..e7b7f965b 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/LaplacianKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/LaplacianKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains Laplacian kernels of different sizes
diff --git a/src/ImageSharp/Processing/Convolution/Processors/LaplacianOfGaussianProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/LaplacianOfGaussianProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/LaplacianOfGaussianProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/LaplacianOfGaussianProcessor.cs
index e65e0d215..6cc65dc58 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/LaplacianOfGaussianProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/LaplacianOfGaussianProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Laplacian of Gaussian operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/PrewittKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/PrewittKernels.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/PrewittKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/PrewittKernels.cs
index aba4d52c3..381e028d4 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/PrewittKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/PrewittKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Prewitt edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/PrewittProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/PrewittProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/PrewittProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/PrewittProcessor.cs
index 5683d6f60..75ef4dac6 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/PrewittProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/PrewittProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Prewitt operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/RobertsCrossKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/RobertsCrossKernels.cs
similarity index 92%
rename from src/ImageSharp/Processing/Convolution/Processors/RobertsCrossKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/RobertsCrossKernels.cs
index 64d1fcea5..f61220e1e 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/RobertsCrossKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/RobertsCrossKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for RobertsCross edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/RobertsCrossProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/RobertsCrossProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/RobertsCrossProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/RobertsCrossProcessor.cs
index 38d1fffc9..d685860f6 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/RobertsCrossProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/RobertsCrossProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Roberts Cross operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/RobinsonKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/RobinsonKernels.cs
similarity index 97%
rename from src/ImageSharp/Processing/Convolution/Processors/RobinsonKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/RobinsonKernels.cs
index 9d440fcc0..4f47184e3 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/RobinsonKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/RobinsonKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Robinson edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/RobinsonProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/RobinsonProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Convolution/Processors/RobinsonProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/RobinsonProcessor.cs
index f129b1daa..193c1008d 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/RobinsonProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/RobinsonProcessor.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Robinson operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/ScharrKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/ScharrKernels.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/ScharrKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/ScharrKernels.cs
index c309e4cec..f0662c667 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/ScharrKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ScharrKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Scharr edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/ScharrProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ScharrProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/ScharrProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/ScharrProcessor.cs
index c101d092d..79fc0e79f 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/ScharrProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ScharrProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Applies edge detection processing to the image using the Scharr operator filter.
diff --git a/src/ImageSharp/Processing/Convolution/Processors/SobelKernels.cs b/src/ImageSharp/Processing/Processors/Convolution/SobelKernels.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/SobelKernels.cs
rename to src/ImageSharp/Processing/Processors/Convolution/SobelKernels.cs
index 626226c66..113957c83 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/SobelKernels.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/SobelKernels.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// Contains the kernels used for Sobel edge detection
diff --git a/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/SobelProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs
rename to src/ImageSharp/Processing/Processors/Convolution/SobelProcessor.cs
index 9fb9c56c4..3ca53f6f0 100644
--- a/src/ImageSharp/Processing/Convolution/Processors/SobelProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/SobelProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Convolution
 {
     /// <summary>
     /// The Sobel operator filter.
diff --git a/src/ImageSharp/Processing/Processors/DelegateProcessor.cs b/src/ImageSharp/Processing/Processors/DelegateProcessor.cs
index 2ff00d583..7a9753d1a 100644
--- a/src/ImageSharp/Processing/Processors/DelegateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/DelegateProcessor.cs
@@ -14,26 +14,24 @@ namespace SixLabors.ImageSharp.Processing.Processors
     internal class DelegateProcessor<TPixel> : ImageProcessor<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private readonly Action<Image<TPixel>> action;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="DelegateProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="action">The action.</param>
         public DelegateProcessor(Action<Image<TPixel>> action)
         {
-            this.action = action;
+            this.Action = action;
         }
 
         /// <summary>
         /// Gets the action that will be applied to the image.
         /// </summary>
-        internal Action<Image<TPixel>> Action => this.action;
+        internal Action<Image<TPixel>> Action { get; }
 
         /// <inheritdoc/>
         protected override void BeforeImageApply(Image<TPixel> source, Rectangle sourceRectangle)
         {
-            this.action?.Invoke(source);
+            this.Action?.Invoke(source);
         }
 
         /// <inheritdoc/>
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/AtkinsonDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/AtkinsonDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/AtkinsonDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/AtkinsonDiffuser.cs
index 2b13980fc..17c97ddc9 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/AtkinsonDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/AtkinsonDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Atkinson image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither2x2.cs b/src/ImageSharp/Processing/Processors/Dithering/BayerDither2x2.cs
similarity index 88%
rename from src/ImageSharp/Processing/Dithering/Ordered/BayerDither2x2.cs
rename to src/ImageSharp/Processing/Processors/Dithering/BayerDither2x2.cs
index 2d674787a..b7fdfbfe5 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither2x2.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/BayerDither2x2.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies order dithering using the 2x2 Bayer dithering matrix.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither4x4.cs b/src/ImageSharp/Processing/Processors/Dithering/BayerDither4x4.cs
similarity index 88%
rename from src/ImageSharp/Processing/Dithering/Ordered/BayerDither4x4.cs
rename to src/ImageSharp/Processing/Processors/Dithering/BayerDither4x4.cs
index edc57441a..4f6d5dd07 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither4x4.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/BayerDither4x4.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies order dithering using the 4x4 Bayer dithering matrix.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither8x8.cs b/src/ImageSharp/Processing/Processors/Dithering/BayerDither8x8.cs
similarity index 88%
rename from src/ImageSharp/Processing/Dithering/Ordered/BayerDither8x8.cs
rename to src/ImageSharp/Processing/Processors/Dithering/BayerDither8x8.cs
index b79216208..8d0c23aa3 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/BayerDither8x8.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/BayerDither8x8.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies order dithering using the 8x8 Bayer dithering matrix.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/BurksDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/BurksDiffuser.cs
similarity index 92%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/BurksDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/BurksDiffuser.cs
index b4b439c9a..84455b24a 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/BurksDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/BurksDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Burks image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/DHALF.TXT b/src/ImageSharp/Processing/Processors/Dithering/DHALF.TXT
similarity index 100%
rename from src/ImageSharp/Processing/Dithering/DHALF.TXT
rename to src/ImageSharp/Processing/Processors/Dithering/DHALF.TXT
diff --git a/src/ImageSharp/Processing/Dithering/DITHER.TXT b/src/ImageSharp/Processing/Processors/Dithering/DITHER.TXT
similarity index 100%
rename from src/ImageSharp/Processing/Dithering/DITHER.TXT
rename to src/ImageSharp/Processing/Processors/Dithering/DITHER.TXT
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/ErrorDiffuserBase.cs b/src/ImageSharp/Processing/Processors/Dithering/ErrorDiffuserBase.cs
similarity index 98%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/ErrorDiffuserBase.cs
rename to src/ImageSharp/Processing/Processors/Dithering/ErrorDiffuserBase.cs
index 80b3698a6..b407841f2 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/ErrorDiffuserBase.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/ErrorDiffuserBase.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// The base class for performing error diffusion based dithering.
diff --git a/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs b/src/ImageSharp/Processing/Processors/Dithering/ErrorDiffusionPaletteProcessor.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
rename to src/ImageSharp/Processing/Processors/Dithering/ErrorDiffusionPaletteProcessor.cs
index 19fde8487..8e2b2a5a8 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/ErrorDiffusionPaletteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/ErrorDiffusionPaletteProcessor.cs
@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> that dithers an image using error diffusion.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/FloydSteinbergDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/FloydSteinbergDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/FloydSteinbergDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/FloydSteinbergDiffuser.cs
index 290d77864..6a7655b59 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/FloydSteinbergDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/FloydSteinbergDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Floyd–Steinberg image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/IErrorDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/IErrorDiffuser.cs
similarity index 94%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/IErrorDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/IErrorDiffuser.cs
index 795aa6506..5b30c0dc4 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/IErrorDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/IErrorDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Encapsulates properties and methods required to perform diffused error dithering on an image.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/IOrderedDither.cs b/src/ImageSharp/Processing/Processors/Dithering/IOrderedDither.cs
similarity index 95%
rename from src/ImageSharp/Processing/Dithering/Ordered/IOrderedDither.cs
rename to src/ImageSharp/Processing/Processors/Dithering/IOrderedDither.cs
index 29b96ab45..571929b99 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/IOrderedDither.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/IOrderedDither.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Encapsulates properties and methods required to perform ordered dithering on an image.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/JarvisJudiceNinkeDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/JarvisJudiceNinkeDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/JarvisJudiceNinkeDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/JarvisJudiceNinkeDiffuser.cs
index 816447ec9..a69557d6d 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/JarvisJudiceNinkeDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/JarvisJudiceNinkeDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the JarvisJudiceNinke image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDither.cs b/src/ImageSharp/Processing/Processors/Dithering/OrderedDither.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/Ordered/OrderedDither.cs
rename to src/ImageSharp/Processing/Processors/Dithering/OrderedDither.cs
index 9fd274ab7..174732f80 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDither.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/OrderedDither.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// An ordered dithering matrix with equal sides of arbitrary length
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDither3x3.cs b/src/ImageSharp/Processing/Processors/Dithering/OrderedDither3x3.cs
similarity index 88%
rename from src/ImageSharp/Processing/Dithering/Ordered/OrderedDither3x3.cs
rename to src/ImageSharp/Processing/Processors/Dithering/OrderedDither3x3.cs
index dd20817cf..93bce0578 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDither3x3.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/OrderedDither3x3.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies order dithering using the 3x3 dithering matrix.
diff --git a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDitherFactory.cs b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherFactory.cs
similarity index 98%
rename from src/ImageSharp/Processing/Dithering/Ordered/OrderedDitherFactory.cs
rename to src/ImageSharp/Processing/Processors/Dithering/OrderedDitherFactory.cs
index 7538aa50e..4b93c4259 100644
--- a/src/ImageSharp/Processing/Dithering/Ordered/OrderedDitherFactory.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherFactory.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Ordered
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// A factory for creating ordered dither matrices.
diff --git a/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs
similarity index 95%
rename from src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
rename to src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs
index 32a3d290e..4100fef8c 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/OrderedDitherPaletteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/OrderedDitherPaletteProcessor.cs
@@ -4,11 +4,10 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> that dithers an image using error diffusion.
diff --git a/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs b/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
rename to src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs
index 0e801e583..e70c8acd2 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/PaletteDitherProcessorBase.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/PaletteDitherProcessorBase.cs
@@ -5,9 +5,8 @@ using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// The base class for dither and diffusion processors that consume a palette.
diff --git a/src/ImageSharp/Processing/Dithering/Processors/PixelPair.cs b/src/ImageSharp/Processing/Processors/Dithering/PixelPair.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/Processors/PixelPair.cs
rename to src/ImageSharp/Processing/Processors/Dithering/PixelPair.cs
index 127c0be6d..b7bea2c74 100644
--- a/src/ImageSharp/Processing/Dithering/Processors/PixelPair.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/PixelPair.cs
@@ -4,7 +4,7 @@
 using System;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Represents a composite pair of pixels. Used for caching color distance lookups.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra2Diffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/Sierra2Diffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra2Diffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/Sierra2Diffuser.cs
index 0b7e13c84..ebde2ceaf 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra2Diffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/Sierra2Diffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Sierra2 image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra3Diffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/Sierra3Diffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra3Diffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/Sierra3Diffuser.cs
index 937b3a8cb..144a83a82 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/Sierra3Diffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/Sierra3Diffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Sierra3 image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/SierraLiteDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/SierraLiteDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/SierraLiteDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/SierraLiteDiffuser.cs
index c9594e9e2..d71fba9f2 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/SierraLiteDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/SierraLiteDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the SierraLite image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/StevensonArceDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/StevensonArceDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/StevensonArceDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/StevensonArceDiffuser.cs
index 749502a03..4b1323065 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/StevensonArceDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/StevensonArceDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Stevenson-Arce image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/StuckiDiffuser.cs b/src/ImageSharp/Processing/Processors/Dithering/StuckiDiffuser.cs
similarity index 93%
rename from src/ImageSharp/Processing/Dithering/ErrorDiffusion/StuckiDiffuser.cs
rename to src/ImageSharp/Processing/Processors/Dithering/StuckiDiffuser.cs
index 077c02cbd..1dd510a5e 100644
--- a/src/ImageSharp/Processing/Dithering/ErrorDiffusion/StuckiDiffuser.cs
+++ b/src/ImageSharp/Processing/Processors/Dithering/StuckiDiffuser.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion
+namespace SixLabors.ImageSharp.Processing.Processors.Dithering
 {
     /// <summary>
     /// Applies error diffusion based dithering using the Stucki image dithering algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/error_diffusion.txt b/src/ImageSharp/Processing/Processors/Dithering/error_diffusion.txt
similarity index 100%
rename from src/ImageSharp/Processing/Dithering/error_diffusion.txt
rename to src/ImageSharp/Processing/Processors/Dithering/error_diffusion.txt
diff --git a/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs
rename to src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
index cdaa6113f..b9329f4df 100644
--- a/src/ImageSharp/Processing/Effects/Processors/OilPaintingProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
@@ -6,11 +6,10 @@ using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Effects
 {
     /// <summary>
     /// Applies oil painting effect processing to the image.
@@ -112,7 +111,7 @@ namespace SixLabors.ImageSharp.Processing.Effects.Processors
 
                                     int currentIntensity = (int)MathF.Round((sourceBlue + sourceGreen + sourceRed) / 3F * (levels - 1));
 
-                                    intensityBin[currentIntensity] += 1;
+                                    intensityBin[currentIntensity]++;
                                     blueBin[currentIntensity] += sourceBlue;
                                     greenBin[currentIntensity] += sourceGreen;
                                     redBin[currentIntensity] += sourceRed;
diff --git a/src/ImageSharp/Processing/Effects/Processors/PixelateProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Effects/Processors/PixelateProcessor.cs
rename to src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
index d45d2093f..56085e76c 100644
--- a/src/ImageSharp/Processing/Effects/Processors/PixelateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
@@ -7,10 +7,9 @@ using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Common;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Effects.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Effects
 {
     /// <summary>
     /// Applies a pixelation effect processing to the image.
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/AchromatomalyProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/AchromatomalyProcessor.cs
index e7238c68c..57c1bad39 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/AchromatomalyProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Achromatomaly (Color desensitivity) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/AchromatopsiaProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/AchromatopsiaProcessor.cs
index b581f8925..696a854ab 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/AchromatopsiaProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Achromatopsia (Monochrome) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
similarity index 91%
rename from src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
index 428b9d4dd..9925ce5c2 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/BlackWhiteProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a black and white filter matrix to the image
diff --git a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/BrightnessProcessor.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/BrightnessProcessor.cs
index e5c43bd8a..b1b8ad747 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/BrightnessProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a brightness filter matrix using the given amount.
diff --git a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/ContrastProcessor.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/ContrastProcessor.cs
index 51f8ba6b1..ebec464d5 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/ContrastProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a contrast filter matrix using the given amount.
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/DeuteranomalyProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/DeuteranomalyProcessor.cs
index d93068c8c..0d1b1da90 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/DeuteranomalyProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Deuteranomaly (Green-Weak) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/DeuteranopiaProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/DeuteranopiaProcessor.cs
index 4b57a1fa4..ae0727048 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/DeuteranopiaProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Deuteranopia (Green-Blind) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/FilterProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/Processors/FilterProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs
index 18163b754..e8a1fc9cb 100644
--- a/src/ImageSharp/Processing/Filters/Processors/FilterProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/FilterProcessor.cs
@@ -6,10 +6,9 @@ using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Provides methods that accept a <see cref="Matrix4x4"/> matrix to apply free-form filters to images.
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt601Processor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
rename to src/ImageSharp/Processing/Processors/Filters/GrayscaleBt601Processor.cs
index b4ea8ac6b..c933d4858 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt601Processor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a grayscale filter matrix using the given amount and the formula as specified by ITU-R Recommendation BT.601
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
rename to src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs
index 480b134d3..1716773b4 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/GrayscaleBt709Processor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a grayscale filter matrix using the given amount and the formula as specified by ITU-R Recommendation BT.709
diff --git a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/HueProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/HueProcessor.cs
index 95ae98e78..4c3a0c73e 100644
--- a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/HueProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a hue filter matrix using the given angle of rotation in degrees
diff --git a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/InvertProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/InvertProcessor.cs
index 7b8ed2a03..462c42070 100644
--- a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/InvertProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a filter matrix that inverts the colors of an image
diff --git a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/KodachromeProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/KodachromeProcessor.cs
index cc3fa42f6..003766e8a 100644
--- a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/KodachromeProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a filter matrix recreating an old Kodachrome camera effect matrix to the image
diff --git a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs
similarity index 90%
rename from src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs
index d97bf57dd..737ebf618 100644
--- a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/LomographProcessor.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating an old Lomograph effect.
diff --git a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/OpacityProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/OpacityProcessor.cs
index f50d27ae0..0fea61cad 100644
--- a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/OpacityProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies an opacity filter matrix using the given amount.
diff --git a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
similarity index 91%
rename from src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
index b6aa56223..fb065ac17 100644
--- a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/PolaroidProcessor.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating an old Polaroid effect.
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/ProtanomalyProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/ProtanomalyProcessor.cs
index 88e2ee3c3..79eb70851 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/ProtanomalyProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Protanomaly (Red-Weak) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/ProtanopiaProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/ProtanopiaProcessor.cs
index 17020bbe2..c6a01439a 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/ProtanopiaProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Protanopia (Red-Blind) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/README.md b/src/ImageSharp/Processing/Processors/Filters/README.md
similarity index 100%
rename from src/ImageSharp/Processing/Filters/Processors/README.md
rename to src/ImageSharp/Processing/Processors/Filters/README.md
diff --git a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/SaturateProcessor.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/SaturateProcessor.cs
index d4b28a894..75e956071 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/SaturateProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a saturation filter matrix using the given amount.
diff --git a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/SepiaProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/SepiaProcessor.cs
index 7295cee99..2009dccd5 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/SepiaProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Applies a sepia filter matrix using the given amount.
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/TritanomalyProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/TritanomalyProcessor.cs
index 6991506e6..593f7f5b0 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/TritanomalyProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Tritanomaly (Blue-Weak) color blindness.
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/Filters/TritanopiaProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
rename to src/ImageSharp/Processing/Processors/Filters/TritanopiaProcessor.cs
index 95c6cb542..153ad5559 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Filters/TritanopiaProcessor.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Filters.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Filters
 {
     /// <summary>
     /// Converts the colors of the image recreating Tritanopia (Blue-Blind) color blindness.
diff --git a/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs b/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs
new file mode 100644
index 000000000..7b6209c30
--- /dev/null
+++ b/src/ImageSharp/Processing/Processors/Normalization/HistogramEqualizationProcessor.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.Primitives;
+
+namespace SixLabors.ImageSharp.Processing.Processors.Normalization
+{
+    /// <summary>
+    /// Applies a global histogram equalization to the image.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class HistogramEqualizationProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HistogramEqualizationProcessor{TPixel}"/> class.
+        /// </summary>
+        /// <param name="luminanceLevels">The number of different luminance levels. Typical values are 256 for 8-bit grayscale images
+        /// or 65536 for 16-bit grayscale images.</param>
+        public HistogramEqualizationProcessor(int luminanceLevels)
+        {
+            Guard.MustBeGreaterThan(luminanceLevels, 0, nameof(luminanceLevels));
+
+            this.LuminanceLevels = luminanceLevels;
+        }
+
+        /// <summary>
+        /// Gets the number of luminance levels.
+        /// </summary>
+        public int LuminanceLevels { get; }
+
+        /// <inheritdoc/>
+        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
+        {
+            MemoryAllocator memoryAllocator = configuration.MemoryAllocator;
+            int numberOfPixels = source.Width * source.Height;
+            Span<TPixel> pixels = source.GetPixelSpan();
+
+            // Build the histogram of the grayscale levels.
+            using (IMemoryOwner<int> histogramBuffer = memoryAllocator.Allocate<int>(this.LuminanceLevels, AllocationOptions.Clean))
+            using (IMemoryOwner<int> cdfBuffer = memoryAllocator.Allocate<int>(this.LuminanceLevels, AllocationOptions.Clean))
+            {
+                Span<int> histogram = histogramBuffer.GetSpan();
+                for (int i = 0; i < pixels.Length; i++)
+                {
+                    TPixel sourcePixel = pixels[i];
+                    int luminance = this.GetLuminance(sourcePixel, this.LuminanceLevels);
+                    histogram[luminance]++;
+                }
+
+                // Calculate the cumulative distribution function, which will map each input pixel to a new value.
+                Span<int> cdf = cdfBuffer.GetSpan();
+                int cdfMin = this.CalculateCdf(cdf, histogram);
+
+                // Apply the cdf to each pixel of the image
+                float numberOfPixelsMinusCdfMin = numberOfPixels - cdfMin;
+                for (int i = 0; i < pixels.Length; i++)
+                {
+                    TPixel sourcePixel = pixels[i];
+
+                    int luminance = this.GetLuminance(sourcePixel, this.LuminanceLevels);
+                    float luminanceEqualized = cdf[luminance] / numberOfPixelsMinusCdfMin;
+
+                    pixels[i].PackFromVector4(new Vector4(luminanceEqualized));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calculates the cumulative distribution function.
+        /// </summary>
+        /// <param name="cdf">The array holding the cdf.</param>
+        /// <param name="histogram">The histogram of the input image.</param>
+        /// <returns>The first none zero value of the cdf.</returns>
+        private int CalculateCdf(Span<int> cdf, Span<int> histogram)
+        {
+            // Calculate the cumulative histogram
+            int histSum = 0;
+            for (int i = 0; i < histogram.Length; i++)
+            {
+                histSum += histogram[i];
+                cdf[i] = histSum;
+            }
+
+            // Get the first none zero value of the cumulative histogram
+            int cdfMin = 0;
+            for (int i = 0; i < histogram.Length; i++)
+            {
+                if (cdf[i] != 0)
+                {
+                    cdfMin = cdf[i];
+                    break;
+                }
+            }
+
+            // Creating the lookup table: subtracting cdf min, so we do not need to do that inside the for loop
+            for (int i = 0; i < histogram.Length; i++)
+            {
+                cdf[i] = Math.Max(0, cdf[i] - cdfMin);
+            }
+
+            return cdfMin;
+        }
+
+        /// <summary>
+        /// Convert the pixel values to grayscale using ITU-R Recommendation BT.709.
+        /// </summary>
+        /// <param name="sourcePixel">The pixel to get the luminance from</param>
+        /// <param name="luminanceLevels">The number of luminance levels (256 for 8 bit, 65536 for 16 bit grayscale images)</param>
+        [MethodImpl(InliningOptions.ShortMethod)]
+        private int GetLuminance(TPixel sourcePixel, int luminanceLevels)
+        {
+            // Convert to grayscale using ITU-R Recommendation BT.709
+            var vector = sourcePixel.ToVector4();
+            int luminance = Convert.ToInt32(((.2126F * vector.X) + (.7152F * vector.Y) + (.0722F * vector.Y)) * (luminanceLevels - 1));
+
+            return luminance;
+        }
+    }
+}
diff --git a/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/BackgroundColorProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs
rename to src/ImageSharp/Processing/Processors/Overlays/BackgroundColorProcessor.cs
index cc7e2ad8b..d2e89fcd0 100644
--- a/src/ImageSharp/Processing/Overlays/Processors/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/BackgroundColorProcessor.cs
@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Overlays
 {
     /// <summary>
     /// Sets the background color of the image.
@@ -66,8 +66,8 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
 
             int width = maxX - minX;
 
-            using (IBuffer<TPixel> colors = source.MemoryAllocator.Allocate<TPixel>(width))
-            using (IBuffer<float> amount = source.MemoryAllocator.Allocate<float>(width))
+            using (IMemoryOwner<TPixel> colors = source.MemoryAllocator.Allocate<TPixel>(width))
+            using (IMemoryOwner<float> amount = source.MemoryAllocator.Allocate<float>(width))
             {
                 // Be careful! Do not capture colorSpan & amountSpan in the lambda below!
                 Span<TPixel> colorSpan = colors.GetSpan();
diff --git a/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs
rename to src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 51634ea2c..17d131413 100644
--- a/src/ImageSharp/Processing/Overlays/Processors/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Overlays
 {
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> that applies a radial glow effect an <see cref="Image{TPixel}"/>.
@@ -112,7 +112,7 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
             }
 
             int width = maxX - minX;
-            using (IBuffer<TPixel> rowColors = source.MemoryAllocator.Allocate<TPixel>(width))
+            using (IMemoryOwner<TPixel> rowColors = source.MemoryAllocator.Allocate<TPixel>(width))
             {
                 // Be careful! Do not capture rowColorsSpan in the lambda below!
                 Span<TPixel> rowColorsSpan = rowColors.GetSpan();
@@ -128,7 +128,7 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
                     configuration.ParallelOptions,
                     y =>
                     {
-                        using (IBuffer<float> amounts = source.MemoryAllocator.Allocate<float>(width))
+                        using (IMemoryOwner<float> amounts = source.MemoryAllocator.Allocate<float>(width))
                         {
                             Span<float> amountsSpan = amounts.GetSpan();
                             int offsetY = y - startY;
diff --git a/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs
rename to src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index b73fab179..a306459d1 100644
--- a/src/ImageSharp/Processing/Overlays/Processors/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Overlays
 {
     /// <summary>
     /// An <see cref="IImageProcessor{TPixel}"/> that applies a radial vignette effect to an <see cref="Image{TPixel}"/>.
@@ -114,7 +114,7 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
             }
 
             int width = maxX - minX;
-            using (IBuffer<TPixel> rowColors = source.MemoryAllocator.Allocate<TPixel>(width))
+            using (IMemoryOwner<TPixel> rowColors = source.MemoryAllocator.Allocate<TPixel>(width))
             {
                 // Be careful! Do not capture rowColorsSpan in the lambda below!
                 Span<TPixel> rowColorsSpan = rowColors.GetSpan();
@@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.Processing.Overlays.Processors
                     configuration.ParallelOptions,
                     y =>
                         {
-                            using (IBuffer<float> amounts = source.MemoryAllocator.Allocate<float>(width))
+                            using (IMemoryOwner<float> amounts = source.MemoryAllocator.Allocate<float>(width))
                             {
                                 Span<float> amountsSpan = amounts.GetSpan();
                                 int offsetY = y - startY;
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/FrameQuantizerBase{TPixel}.cs
similarity index 98%
rename from src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/FrameQuantizerBase{TPixel}.cs
index 6637d54e0..6e594f223 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/FrameQuantizerBase{TPixel}.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// The base class for all <see cref="IFrameQuantizer{TPixel}"/> implementations
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/IFrameQuantizer{TPixel}.cs
similarity index 89%
rename from src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/IFrameQuantizer{TPixel}.cs
index 435302bd3..50fdb5b58 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/IFrameQuantizer{TPixel}.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Provides methods to allow the execution of the quantization process on an image frame.
diff --git a/src/ImageSharp/Processing/Quantization/IQuantizer.cs b/src/ImageSharp/Processing/Processors/Quantization/IQuantizer.cs
similarity index 81%
rename from src/ImageSharp/Processing/Quantization/IQuantizer.cs
rename to src/ImageSharp/Processing/Processors/Quantization/IQuantizer.cs
index e00b865ac..0f6846d1b 100644
--- a/src/ImageSharp/Processing/Quantization/IQuantizer.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/IQuantizer.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Provides methods for allowing quantization of images pixels with configurable dithering.
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/OctreeFrameQuantizer{TPixel}.cs
similarity index 99%
rename from src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/OctreeFrameQuantizer{TPixel}.cs
index d73373395..0eb3db864 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/OctreeFrameQuantizer{TPixel}.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Encapsulates methods to calculate the color palette if an image using an Octree pattern.
diff --git a/src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs b/src/ImageSharp/Processing/Processors/Quantization/OctreeQuantizer.cs
similarity index 92%
rename from src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs
rename to src/ImageSharp/Processing/Processors/Quantization/OctreeQuantizer.cs
index 385ddceec..385f6246f 100644
--- a/src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/OctreeQuantizer.cs
@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Allows the quantization of images pixels using Octrees.
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/PaletteFrameQuantizer{TPixel}.cs
similarity index 98%
rename from src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/PaletteFrameQuantizer{TPixel}.cs
index cb72626d5..8df81b426 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/PaletteFrameQuantizer{TPixel}.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Encapsulates methods to create a quantized image based upon the given palette.
diff --git a/src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs b/src/ImageSharp/Processing/Processors/Quantization/PaletteQuantizer.cs
similarity index 91%
rename from src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs
rename to src/ImageSharp/Processing/Processors/Quantization/PaletteQuantizer.cs
index dd10a040a..8ae917718 100644
--- a/src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/PaletteQuantizer.cs
@@ -3,11 +3,9 @@
 
 using System;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Allows the quantization of images pixels using web safe colors defined in the CSS Color Module Level 4.
diff --git a/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs b/src/ImageSharp/Processing/Processors/Quantization/QuantizeProcessor.cs
similarity index 92%
rename from src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs
rename to src/ImageSharp/Processing/Processors/Quantization/QuantizeProcessor.cs
index 5b20805b0..bd5a6e9ec 100644
--- a/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/QuantizeProcessor.cs
@@ -4,11 +4,9 @@
 using System;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Enables the quantization of images to reduce the number of colors used in the image palette.
diff --git a/src/ImageSharp/Processing/Quantization/QuantizedFrame{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/QuantizedFrame{TPixel}.cs
similarity index 90%
rename from src/ImageSharp/Processing/Quantization/QuantizedFrame{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/QuantizedFrame{TPixel}.cs
index 6699c76f4..d0d79093c 100644
--- a/src/ImageSharp/Processing/Quantization/QuantizedFrame{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/QuantizedFrame{TPixel}.cs
@@ -2,11 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
+
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 
 // TODO: Consider pooling the TPixel palette also. For Rgba48+ this would end up on th LOH if 256 colors.
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Represents a quantized image frame where the pixels indexed by a color palette.
@@ -15,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
     public class QuantizedFrame<TPixel> : IDisposable
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<byte> pixels;
+        private IMemoryOwner<byte> pixels;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="QuantizedFrame{TPixel}"/> class.
@@ -32,7 +34,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
             this.Width = width;
             this.Height = height;
             this.Palette = palette;
-            this.pixels = memoryAllocator.AllocateCleanManagedByteBuffer(width * height);
+            this.pixels = memoryAllocator.AllocateManagedByteBuffer(width * height, AllocationOptions.Clean);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Processors/Quantization/WuFrameQuantizer{TPixel}.cs
similarity index 93%
rename from src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Processors/Quantization/WuFrameQuantizer{TPixel}.cs
index cb8721d06..80eefa9b3 100644
--- a/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/WuFrameQuantizer{TPixel}.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
@@ -10,7 +11,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// An implementation of Wu's color quantizer with alpha channel.
@@ -70,37 +71,37 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
         /// <summary>
         /// Moment of <c>P(c)</c>.
         /// </summary>
-        private IBuffer<long> vwt;
+        private IMemoryOwner<long> vwt;
 
         /// <summary>
         /// Moment of <c>r*P(c)</c>.
         /// </summary>
-        private IBuffer<long> vmr;
+        private IMemoryOwner<long> vmr;
 
         /// <summary>
         /// Moment of <c>g*P(c)</c>.
         /// </summary>
-        private IBuffer<long> vmg;
+        private IMemoryOwner<long> vmg;
 
         /// <summary>
         /// Moment of <c>b*P(c)</c>.
         /// </summary>
-        private IBuffer<long> vmb;
+        private IMemoryOwner<long> vmb;
 
         /// <summary>
         /// Moment of <c>a*P(c)</c>.
         /// </summary>
-        private IBuffer<long> vma;
+        private IMemoryOwner<long> vma;
 
         /// <summary>
         /// Moment of <c>c^2*P(c)</c>.
         /// </summary>
-        private IBuffer<float> m2;
+        private IMemoryOwner<float> m2;
 
         /// <summary>
         /// Color space tag.
         /// </summary>
-        private IBuffer<byte> tag;
+        private IMemoryOwner<byte> tag;
 
         /// <summary>
         /// Maximum allowed color depth
@@ -139,13 +140,13 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 
             try
             {
-                this.vwt = memoryAllocator.AllocateClean<long>(TableLength);
-                this.vmr = memoryAllocator.AllocateClean<long>(TableLength);
-                this.vmg = memoryAllocator.AllocateClean<long>(TableLength);
-                this.vmb = memoryAllocator.AllocateClean<long>(TableLength);
-                this.vma = memoryAllocator.AllocateClean<long>(TableLength);
-                this.m2 = memoryAllocator.AllocateClean<float>(TableLength);
-                this.tag = memoryAllocator.AllocateClean<byte>(TableLength);
+                this.vwt = memoryAllocator.Allocate<long>(TableLength, AllocationOptions.Clean);
+                this.vmr = memoryAllocator.Allocate<long>(TableLength, AllocationOptions.Clean);
+                this.vmg = memoryAllocator.Allocate<long>(TableLength, AllocationOptions.Clean);
+                this.vmb = memoryAllocator.Allocate<long>(TableLength, AllocationOptions.Clean);
+                this.vma = memoryAllocator.Allocate<long>(TableLength, AllocationOptions.Clean);
+                this.m2 = memoryAllocator.Allocate<float>(TableLength, AllocationOptions.Clean);
+                this.tag = memoryAllocator.Allocate<byte>(TableLength, AllocationOptions.Clean);
 
                 return base.QuantizeFrame(image);
             }
@@ -467,18 +468,18 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
             Span<long> vmaSpan = this.vma.GetSpan();
             Span<float> m2Span = this.m2.GetSpan();
 
-            using (IBuffer<long> volume = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (IBuffer<long> volumeR = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (IBuffer<long> volumeG = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (IBuffer<long> volumeB = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (IBuffer<long> volumeA = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
-            using (IBuffer<float> volume2 = memoryAllocator.Allocate<float>(IndexCount * IndexAlphaCount))
-            using (IBuffer<long> area = memoryAllocator.Allocate<long>(IndexAlphaCount))
-            using (IBuffer<long> areaR = memoryAllocator.Allocate<long>(IndexAlphaCount))
-            using (IBuffer<long> areaG = memoryAllocator.Allocate<long>(IndexAlphaCount))
-            using (IBuffer<long> areaB = memoryAllocator.Allocate<long>(IndexAlphaCount))
-            using (IBuffer<long> areaA = memoryAllocator.Allocate<long>(IndexAlphaCount))
-            using (IBuffer<float> area2 = memoryAllocator.Allocate<float>(IndexAlphaCount))
+            using (IMemoryOwner<long> volume = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<long> volumeR = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<long> volumeG = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<long> volumeB = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<long> volumeA = memoryAllocator.Allocate<long>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<float> volume2 = memoryAllocator.Allocate<float>(IndexCount * IndexAlphaCount))
+            using (IMemoryOwner<long> area = memoryAllocator.Allocate<long>(IndexAlphaCount))
+            using (IMemoryOwner<long> areaR = memoryAllocator.Allocate<long>(IndexAlphaCount))
+            using (IMemoryOwner<long> areaG = memoryAllocator.Allocate<long>(IndexAlphaCount))
+            using (IMemoryOwner<long> areaB = memoryAllocator.Allocate<long>(IndexAlphaCount))
+            using (IMemoryOwner<long> areaA = memoryAllocator.Allocate<long>(IndexAlphaCount))
+            using (IMemoryOwner<float> area2 = memoryAllocator.Allocate<float>(IndexAlphaCount))
             {
                 Span<long> volumeSpan = volume.GetSpan();
                 Span<long> volumeRSpan = volumeR.GetSpan();
@@ -791,7 +792,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
             this.colorCube = new Box[this.colors];
             float[] vv = new float[this.colors];
 
-            ref var cube = ref this.colorCube[0];
+            ref Box cube = ref this.colorCube[0];
             cube.R0 = cube.G0 = cube.B0 = cube.A0 = 0;
             cube.R1 = cube.G1 = cube.B1 = IndexCount - 1;
             cube.A1 = IndexAlphaCount - 1;
@@ -800,8 +801,8 @@ namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 
             for (int i = 1; i < this.colors; i++)
             {
-                ref var nextCube = ref this.colorCube[next];
-                ref var currentCube = ref this.colorCube[i];
+                ref Box nextCube = ref this.colorCube[next];
+                ref Box currentCube = ref this.colorCube[i];
                 if (this.Cut(ref nextCube, ref currentCube))
                 {
                     vv[next] = nextCube.Volume > 1 ? this.Variance(ref nextCube) : 0F;
diff --git a/src/ImageSharp/Processing/Quantization/WuQuantizer.cs b/src/ImageSharp/Processing/Processors/Quantization/WuQuantizer.cs
similarity index 92%
rename from src/ImageSharp/Processing/Quantization/WuQuantizer.cs
rename to src/ImageSharp/Processing/Processors/Quantization/WuQuantizer.cs
index f46cddfe6..3aa1f4c5e 100644
--- a/src/ImageSharp/Processing/Quantization/WuQuantizer.cs
+++ b/src/ImageSharp/Processing/Processors/Quantization/WuQuantizer.cs
@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Processors.Quantization
 {
     /// <summary>
     /// Allows the quantization of images pixels using Xiaolin Wu's Color Quantizer <see href="http://www.ece.mcmaster.ca/~xwu/cq.c"/>
diff --git a/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
index 2e1a88983..d9f35c892 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/AffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AffineTransformProcessor.cs
@@ -10,11 +10,10 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides the base methods to perform affine transforms on an image.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
index 68dc7f0ad..c077914ff 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/AutoOrientProcessor.cs
@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Adjusts an image so that its orientation is suitable for viewing. Adjustments are based on EXIF metadata embedded in the image.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/BicubicResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/BicubicResampler.cs
similarity index 95%
rename from src/ImageSharp/Processing/Transforms/Resamplers/BicubicResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/BicubicResampler.cs
index dd655a8a3..199563bc7 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/BicubicResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/BicubicResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the bicubic kernel algorithm W(x) as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/BoxResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/BoxResampler.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/Resamplers/BoxResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/BoxResampler.cs
index d6f79721c..0667226d9 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/BoxResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/BoxResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the box algorithm. Similar to nearest neighbor when upscaling.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/CatmullRomResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/CatmullRomResampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/CatmullRomResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/CatmullRomResampler.cs
index 7284bf715..8995d2d8a 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/CatmullRomResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CatmullRomResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The Catmull-Rom filter is a well known standard Cubic Filter often used as a interpolation function.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/CenteredAffineTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CenteredAffineTransformProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/Processors/CenteredAffineTransformProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/CenteredAffineTransformProcessor.cs
index adeed55ef..adaee1766 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/CenteredAffineTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CenteredAffineTransformProcessor.cs
@@ -3,10 +3,9 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// A base class that provides methods to allow the automatic centering of affine transforms
diff --git a/src/ImageSharp/Processing/Transforms/Processors/CenteredProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CenteredProjectiveTransformProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/Processors/CenteredProjectiveTransformProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/CenteredProjectiveTransformProcessor.cs
index 5cdcde483..962b9e4c9 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/CenteredProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CenteredProjectiveTransformProcessor.cs
@@ -3,10 +3,9 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// A base class that provides methods to allow the automatic centering of non-affine transforms
diff --git a/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index 2228c69fa..5d714eef5 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -9,7 +9,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods to allow the cropping of an image.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/EntropyCropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
similarity index 89%
rename from src/ImageSharp/Processing/Transforms/Processors/EntropyCropProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
index 66b781517..8eeae5d1f 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/EntropyCropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
@@ -3,12 +3,11 @@
 
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
-using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods to allow the cropping of an image to preserve areas of highest entropy.
@@ -67,7 +66,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         }
 
         /// <inheritdoc/>
-        protected override void OnFrameApply(ImageFrame<TPixel> sourceBase, Rectangle sourceRectangle, Configuration config)
+        protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
             // All processing happens at the image level within BeforeImageApply();
         }
diff --git a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index 5d4961f57..4ab4971b8 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -5,11 +5,10 @@ using System;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods that allow the flipping of an image around its center point.
@@ -21,14 +20,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <summary>
         /// Initializes a new instance of the <see cref="FlipProcessor{TPixel}"/> class.
         /// </summary>
-        /// <param name="flipMode">The <see cref="Transforms.FlipMode"/> used to perform flipping.</param>
+        /// <param name="flipMode">The <see cref="FlipMode"/> used to perform flipping.</param>
         public FlipProcessor(FlipMode flipMode)
         {
             this.FlipMode = flipMode;
         }
 
         /// <summary>
-        /// Gets the <see cref="Transforms.FlipMode"/> used to perform flipping.
+        /// Gets the <see cref="FlipMode"/> used to perform flipping.
         /// </summary>
         public FlipMode FlipMode { get; }
 
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/HermiteResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/HermiteResampler.cs
similarity index 91%
rename from src/ImageSharp/Processing/Transforms/Resamplers/HermiteResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/HermiteResampler.cs
index 2017a1cb5..18c3fda7c 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/HermiteResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/HermiteResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The Hermite filter is type of smoothed triangular interpolation Filter,
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/IResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/IResampler.cs
similarity index 91%
rename from src/ImageSharp/Processing/Transforms/Resamplers/IResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/IResampler.cs
index 6bc4feaf0..6db03d5b4 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/IResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/IResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Encapsulates an interpolation algorithm for resampling images.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/InterpolatedTransformProcessorBase.cs b/src/ImageSharp/Processing/Processors/Transforms/InterpolatedTransformProcessorBase.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/Processors/InterpolatedTransformProcessorBase.cs
rename to src/ImageSharp/Processing/Processors/Transforms/InterpolatedTransformProcessorBase.cs
index 8f57f3ba3..c1abb4a5e 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/InterpolatedTransformProcessorBase.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/InterpolatedTransformProcessorBase.cs
@@ -4,9 +4,8 @@
 using System;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The base class for performing interpolated affine and non-affine transforms.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos2Resampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Lanczos2Resampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/Lanczos2Resampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/Lanczos2Resampler.cs
index 35735189a..2294696de 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos2Resampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Lanczos2Resampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Lanczos kernel algorithm as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos3Resampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Lanczos3Resampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/Lanczos3Resampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/Lanczos3Resampler.cs
index fa85767a6..95fb206a9 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos3Resampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Lanczos3Resampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Lanczos kernel algorithm as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos5Resampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Lanczos5Resampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/Lanczos5Resampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/Lanczos5Resampler.cs
index ec6b7181a..c99ed1e85 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos5Resampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Lanczos5Resampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Lanczos kernel algorithm as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos8Resampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Lanczos8Resampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/Lanczos8Resampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/Lanczos8Resampler.cs
index c1f6aecf1..4efdb882b 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/Lanczos8Resampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Lanczos8Resampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Lanczos kernel algorithm as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/MitchellNetravaliResampler.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/MitchellNetravaliResampler.cs
index b7817400b..d4ba954f2 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/MitchellNetravaliResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/MitchellNetravaliResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the mitchell algorithm as described on
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/NearestNeighborResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/NearestNeighborResampler.cs
similarity index 89%
rename from src/ImageSharp/Processing/Transforms/Resamplers/NearestNeighborResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/NearestNeighborResampler.cs
index 61155132e..1f12334f4 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/NearestNeighborResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/NearestNeighborResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the nearest neighbor algorithm. This uses an unscaled filter
diff --git a/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
index 24a72fefb..716133fb7 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/ProjectiveTransformProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ProjectiveTransformProcessor.cs
@@ -10,12 +10,10 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-// TODO: Doesn't work yet! Implement tests + Finish implementation + Document Matrix4x4 behavior
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides the base methods to perform non-affine transforms on an image.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index dfb3a82ff..9c09b6a22 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -10,11 +11,10 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
 using SixLabors.Memory;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods that allow the resizing of images using various algorithms.
@@ -202,7 +202,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
                     {
                         // weights[w] = weights[w] / sum:
                         ref float wRef = ref Unsafe.Add(ref weightsBaseRef, w);
-                        wRef = wRef / sum;
+                        wRef /= sum;
                     }
                 }
             }
@@ -297,14 +297,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
             using (Buffer2D<Vector4> firstPassPixels = source.MemoryAllocator.Allocate2D<Vector4>(width, source.Height))
             {
-                firstPassPixels.Buffer.Clear();
+                firstPassPixels.MemorySource.Clear();
 
                 ParallelFor.WithTemporaryBuffer(
                     0,
                     sourceRectangle.Bottom,
                     configuration,
                     source.Width,
-                    (int y, IBuffer<Vector4> tempRowBuffer) =>
+                    (int y, IMemoryOwner<Vector4> tempRowBuffer) =>
                         {
                             ref Vector4 firstPassRow = ref MemoryMarshal.GetReference(firstPassPixels.GetRowSpan(y));
                             Span<TPixel> sourceRow = source.GetPixelRowSpan(y);
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/RobidouxResampler.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/Resamplers/RobidouxResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/RobidouxResampler.cs
index 03a6e8677..51938566c 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/RobidouxResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Robidoux algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxSharpResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/RobidouxSharpResampler.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/Resamplers/RobidouxSharpResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/RobidouxSharpResampler.cs
index 83213c3f4..015b7f0af 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/RobidouxSharpResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/RobidouxSharpResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the Robidoux Sharp algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
similarity index 98%
rename from src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
index 62c3e476b..d57e9cbd9 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods that allow the rotating of images.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
similarity index 94%
rename from src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs
rename to src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
index 61e8b1268..a0cfa6379 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Provides methods that allow the skewing of images.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/SplineResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/SplineResampler.cs
similarity index 90%
rename from src/ImageSharp/Processing/Transforms/Resamplers/SplineResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/SplineResampler.cs
index 45f18a4a0..df6c2a338 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/SplineResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/SplineResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the spline algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/TransformHelpers.cs b/src/ImageSharp/Processing/Processors/Transforms/TransformHelpers.cs
similarity index 99%
rename from src/ImageSharp/Processing/Transforms/TransformHelpers.cs
rename to src/ImageSharp/Processing/Processors/Transforms/TransformHelpers.cs
index 71d3b35c1..1b676139b 100644
--- a/src/ImageSharp/Processing/Transforms/TransformHelpers.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/TransformHelpers.cs
@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Contains helper methods for working with affine and non-affine transforms
diff --git a/src/ImageSharp/Processing/Transforms/Processors/TransformProcessorBase.cs b/src/ImageSharp/Processing/Processors/Transforms/TransformProcessorBase.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Processors/TransformProcessorBase.cs
rename to src/ImageSharp/Processing/Processors/Transforms/TransformProcessorBase.cs
index 0ca5ee191..13ee90a06 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/TransformProcessorBase.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/TransformProcessorBase.cs
@@ -5,7 +5,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The base class for all transform processors. Any processor that changes the dimensions of the image should inherit from this.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/TriangleResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/TriangleResampler.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/Resamplers/TriangleResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/TriangleResampler.cs
index 0fde54486..57d1fa11d 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/TriangleResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/TriangleResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the triangle (bilinear) algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs b/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
similarity index 94%
rename from src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs
rename to src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
index 8c479992e..3983ea091 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/WeightsBuffer.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WeightsBuffer.cs
@@ -4,7 +4,7 @@
 using System;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Holds the <see cref="WeightsWindow"/> values in an optimized contigous memory region.
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <param name="destinationSize">The size of the destination window</param>
         public WeightsBuffer(MemoryAllocator memoryAllocator, int sourceSize, int destinationSize)
         {
-            this.dataBuffer = memoryAllocator.Allocate2D<float>(sourceSize, destinationSize, true);
+            this.dataBuffer = memoryAllocator.Allocate2D<float>(sourceSize, destinationSize, AllocationOptions.Clean);
             this.Weights = new WeightsWindow[destinationSize];
         }
 
diff --git a/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
similarity index 95%
rename from src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs
rename to src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
index 440b19ecc..6a2b6fbd1 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/WeightsWindow.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WeightsWindow.cs
@@ -2,12 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using SixLabors.Memory;
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// Points to a collection of of weights allocated in <see cref="WeightsBuffer"/>.
@@ -32,7 +33,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <summary>
         /// The buffer containing the weights values.
         /// </summary>
-        private readonly IBuffer<float> buffer;
+        private readonly MemorySource<float> buffer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WeightsWindow"/> struct.
@@ -46,7 +47,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         {
             this.flatStartIndex = (index * buffer.Width) + left;
             this.Left = left;
-            this.buffer = buffer.Buffer;
+            this.buffer = buffer.MemorySource;
             this.Length = length;
         }
 
@@ -66,7 +67,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// </summary>
         /// <returns>The <see cref="Span{T}"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<float> GetWindowSpan() => this.buffer.Slice(this.flatStartIndex, this.Length);
+        public Span<float> GetWindowSpan() => this.buffer.GetSpan().Slice(this.flatStartIndex, this.Length);
 
         /// <summary>
         /// Computes the sum of vectors in 'rowSpan' weighted by weight values, pointed by this <see cref="WeightsWindow"/> instance.
diff --git a/src/ImageSharp/Processing/Transforms/Resamplers/WelchResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/WelchResampler.cs
similarity index 91%
rename from src/ImageSharp/Processing/Transforms/Resamplers/WelchResampler.cs
rename to src/ImageSharp/Processing/Processors/Transforms/WelchResampler.cs
index 01a07fed5..edce5fcf9 100644
--- a/src/ImageSharp/Processing/Transforms/Resamplers/WelchResampler.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/WelchResampler.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms.Resamplers
+namespace SixLabors.ImageSharp.Processing.Processors.Transforms
 {
     /// <summary>
     /// The function implements the welch algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/ProjectiveTransformHelper.cs b/src/ImageSharp/Processing/ProjectiveTransformHelper.cs
similarity index 99%
rename from src/ImageSharp/Processing/Transforms/ProjectiveTransformHelper.cs
rename to src/ImageSharp/Processing/ProjectiveTransformHelper.cs
index 7c79776d9..4057ec586 100644
--- a/src/ImageSharp/Processing/Transforms/ProjectiveTransformHelper.cs
+++ b/src/ImageSharp/Processing/ProjectiveTransformHelper.cs
@@ -4,7 +4,7 @@
 using System.Numerics;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Enumerates the various options which determine which side to taper
diff --git a/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs b/src/ImageSharp/Processing/QuantizeExtensions.cs
similarity index 92%
rename from src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs
rename to src/ImageSharp/Processing/QuantizeExtensions.cs
index bf49c765a..5bd2f49bd 100644
--- a/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs
+++ b/src/ImageSharp/Processing/QuantizeExtensions.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of quantizing algorithms to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs b/src/ImageSharp/Processing/ResizeExtensions.cs
similarity index 98%
rename from src/ImageSharp/Processing/Transforms/ResizeExtensions.cs
rename to src/ImageSharp/Processing/ResizeExtensions.cs
index 4317c1fc1..8a370db69 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs
+++ b/src/ImageSharp/Processing/ResizeExtensions.cs
@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of resize operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/ResizeHelper.cs b/src/ImageSharp/Processing/ResizeHelper.cs
similarity index 99%
rename from src/ImageSharp/Processing/Transforms/ResizeHelper.cs
rename to src/ImageSharp/Processing/ResizeHelper.cs
index aca9d97d3..b9233937b 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeHelper.cs
+++ b/src/ImageSharp/Processing/ResizeHelper.cs
@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides methods to help calculate the target rectangle when resizing using the
diff --git a/src/ImageSharp/Processing/Transforms/ResizeMode.cs b/src/ImageSharp/Processing/ResizeMode.cs
similarity index 96%
rename from src/ImageSharp/Processing/Transforms/ResizeMode.cs
rename to src/ImageSharp/Processing/ResizeMode.cs
index 2707b11b3..6adeac66d 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeMode.cs
+++ b/src/ImageSharp/Processing/ResizeMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides enumeration over how the image should be resized.
diff --git a/src/ImageSharp/Processing/Transforms/ResizeOptions.cs b/src/ImageSharp/Processing/ResizeOptions.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/ResizeOptions.cs
rename to src/ImageSharp/Processing/ResizeOptions.cs
index c14abe2a8..0d5bfe38b 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeOptions.cs
+++ b/src/ImageSharp/Processing/ResizeOptions.cs
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// The resize options for resizing images against certain modes.
diff --git a/src/ImageSharp/Processing/Transforms/RotateExtensions.cs b/src/ImageSharp/Processing/RotateExtensions.cs
similarity index 93%
rename from src/ImageSharp/Processing/Transforms/RotateExtensions.cs
rename to src/ImageSharp/Processing/RotateExtensions.cs
index 28819099e..398a634d1 100644
--- a/src/ImageSharp/Processing/Transforms/RotateExtensions.cs
+++ b/src/ImageSharp/Processing/RotateExtensions.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of rotate operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs b/src/ImageSharp/Processing/RotateFlipExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs
rename to src/ImageSharp/Processing/RotateFlipExtensions.cs
index 66bb27b36..27ddc8de9 100644
--- a/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs
+++ b/src/ImageSharp/Processing/RotateFlipExtensions.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of rotate-flip operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/RotateMode.cs b/src/ImageSharp/Processing/RotateMode.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/RotateMode.cs
rename to src/ImageSharp/Processing/RotateMode.cs
index 6f66d0c09..c890f2bd6 100644
--- a/src/ImageSharp/Processing/Transforms/RotateMode.cs
+++ b/src/ImageSharp/Processing/RotateMode.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Provides enumeration over how the image should be rotated.
diff --git a/src/ImageSharp/Processing/Filters/SaturateExtensions.cs b/src/ImageSharp/Processing/SaturateExtensions.cs
similarity index 95%
rename from src/ImageSharp/Processing/Filters/SaturateExtensions.cs
rename to src/ImageSharp/Processing/SaturateExtensions.cs
index 282bdef64..ba45ae12c 100644
--- a/src/ImageSharp/Processing/Filters/SaturateExtensions.cs
+++ b/src/ImageSharp/Processing/SaturateExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the alteration of the saturation component to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Filters/SepiaExtensions.cs b/src/ImageSharp/Processing/SepiaExtensions.cs
similarity index 96%
rename from src/ImageSharp/Processing/Filters/SepiaExtensions.cs
rename to src/ImageSharp/Processing/SepiaExtensions.cs
index 09d8c3684..08676ee62 100644
--- a/src/ImageSharp/Processing/Filters/SepiaExtensions.cs
+++ b/src/ImageSharp/Processing/SepiaExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Filters
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of sepia toning to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/SkewExtensions.cs b/src/ImageSharp/Processing/SkewExtensions.cs
similarity index 92%
rename from src/ImageSharp/Processing/Transforms/SkewExtensions.cs
rename to src/ImageSharp/Processing/SkewExtensions.cs
index cbb414888..07e3c6087 100644
--- a/src/ImageSharp/Processing/Transforms/SkewExtensions.cs
+++ b/src/ImageSharp/Processing/SkewExtensions.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of skew operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Transforms/TransformExtensions.cs b/src/ImageSharp/Processing/TransformExtensions.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/TransformExtensions.cs
rename to src/ImageSharp/Processing/TransformExtensions.cs
index 2607c102b..0ec1e295d 100644
--- a/src/ImageSharp/Processing/Transforms/TransformExtensions.cs
+++ b/src/ImageSharp/Processing/TransformExtensions.cs
@@ -3,11 +3,10 @@
 
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Transforms
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of composable transform operations to the <see cref="Image{TPixel}"/> type.
diff --git a/src/ImageSharp/Processing/Overlays/VignetteExtensions.cs b/src/ImageSharp/Processing/VignetteExtensions.cs
similarity index 98%
rename from src/ImageSharp/Processing/Overlays/VignetteExtensions.cs
rename to src/ImageSharp/Processing/VignetteExtensions.cs
index 25b067d7f..18dd8064c 100644
--- a/src/ImageSharp/Processing/Overlays/VignetteExtensions.cs
+++ b/src/ImageSharp/Processing/VignetteExtensions.cs
@@ -3,10 +3,10 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Processing.Overlays
+namespace SixLabors.ImageSharp.Processing
 {
     /// <summary>
     /// Adds extensions that allow the application of a radial glow to the <see cref="Image{TPixel}"/> type.
diff --git a/tests/ImageSharp.Benchmarks/Codecs/EncodeGif.cs b/tests/ImageSharp.Benchmarks/Codecs/EncodeGif.cs
index 4f5bcdf0a..12e74ccdb 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/EncodeGif.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/EncodeGif.cs
@@ -6,7 +6,7 @@ using System.IO;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.ImageSharp.Tests;
 using SDImage = System.Drawing.Image;
 
diff --git a/tests/ImageSharp.Benchmarks/Codecs/EncodeGifMultiple.cs b/tests/ImageSharp.Benchmarks/Codecs/EncodeGifMultiple.cs
index cf94a1ec3..9b94347f3 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/EncodeGifMultiple.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/EncodeGifMultiple.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Drawing.Imaging;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Formats.Gif;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 namespace SixLabors.ImageSharp.Benchmarks.Codecs
 {
diff --git a/tests/ImageSharp.Benchmarks/Codecs/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Codecs/EncodeIndexedPng.cs
index db415d3c2..962b34eb7 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/EncodeIndexedPng.cs
@@ -5,7 +5,8 @@ using System.IO;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.ImageSharp.Tests;
 using CoreImage = SixLabors.ImageSharp.Image;
 
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpeg.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpeg.cs
index f86919dd1..9b968e4db 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpeg.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpeg.cs
@@ -4,8 +4,8 @@
 using System.Drawing;
 using System.IO;
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
+
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests;
 using CoreSize = SixLabors.Primitives.Size;
@@ -45,23 +45,11 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         }
 
         [Benchmark(Description = "Decode Jpeg - ImageSharp")]
-        public CoreSize JpegImageSharpOrig()
-        {
-            using (var memoryStream = new MemoryStream(this.jpegBytes))
-            {
-                using (var image = Image.Load<Rgba32>(memoryStream, new GolangJpegDecoder()))
-                {
-                    return new CoreSize(image.Width, image.Height);
-                }
-            }
-        }
-
-        [Benchmark(Description = "Decode Jpeg - ImageSharp PdfJs")]
-        public CoreSize JpegImageSharpPdfJs()
+        public CoreSize JpegImageSharp()
         {
             using (var memoryStream = new MemoryStream(this.jpegBytes))
             {
-                using (var image = Image.Load<Rgba32>(memoryStream, new PdfJsJpegDecoder()))
+                using (var image = Image.Load<Rgba32>(memoryStream, new JpegDecoder()))
                 {
                     return new CoreSize(image.Width, image.Height);
                 }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegMultiple.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegMultiple.cs
index c4ee732f5..be0fe76b8 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegMultiple.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegMultiple.cs
@@ -3,8 +3,7 @@
 
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
 using SDImage = System.Drawing.Image;
 
@@ -22,15 +21,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         protected override IEnumerable<string> SearchPatterns => new[] { "*.jpg" };
 
         [Benchmark(Description = "DecodeJpegMultiple - ImageSharp")]
-        public void DecodeJpegImageSharpOrig()
+        public void DecodeJpegImageSharp()
         {
-            this.ForEachStream(ms => Image.Load<Rgba32>(ms, new GolangJpegDecoder()));
-        }
-
-        [Benchmark(Description = "DecodeJpegMultiple - ImageSharp PDFJs")]
-        public void DecodeJpegImageSharpPdfJs()
-        {
-            this.ForEachStream(ms => Image.Load<Rgba32>(ms, new PdfJsJpegDecoder()));
+            this.ForEachStream(ms => Image.Load<Rgba32>(ms, new JpegDecoder()));
         }
 
         [Benchmark(Baseline = true, Description = "DecodeJpegMultiple - System.Drawing")]
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
index 059f312b3..5958b9f79 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DecodeJpegParseStreamOnly.cs
@@ -5,7 +5,6 @@ using BenchmarkDotNet.Attributes;
 using System.Drawing;
 using System.IO;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.Tests;
 
 namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
@@ -38,12 +37,12 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
             }
         }
 
-        [Benchmark(Description = "PdfJsJpegDecoderCore.ParseStream")]
+        [Benchmark(Description = "JpegDecoderCore.ParseStream")]
         public void ParseStreamPdfJs()
         {
             using (var memoryStream = new MemoryStream(this.jpegBytes))
             {
-                var decoder = new PdfJsJpegDecoderCore(Configuration.Default, new JpegDecoder() { IgnoreMetadata = true });
+                var decoder = new JpegDecoderCore(Configuration.Default, new Formats.Jpeg.JpegDecoder() { IgnoreMetadata = true });
                 decoder.ParseStream(memoryStream);
                 decoder.Dispose();
             }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs
index f91595df8..d4cbe81e1 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/DoubleBufferedStreams.cs
@@ -4,16 +4,16 @@
 using System;
 using System.IO;
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
+using SixLabors.ImageSharp.IO;
 
 namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
 {
     [Config(typeof(Config.ShortClr))]
     public class DoubleBufferedStreams
     {
-        private byte[] buffer = CreateTestBytes();
-        private byte[] chunk1 = new byte[2];
-        private byte[] chunk2 = new byte[2];
+        private readonly byte[] buffer = CreateTestBytes();
+        private readonly byte[] chunk1 = new byte[2];
+        private readonly byte[] chunk2 = new byte[2];
 
         private MemoryStream stream1;
         private MemoryStream stream2;
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/EncodeJpeg.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/EncodeJpeg.cs
index 53f0630b9..d934a1d6d 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/EncodeJpeg.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/EncodeJpeg.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         [Benchmark(Baseline = true, Description = "System.Drawing Jpeg")]
         public void JpegSystemDrawing()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
                 this.bmpDrawing.Save(memoryStream, ImageFormat.Jpeg);
             }
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         [Benchmark(Description = "ImageSharp Jpeg")]
         public void JpegCore()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
                 this.bmpCore.SaveAsJpeg(memoryStream);
             }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/IdentifyJpeg.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/IdentifyJpeg.cs
index b6ad20d12..ae32167a9 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/IdentifyJpeg.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/IdentifyJpeg.cs
@@ -3,8 +3,8 @@
 
 using System.IO;
 using BenchmarkDotNet.Attributes;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
+
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Tests;
 
 namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
@@ -29,22 +29,11 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         }
 
         [Benchmark]
-        public IImageInfo IdentifyGolang()
-        {
-            using (var memoryStream = new MemoryStream(this.jpegBytes))
-            {
-                var decoder = new GolangJpegDecoder();
-
-                return decoder.Identify(Configuration.Default, memoryStream);
-            }
-        }
-
-        [Benchmark]
-        public IImageInfo IdentifyPdfJs()
+        public IImageInfo Identify()
         {
             using (var memoryStream = new MemoryStream(this.jpegBytes))
             {
-                var decoder = new PdfJsJpegDecoder();
+                var decoder = new JpegDecoder();
                 return decoder.Identify(Configuration.Default, memoryStream);
             }
         }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/LoadResizeSave.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/LoadResizeSave.cs
new file mode 100644
index 000000000..1d485ee08
--- /dev/null
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/LoadResizeSave.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using BenchmarkDotNet.Attributes;
+using System;
+using System.IO;
+using SixLabors.ImageSharp.Tests;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using SixLabors.ImageSharp.Processing;
+using SDImage = System.Drawing.Image;
+using SixLabors.ImageSharp.Formats.Jpeg;
+
+namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
+{
+    [Config(typeof(Config.ShortClr))]
+    public class LoadResizeSave : BenchmarkBase
+    {
+        private readonly Configuration configuration = new Configuration(new JpegConfigurationModule());
+
+        private byte[] sourceBytes;
+
+        private byte[] destBytes;
+
+        private string TestImageFullPath => Path.Combine(TestEnvironment.InputImagesDirectoryFullPath, this.TestImage);
+
+        [Params(
+            TestImages.Jpeg.Baseline.Jpeg420Exif
+            //, TestImages.Jpeg.Baseline.Calliphora
+            )]
+        public string TestImage { get; set; }
+
+        [Params(false, true)]
+        public bool EnableParallelExecution { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            this.configuration.ParallelOptions.MaxDegreeOfParallelism =
+                this.EnableParallelExecution ? Environment.ProcessorCount : 1;
+
+            if (this.sourceBytes == null)
+            {
+                this.sourceBytes = File.ReadAllBytes(this.TestImageFullPath);
+            }
+
+            if (this.destBytes == null)
+            {
+                this.destBytes = new byte[this.sourceBytes.Length];
+            }
+        }
+
+        [Benchmark(Baseline = true)]
+        public void SystemDrawing()
+        {
+            using (var sourceStream = new MemoryStream(this.sourceBytes))
+            using (var destStream = new MemoryStream(this.destBytes))
+            using (var source = SDImage.FromStream(sourceStream))
+            using (var destination = new Bitmap(source.Width / 4, source.Height / 4))
+            {
+                using (var graphics = Graphics.FromImage(destination))
+                {
+                    graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                    graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                    graphics.CompositingQuality = CompositingQuality.HighQuality;
+                    graphics.DrawImage(source, 0, 0, 400, 400);
+                }
+
+                destination.Save(destStream, ImageFormat.Jpeg);
+            }
+        }
+
+        [Benchmark]
+        public void ImageSharp()
+        {
+            var source = Image.Load(this.configuration, this.sourceBytes, new JpegDecoder { IgnoreMetadata = true });
+            using (source)
+            using (var destStream = new MemoryStream(this.destBytes))
+            {
+                source.Mutate(c => c.Resize(source.Width / 4, source.Height / 4));
+                source.SaveAsJpeg(destStream);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
index ac396d42e..6f4195d6f 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4.cs
@@ -1,21 +1,24 @@
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
-{
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
-    using BenchmarkDotNet.Attributes;
 
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.PixelFormats;
+using System.Buffers;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+using BenchmarkDotNet.Attributes;
 
+using SixLabors.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
+{
     [Config(typeof(Config.ShortClr))]
     public abstract class PackFromVector4<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<Vector4> source;
+        private IMemoryOwner<Vector4> source;
 
-        private IBuffer<TPixel> destination;
+        private IMemoryOwner<TPixel> destination;
 
         [Params(16, 128, 512)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index c4c09f67c..33ad9203c 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -1,19 +1,21 @@
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
-{
-    using System;
 
-    using BenchmarkDotNet.Attributes;
+using System.Buffers;
+using System;
+
+using BenchmarkDotNet.Attributes;
 
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.ImageSharp.PixelFormats;
 
+namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
+{
     public abstract class PackFromXyzw<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<TPixel> destination;
+        private IMemoryOwner<TPixel> destination;
 
-        private IBuffer<byte> source;
+        private IMemoryOwner<byte> source;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 3b988757d..75ca1206e 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -1,20 +1,22 @@
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
-{
-    using System;
-    using System.Numerics;
 
-    using BenchmarkDotNet.Attributes;
+using System.Buffers;
+using System;
+using System.Numerics;
+
+using BenchmarkDotNet.Attributes;
 
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.ImageSharp.PixelFormats;
 
+namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
+{
     public abstract class ToVector4<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<TPixel> source;
+        private IMemoryOwner<TPixel> source;
 
-        private IBuffer<Vector4> destination;
+        private IMemoryOwner<Vector4> destination;
 
         [Params(64, 300, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 16743eb73..be1ff72d5 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -1,20 +1,21 @@
 // ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
-{
-    using System;
-    using System.Numerics;
 
-    using BenchmarkDotNet.Attributes;
+using System.Buffers;
+using System;
+
+using BenchmarkDotNet.Attributes;
 
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.ImageSharp.PixelFormats;
 
+namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
+{
     public abstract class ToXyz<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<TPixel> source;
+        private IMemoryOwner<TPixel> source;
 
-        private IBuffer<byte> destination;
+        private IMemoryOwner<byte> destination;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index f947b6e8d..799be60cc 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -1,22 +1,20 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Buffers;
+using BenchmarkDotNet.Attributes;
+
+using SixLabors.Memory;
+using SixLabors.ImageSharp.PixelFormats;
+
 // ReSharper disable InconsistentNaming
 
 namespace SixLabors.ImageSharp.Benchmarks.ColorSpaces.Bulk
 {
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.PixelFormats;
-
     public abstract class ToXyzw<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        private IBuffer<TPixel> source;
+        private IMemoryOwner<TPixel> source;
 
-        private IBuffer<byte> destination;
+        private IMemoryOwner<byte> destination;
 
         [Params(16, 128, 1024)]
         public int Count { get; set; }
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
index d2f54f140..edbbceb62 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
@@ -11,7 +11,6 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
index a027108a1..894683599 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
@@ -3,8 +3,6 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-using SixLabors.ImageSharp.Processing.Drawing;
-
 namespace SixLabors.ImageSharp.Benchmarks
 {
     using System.Drawing;
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
index ab690f645..5fbd9f112 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
@@ -11,13 +11,9 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
-
-
     public class DrawPolygon : BenchmarkBase
     {
         [Benchmark(Baseline = true, Description = "System.Drawing Draw Polygon")]
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
index 96912a6df..624b54278 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
@@ -6,15 +6,11 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using BenchmarkDotNet.Attributes;
-using System.IO;
-using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Text;
-using SixLabors.ImageSharp.Processing.Overlays;
-using SixLabors.ImageSharp.Processing.Drawing;
 using System.Linq;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -24,9 +20,9 @@ namespace SixLabors.ImageSharp.Benchmarks
     {
 
         [Params(10, 100)]
-        public int TextIterations{ get; set; }
+        public int TextIterations { get; set; }
         public string TextPhrase { get; set; } = "Hello World";
-        public string TextToRender => string.Join(" ", Enumerable.Repeat(TextPhrase, TextIterations));
+        public string TextToRender => string.Join(" ", Enumerable.Repeat(this.TextPhrase, this.TextIterations));
 
 
         [Benchmark(Baseline = true, Description = "System.Drawing Draw Text")]
@@ -41,7 +37,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                     graphics.SmoothingMode = SmoothingMode.AntiAlias;
                     Pen pen = new Pen(System.Drawing.Color.HotPink, 10);
                     var font = new Font("Arial", 12, GraphicsUnit.Point);
-                    graphics.DrawString(TextToRender, font, Brushes.HotPink, new RectangleF(10, 10, 780, 780));
+                    graphics.DrawString(TextToRender, font, System.Drawing.Brushes.HotPink, new RectangleF(10, 10, 780, 780));
                 }
             }
         }
@@ -53,7 +49,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
                 var font = SixLabors.Fonts.SystemFonts.CreateFont("Arial", 12);
-                image.Mutate(x => x.ApplyProcessor(new SixLabors.ImageSharp.Processing.Text.Processors.DrawTextProcessor<Rgba32>(new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, SixLabors.ImageSharp.Processing.Drawing.Brushes.Brushes.Solid(Rgba32.HotPink), null, new SixLabors.Primitives.PointF(10, 10))));
+                image.Mutate(x => x.ApplyProcessor(new DrawTextProcessor<Rgba32>(new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, Processing.Brushes.Solid(Rgba32.HotPink), null, new SixLabors.Primitives.PointF(10, 10))));
             }
         }
 
@@ -63,10 +59,10 @@ namespace SixLabors.ImageSharp.Benchmarks
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
                 var font = SixLabors.Fonts.SystemFonts.CreateFont("Arial", 12);
-                image.Mutate(x => DrawTextOldVersion(x, new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, SixLabors.ImageSharp.Processing.Drawing.Brushes.Brushes.Solid(Rgba32.HotPink), null, new SixLabors.Primitives.PointF(10, 10)));
+                image.Mutate(x => DrawTextOldVersion(x, new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, Processing.Brushes.Solid(Rgba32.HotPink), null, new SixLabors.Primitives.PointF(10, 10)));
             }
 
-            IImageProcessingContext<TPixel> DrawTextOldVersion<TPixel>(IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, SixLabors.Fonts.Font font, SixLabors.ImageSharp.Processing.Drawing.Brushes.IBrush<TPixel> brush, SixLabors.ImageSharp.Processing.Drawing.Pens.IPen<TPixel> pen, SixLabors.Primitives.PointF location)
+            IImageProcessingContext<TPixel> DrawTextOldVersion<TPixel>(IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, SixLabors.Fonts.Font font, IBrush<TPixel> brush, IPen<TPixel> pen, SixLabors.Primitives.PointF location)
                 where TPixel : struct, IPixel<TPixel>
             {
                 float dpiX = 72;
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs
index e85e33235..ba6d055e3 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs
@@ -6,15 +6,10 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using BenchmarkDotNet.Attributes;
-using System.IO;
-using System.Numerics;
-
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Text;
-using SixLabors.ImageSharp.Processing.Overlays;
-using SixLabors.ImageSharp.Processing.Drawing;
 using System.Linq;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -24,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks
     {
 
         [Params(10, 100)]
-        public int TextIterations{ get; set; }
+        public int TextIterations { get; set; }
         public string TextPhrase { get; set; } = "Hello World";
         public string TextToRender => string.Join(" ", Enumerable.Repeat(TextPhrase, TextIterations));
 
@@ -54,7 +49,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
                 var font = SixLabors.Fonts.SystemFonts.CreateFont("Arial", 12);
-                image.Mutate(x => x.ApplyProcessor(new SixLabors.ImageSharp.Processing.Text.Processors.DrawTextProcessor<Rgba32>(new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, null, SixLabors.ImageSharp.Processing.Drawing.Pens.Pens.Solid(Rgba32.HotPink, 10), new SixLabors.Primitives.PointF(10, 10))));
+                image.Mutate(x => x.ApplyProcessor(new DrawTextProcessor<Rgba32>(new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, null, Processing.Pens.Solid(Rgba32.HotPink, 10), new SixLabors.Primitives.PointF(10, 10))));
             }
         }
 
@@ -64,10 +59,10 @@ namespace SixLabors.ImageSharp.Benchmarks
             using (Image<Rgba32> image = new Image<Rgba32>(800, 800))
             {
                 var font = SixLabors.Fonts.SystemFonts.CreateFont("Arial", 12);
-                image.Mutate(x => DrawTextOldVersion(x, new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, null, SixLabors.ImageSharp.Processing.Drawing.Pens.Pens.Solid(Rgba32.HotPink, 10), new SixLabors.Primitives.PointF(10, 10)));
+                image.Mutate(x => DrawTextOldVersion(x, new TextGraphicsOptions(true) { WrapTextWidth = 780 }, TextToRender, font, null, Processing.Pens.Solid(Rgba32.HotPink, 10), new SixLabors.Primitives.PointF(10, 10)));
             }
 
-            IImageProcessingContext<TPixel> DrawTextOldVersion<TPixel>(IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, SixLabors.Fonts.Font font, SixLabors.ImageSharp.Processing.Drawing.Brushes.IBrush<TPixel> brush, SixLabors.ImageSharp.Processing.Drawing.Pens.IPen<TPixel> pen, SixLabors.Primitives.PointF location)
+            IImageProcessingContext<TPixel> DrawTextOldVersion<TPixel>(IImageProcessingContext<TPixel> source, TextGraphicsOptions options, string text, SixLabors.Fonts.Font font, IBrush<TPixel> brush, IPen<TPixel> pen, SixLabors.Primitives.PointF location)
                 where TPixel : struct, IPixel<TPixel>
             {
                 var style = new SixLabors.Fonts.RendererOptions(font, options.DpiX, options.DpiY, location)
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
index c53a97515..8aadb85bf 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
@@ -12,8 +12,6 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -37,7 +35,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 using (Graphics graphics = Graphics.FromImage(destination))
                 {
                     graphics.SmoothingMode = SmoothingMode.AntiAlias;
-                    graphics.FillPolygon(Brushes.HotPink,
+                    graphics.FillPolygon(System.Drawing.Brushes.HotPink,
                     new[]
                         {
                         new Point(10, 10),
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
index 7bd55e905..643e4ac9a 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
@@ -10,8 +10,6 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 using CoreRectangle = SixLabors.Primitives.Rectangle;
 using CoreSize = SixLabors.Primitives.Size;
 
@@ -31,7 +29,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 {
                     graphics.InterpolationMode = InterpolationMode.Default;
                     graphics.SmoothingMode = SmoothingMode.AntiAlias;
-                    graphics.FillRectangle(Brushes.HotPink, new Rectangle(10, 10, 190, 140));
+                    graphics.FillRectangle(System.Drawing.Brushes.HotPink, new Rectangle(10, 10, 190, 140));
                 }
                 return destination.Size;
             }
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs b/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
index 059398c6c..5f8f2ff06 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
@@ -11,15 +11,11 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-
-using CoreBrushes = SixLabors.ImageSharp.Processing.Drawing.Brushes.Brushes;
 
+using CoreBrushes = SixLabors.ImageSharp.Processing.Brushes;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
-
-
     public class FillWithPattern
     {
         [Benchmark(Baseline = true, Description = "System.Drawing Fill with Pattern")]
@@ -30,7 +26,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 using (Graphics graphics = Graphics.FromImage(destination))
                 {
                     graphics.SmoothingMode = SmoothingMode.AntiAlias;
-                    HatchBrush brush = new HatchBrush(HatchStyle.BackwardDiagonal, System.Drawing.Color.HotPink);
+                    HatchBrush brush = new HatchBrush(HatchStyle.BackwardDiagonal, Color.HotPink);
                     graphics.FillRectangle(brush, new Rectangle(0, 0, 800, 800)); // can't find a way to flood fill with a brush
                 }
                 using (MemoryStream ms = new MemoryStream())
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
index 67faa7213..3f67f175f 100644
--- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
+++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
-    <PackageReference Include="Colourful" Version="1.2.2" />
+    <PackageReference Include="Colourful" Version="2.0.0" />
     <PackageReference Include="SixLabors.Shapes.Text" Version="1.0.0-dev000081" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
   </ItemGroup>
diff --git a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
index df7e5b413..a70d9fc11 100644
--- a/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
+++ b/tests/ImageSharp.Benchmarks/PixelBlenders/PorterDuffBulkVsPixel.cs
@@ -3,6 +3,8 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
+using System.Buffers;
+
 namespace SixLabors.ImageSharp.Benchmarks
 {
     using System;
@@ -24,7 +26,7 @@ namespace SixLabors.ImageSharp.Benchmarks
             Guard.MustBeGreaterThanOrEqualTo(source.Length, destination.Length, nameof(source.Length));
             Guard.MustBeGreaterThanOrEqualTo(amount.Length, destination.Length, nameof(amount.Length));
 
-            using (IBuffer<Vector4> buffer = Configuration.Default.MemoryAllocator.Allocate<Vector4>(destination.Length * 3))
+            using (IMemoryOwner<Vector4> buffer = Configuration.Default.MemoryAllocator.Allocate<Vector4>(destination.Length * 3))
             {
                 Span<Vector4> destinationSpan = buffer.Slice(0, destination.Length);
                 Span<Vector4> backgroundSpan = buffer.Slice(destination.Length, destination.Length);
@@ -59,7 +61,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (var image = new Image<Rgba32>(800, 800))
             {
-                using (IBuffer<float> amounts = Configuration.Default.MemoryAllocator.Allocate<float>(image.Width))
+                using (IMemoryOwner<float> amounts = Configuration.Default.MemoryAllocator.Allocate<float>(image.Width))
                 {
                     amounts.GetSpan().Fill(1);
 
@@ -80,7 +82,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         {
             using (var image = new Image<Rgba32>(800, 800))
             {
-                using (IBuffer<float> amounts = Configuration.Default.MemoryAllocator.Allocate<float>(image.Width))
+                using (IMemoryOwner<float> amounts = Configuration.Default.MemoryAllocator.Allocate<float>(image.Width))
                 {
                     amounts.GetSpan().Fill(1);
                     Buffer2D<Rgba32> pixels = image.GetRootFramePixelBuffer();
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Crop.cs b/tests/ImageSharp.Benchmarks/Samplers/Crop.cs
index d5ac6a6f1..240a277cf 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Crop.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Crop.cs
@@ -12,7 +12,6 @@ namespace SixLabors.ImageSharp.Benchmarks
 
     using BenchmarkDotNet.Attributes;
     using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
 
     using CoreSize = SixLabors.Primitives.Size;
 
diff --git a/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs b/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
index 569b5bc44..006d1b639 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
@@ -12,7 +12,6 @@ namespace SixLabors.ImageSharp.Benchmarks
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Convolution;
 
     using CoreImage = ImageSharp.Image;
 
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index ce17481c4..f7f54f4eb 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -3,6 +3,8 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
+using System.Buffers;
+
 namespace SixLabors.ImageSharp.Benchmarks
 {
 
@@ -16,7 +18,7 @@ namespace SixLabors.ImageSharp.Benchmarks
 
     using SixLabors.Memory;
     using SixLabors.Primitives;
-    using SixLabors.ImageSharp.Processing.Overlays.Processors;
+    using SixLabors.ImageSharp.Processing.Processors.Overlays;
     using SixLabors.ImageSharp.Processing.Processors;
 
     public class Glow : BenchmarkBase
@@ -102,7 +104,7 @@ namespace SixLabors.ImageSharp.Benchmarks
                 }
 
                 int width = maxX - minX;
-                using (IBuffer<TPixel> rowColors = Configuration.Default.MemoryAllocator.Allocate<TPixel>(width))
+                using (IMemoryOwner<TPixel> rowColors = Configuration.Default.MemoryAllocator.Allocate<TPixel>(width))
                 {
                     Buffer2D<TPixel> sourcePixels = source.PixelBuffer;
                     rowColors.GetSpan().Fill(glowColor);
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Resize.cs b/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
index 0a4730686..d4506fc6a 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
@@ -3,21 +3,38 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace SixLabors.ImageSharp.Benchmarks
-{
-    using System.Drawing;
-    using System.Drawing.Drawing2D;
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+using BenchmarkDotNet.Attributes;
 
-    using BenchmarkDotNet.Attributes;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 
-    using SixLabors.ImageSharp.PixelFormats;
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
+using CoreSize = SixLabors.Primitives.Size;
+
+namespace SixLabors.ImageSharp.Benchmarks
+{
+    using System.Threading.Tasks;
 
-    using CoreSize = SixLabors.Primitives.Size;
+    using SixLabors.ImageSharp.Formats.Jpeg;
 
+    [Config(typeof(Config.ShortClr))]
     public class Resize : BenchmarkBase
     {
+        private readonly Configuration configuration = new Configuration(new JpegConfigurationModule());
+
+        [Params(false, true)]
+        public bool EnableParallelExecution { get; set; }
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            this.configuration.ParallelOptions.MaxDegreeOfParallelism =
+                this.EnableParallelExecution ? Environment.ProcessorCount : 1;
+        }
+
         [Benchmark(Baseline = true, Description = "System.Drawing Resize")]
         public Size ResizeSystemDrawing()
         {
@@ -41,7 +58,7 @@ namespace SixLabors.ImageSharp.Benchmarks
         [Benchmark(Description = "ImageSharp Resize")]
         public CoreSize ResizeCore()
         {
-            using (Image<Rgba32> image = new Image<Rgba32>(2000, 2000))
+            using (var image = new Image<Rgba32>(this.configuration, 2000, 2000))
             {
                 image.Mutate(x => x.Resize(400, 400));
                 return new CoreSize(image.Width, image.Height);
diff --git a/tests/ImageSharp.Sandbox46/Program.cs b/tests/ImageSharp.Sandbox46/Program.cs
index f3875e24a..fa1d63878 100644
--- a/tests/ImageSharp.Sandbox46/Program.cs
+++ b/tests/ImageSharp.Sandbox46/Program.cs
@@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.Sandbox46
             foreach (object[] data in JpegProfilingBenchmarks.DecodeJpegData)
             {
                 string fileName = (string)data[0];
-                benchmarks.DecodeJpeg_Original(fileName);
+                benchmarks.DecodeJpeg(fileName);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs
index 366266652..974099991 100644
--- a/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs
+++ b/tests/ImageSharp.Tests/Advanced/AdvancedImageExtensionsTests.cs
@@ -59,7 +59,7 @@ namespace SixLabors.ImageSharp.Tests.Advanced
 
                     Memory<TPixel> externalMemory = managerOfExeternalMemory.Memory;
 
-                    using (Image<TPixel> image1 = Image.WrapMemory(externalMemory, image0.Width, image0.Height))
+                    using (var image1 = Image.WrapMemory(externalMemory, image0.Width, image0.Height))
                     {
                         Memory<TPixel> internalMemory = image1.GetPixelMemory();
                         Assert.Equal(targetBuffer.Length, internalMemory.Length);
@@ -72,7 +72,6 @@ namespace SixLabors.ImageSharp.Tests.Advanced
                     image0.ComparePixelBufferTo(externalMemory.Span);
                 }
             }
-
         }
 
         [Theory]
diff --git a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
index f0ac56f4f..759d0f12f 100644
--- a/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
+++ b/tests/ImageSharp.Tests/Colorspaces/ColorSpaceEqualityTests.cs
@@ -19,18 +19,18 @@ namespace SixLabors.ImageSharp.Tests.Colorspaces
         internal static readonly Dictionary<string, IColorVector> EmptyDataLookup =
             new Dictionary<string, IColorVector>
                 {
-                    {nameof( CieLab), CieLab.Empty },
-                    {nameof( CieLch), CieLch.Empty },
-                    {nameof( CieLchuv), CieLchuv.Empty },
-                    {nameof( CieLuv), CieLuv.Empty },
-                    {nameof( CieXyz), CieXyz.Empty },
-                    {nameof( CieXyy), CieXyy.Empty },
-                    {nameof( Hsl), Hsl.Empty },
-                    {nameof( HunterLab), HunterLab.Empty },
-                    {nameof( Lms), Lms.Empty },
-                    {nameof( LinearRgb), LinearRgb.Empty },
-                    {nameof( Rgb), Rgb.Empty },
-                    {nameof( YCbCr), YCbCr.Empty }
+                    {nameof( CieLab), default(CieLab) },
+                    {nameof( CieLch), default(CieLch) },
+                    {nameof( CieLchuv), default(CieLchuv) },
+                    {nameof( CieLuv), default(CieLuv) },
+                    {nameof( CieXyz), default(CieXyz) },
+                    {nameof( CieXyy), default(CieXyy) },
+                    {nameof( Hsl), default(Hsl) },
+                    {nameof( HunterLab), default(HunterLab) },
+                    {nameof( Lms), default(Lms) },
+                    {nameof( LinearRgb), default(LinearRgb) },
+                    {nameof( Rgb), default(Rgb) },
+                    {nameof( YCbCr), default(YCbCr) }
                 };
 
         public static readonly IEnumerable<object[]> EmptyData = EmptyDataLookup.Select(x => new [] { x.Key });
diff --git a/tests/ImageSharp.Tests/ComplexIntegrationTests.cs b/tests/ImageSharp.Tests/ComplexIntegrationTests.cs
index ed4bb6104..a260ec33c 100644
--- a/tests/ImageSharp.Tests/ComplexIntegrationTests.cs
+++ b/tests/ImageSharp.Tests/ComplexIntegrationTests.cs
@@ -1,6 +1,6 @@
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
index a5fda7958..443b49c7c 100644
--- a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
@@ -5,8 +5,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Memory;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
index d0087b1d2..40ad92adc 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
@@ -5,13 +5,13 @@ using System;
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.Primitives;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
     public class DrawImageTest : FileTestBase
     {
diff --git a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
index c1865e930..96af63fd5 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
@@ -4,9 +4,6 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/FillEllipticGradientBrushTest.cs b/tests/ImageSharp.Tests/Drawing/FillEllipticGradientBrushTest.cs
index 7c9fa2088..fa4d4a709 100644
--- a/tests/ImageSharp.Tests/Drawing/FillEllipticGradientBrushTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillEllipticGradientBrushTest.cs
@@ -5,8 +5,6 @@ using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/FillLinearGradientBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillLinearGradientBrushTests.cs
index 9e7af1e57..3522ade7c 100644
--- a/tests/ImageSharp.Tests/Drawing/FillLinearGradientBrushTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillLinearGradientBrushTests.cs
@@ -8,8 +8,6 @@ using System.Text;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes;
 
 using Xunit;
 // ReSharper disable InconsistentNaming
diff --git a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
index 29b78220d..f13f808b6 100644
--- a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
@@ -5,15 +5,11 @@ using System;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Transforms;
+using SixLabors.Memory;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
 {
-    using SixLabors.Memory;
-
     public class FillPatternBrushTests : FileTestBase
     {
         private void Test(string name, Rgba32 background, IBrush<Rgba32> brush, Rgba32[,] expectedPattern)
diff --git a/tests/ImageSharp.Tests/Drawing/FillRadialGradientBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillRadialGradientBrushTests.cs
index eafbf3df1..7461347de 100644
--- a/tests/ImageSharp.Tests/Drawing/FillRadialGradientBrushTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillRadialGradientBrushTests.cs
@@ -1,13 +1,10 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes.GradientBrushes;
 
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
 {
-    using System;
 
     using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
diff --git a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
index c664bcf9c..dc7da3543 100644
--- a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
@@ -5,20 +5,16 @@ using System.Numerics;
 
 using Moq;
 using System;
-using SixLabors.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
 using SixLabors.Primitives;
 using Xunit;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
 {
-    
+
 
     public class FillRegionProcessorTests
     {
diff --git a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
index 58fd4c767..45f1340be 100644
--- a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
@@ -3,9 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Shapes;
 using Xunit;
 // ReSharper disable InconsistentNaming
@@ -83,6 +81,23 @@ namespace SixLabors.ImageSharp.Tests.Drawing
             provider.RunValidatingProcessorTest(c => c.Fill(color, region), testDetails, ImageComparer.Exact);
         }
 
+        [Theory]
+        [WithSolidFilledImages(16, 16, "Red", PixelTypes.Rgba32, 5, 7, 3, 8)]
+        [WithSolidFilledImages(16, 16, "Red", PixelTypes.Rgba32, 8, 5, 6, 4)]
+        public void FillRegion_WorksOnWrappedMemoryImage<TPixel>(TestImageProvider<TPixel> provider, int x0, int y0, int w, int h)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            FormattableString testDetails = $"(x{x0},y{y0},w{w},h{h})";
+            var region = new RectangleF(x0, y0, w, h);
+            TPixel color = TestUtils.GetPixelOfNamedColor<TPixel>("Blue");
+
+            provider.RunValidatingProcessorTestOnWrappedMemoryImage(
+                c => c.Fill(color, region),
+                testDetails,
+                ImageComparer.Exact,
+                useReferenceOutputFrom: nameof(this.FillRegion));
+        }
+
         public static readonly TheoryData<bool, string, float, PixelBlenderMode, float> BlendData =
             new TheoryData<bool, string, float, PixelBlenderMode, float>()
                 {
diff --git a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
index ecd1c06e8..d3b39709a 100644
--- a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
@@ -4,9 +4,6 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Shapes;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/LineTests.cs b/tests/ImageSharp.Tests/Drawing/LineTests.cs
index 28b59746f..747c75cde 100644
--- a/tests/ImageSharp.Tests/Drawing/LineTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineTests.cs
@@ -5,9 +5,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Overlays;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawPathCollection.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawPathCollection.cs
index ecdfd03e5..326517a4e 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawPathCollection.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawPathCollection.cs
@@ -4,10 +4,8 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
index 1a402c5b7..e72fbbdf2 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
@@ -4,9 +4,8 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPathCollection.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPathCollection.cs
index b728ea7bf..ec7a5a20c 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillPathCollection.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPathCollection.cs
@@ -4,9 +4,8 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
index 0c0fb58fa..d8927a468 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
@@ -4,9 +4,8 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
index 4c232b452..8f648e425 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
@@ -3,9 +3,8 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Drawing;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing.Paths
diff --git a/tests/ImageSharp.Tests/Drawing/PolygonTests.cs b/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
index c7a0531c9..f9a41baba 100644
--- a/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
@@ -6,8 +6,6 @@ using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Drawing
diff --git a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
index 6ce1e2da3..2dcd8b3d3 100644
--- a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
@@ -3,8 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
index 7175e7a65..23acc1a44 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -4,8 +4,6 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Shapes;
 using Xunit;
 
@@ -40,6 +38,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing
             }
         }
 
+
         [Theory]
         [WithBlankImages(500, 500, PixelTypes.Rgba32)]
         public void OverlayByFilledPolygonOpacity<TPixel>(TestImageProvider<TPixel> provider)
diff --git a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
index 42b0dc1e6..c8d3fe1bc 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
@@ -5,8 +5,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Shapes;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs b/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs
index f43428d49..7ec63c439 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
index b39cc4632..e42b4b481 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
@@ -6,9 +6,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Overlays;
 using SixLabors.Shapes;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
index 2a03eb415..76f40e0ac 100644
--- a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
+++ b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
@@ -4,11 +4,8 @@
 using System.Numerics;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing.Brushes;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Drawing.Processors;
-using SixLabors.ImageSharp.Processing.Text;
-using SixLabors.ImageSharp.Processing.Text.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 using SixLabors.Primitives;
 using SixLabors.Shapes;
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs
index 0885dd183..44bb160ce 100644
--- a/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Text/DrawTextOnImageTests.cs
@@ -7,8 +7,6 @@ using System.Text;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing.Pens;
-using SixLabors.ImageSharp.Processing.Text;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
diff --git a/tests/ImageSharp.Tests/Drawing/Text/TextGraphicsOptionsTests.cs b/tests/ImageSharp.Tests/Drawing/Text/TextGraphicsOptionsTests.cs
index d710229ff..0885611c6 100644
--- a/tests/ImageSharp.Tests/Drawing/Text/TextGraphicsOptionsTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Text/TextGraphicsOptionsTests.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using SixLabors.ImageSharp.Processing.Text;
+using SixLabors.ImageSharp.Processing;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
index b994af056..09c3d1545 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
@@ -10,17 +10,25 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
+    using SixLabors.ImageSharp.MetaData;
     using static TestImages.Bmp;
 
     public class BmpDecoderTests
     {
-        public const PixelTypes CommonNonDefaultPixelTypes =
-            PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.RgbaVector;
+        public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.RgbaVector;
 
         public static readonly string[] AllBmpFiles =
-            {
-                Car, F, NegHeight, CoreHeader, V5Header, RLE, RLEInverted, Bit8, Bit8Inverted, Bit16, Bit16Inverted
-            };
+        {
+            Car, F, NegHeight, CoreHeader, V5Header, RLE, RLEInverted, Bit8, Bit8Inverted, Bit16, Bit16Inverted
+        };
+
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Bmp.Car, 3780, 3780 , PixelResolutionUnit.PixelsPerMeter },
+            { TestImages.Bmp.V5Header, 3780, 3780 , PixelResolutionUnit.PixelsPerMeter },
+            { TestImages.Bmp.RLE, 2835, 2835, PixelResolutionUnit.PixelsPerMeter }
+        };
 
         [Theory]
         [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Rgba32)]
@@ -64,5 +72,39 @@ namespace SixLabors.ImageSharp.Tests
                 Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
             }
         }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Decode_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new BmpDecoder();
+                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                {
+                    ImageMetaData meta = image.MetaData;
+                    Assert.Equal(xResolution, meta.HorizontalResolution);
+                    Assert.Equal(yResolution, meta.VerticalResolution);
+                    Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Identify_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new BmpDecoder();
+                IImageInfo image = decoder.Identify(Configuration.Default, stream);
+                ImageMetaData meta = image.MetaData;
+                Assert.Equal(xResolution, meta.HorizontalResolution);
+                Assert.Equal(yResolution, meta.VerticalResolution);
+                Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
index 8d29536b2..d887d23ad 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.IO;
 using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using Xunit;
@@ -12,11 +14,19 @@ namespace SixLabors.ImageSharp.Tests
     public class BmpEncoderTests : FileTestBase
     {
         public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel =
-            new TheoryData<BmpBitsPerPixel>
-                {
-                    BmpBitsPerPixel.Pixel24,
-                    BmpBitsPerPixel.Pixel32
-                };
+        new TheoryData<BmpBitsPerPixel>
+        {
+            BmpBitsPerPixel.Pixel24,
+            BmpBitsPerPixel.Pixel32
+        };
+
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Bmp.Car, 3780, 3780 , PixelResolutionUnit.PixelsPerMeter },
+            { TestImages.Bmp.V5Header, 3780, 3780 , PixelResolutionUnit.PixelsPerMeter },
+            { TestImages.Bmp.RLE, 2835, 2835, PixelResolutionUnit.PixelsPerMeter }
+        };
 
         public BmpEncoderTests(ITestOutputHelper output)
         {
@@ -25,6 +35,31 @@ namespace SixLabors.ImageSharp.Tests
 
         private ITestOutputHelper Output { get; }
 
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var options = new BmpEncoder();
+
+            var testFile = TestFile.Create(imagePath);
+            using (Image<Rgba32> input = testFile.CreateImage())
+            {
+                using (var memStream = new MemoryStream())
+                {
+                    input.Save(memStream, options);
+
+                    memStream.Position = 0;
+                    using (var output = Image.Load<Rgba32>(memStream))
+                    {
+                        ImageMetaData meta = output.MetaData;
+                        Assert.Equal(xResolution, meta.HorizontalResolution);
+                        Assert.Equal(yResolution, meta.VerticalResolution);
+                        Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                    }
+                }
+            }
+        }
+
         [Theory]
         [WithTestPatternImages(nameof(BitsPerPixel), 24, 24, PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.Rgb24)]
         public void Encode_IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provider, BmpBitsPerPixel bitsPerPixel)
@@ -44,10 +79,10 @@ namespace SixLabors.ImageSharp.Tests
         {
             TestBmpEncoderCore(provider, bitsPerPixel);
         }
-        
+
         private static void TestBmpEncoderCore<TPixel>(TestImageProvider<TPixel> provider, BmpBitsPerPixel bitsPerPixel)
             where TPixel : struct, IPixel<TPixel>
-        {   
+        {
             using (Image<TPixel> image = provider.GetImage())
             {
                 // there is no alpha in bmp!
diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
index cd3b72e27..23b806767 100644
--- a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
+++ b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests
 
     using SixLabors.Memory;
     using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Quantization;
+    using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
     public class GeneralFormatTests : FileTestBase
     {
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
index ceb60ae5c..6d2a74c03 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
@@ -4,7 +4,6 @@
 using System.Text;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
 using Xunit;
 using System.IO;
 using SixLabors.ImageSharp.Advanced;
@@ -13,7 +12,7 @@ using SixLabors.ImageSharp.Advanced;
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
     using System.Collections.Generic;
-
+    using SixLabors.ImageSharp.MetaData;
     using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
     public class GifDecoderTests
@@ -21,31 +20,43 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
         private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;
 
         public static readonly string[] MultiFrameTestFiles =
-            {
-                TestImages.Gif.Giphy, TestImages.Gif.Kumin
-            };
+        {
+            TestImages.Gif.Giphy, TestImages.Gif.Kumin
+        };
 
         public static readonly string[] BasicVerificationFiles =
-            {
-                TestImages.Gif.Cheers,
-                TestImages.Gif.Rings,
+        {
+            TestImages.Gif.Cheers,
+            TestImages.Gif.Rings,
 
-                // previously DecodeBadApplicationExtensionLength:
-                TestImages.Gif.Issues.BadAppExtLength,
-                TestImages.Gif.Issues.BadAppExtLength_2,
+            // previously DecodeBadApplicationExtensionLength:
+            TestImages.Gif.Issues.BadAppExtLength,
+            TestImages.Gif.Issues.BadAppExtLength_2,
 
-                // previously DecodeBadDescriptorDimensionsLength:
-                TestImages.Gif.Issues.BadDescriptorWidth
-            };
+            // previously DecodeBadDescriptorDimensionsLength:
+            TestImages.Gif.Issues.BadDescriptorWidth
+        };
+
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Gif.Rings, (int)ImageMetaData.DefaultHorizontalResolution, (int)ImageMetaData.DefaultVerticalResolution , PixelResolutionUnit.PixelsPerInch},
+            { TestImages.Gif.Ratio1x4, 1, 4 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Gif.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
+        };
 
         private static readonly Dictionary<string, int> BasicVerificationFrameCount =
-            new Dictionary<string, int>
-                {
-                    [TestImages.Gif.Cheers] = 93,
-                    [TestImages.Gif.Issues.BadDescriptorWidth] = 36,
-            };
+        new Dictionary<string, int>
+        {
+            [TestImages.Gif.Cheers] = 93,
+            [TestImages.Gif.Issues.BadDescriptorWidth] = 36,
+        };
 
-        public static readonly string[] BadAppExtFiles = { TestImages.Gif.Issues.BadAppExtLength, TestImages.Gif.Issues.BadAppExtLength_2 };
+        public static readonly string[] BadAppExtFiles =
+        {
+            TestImages.Gif.Issues.BadAppExtLength,
+            TestImages.Gif.Issues.BadAppExtLength_2
+        };
 
         [Theory]
         [WithFileCollection(nameof(MultiFrameTestFiles), PixelTypes.Rgba32)]
@@ -59,6 +70,40 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
             }
         }
 
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Decode_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new GifDecoder();
+                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                {
+                    ImageMetaData meta = image.MetaData;
+                    Assert.Equal(xResolution, meta.HorizontalResolution);
+                    Assert.Equal(yResolution, meta.VerticalResolution);
+                    Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Identify_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new GifDecoder();
+                IImageInfo image = decoder.Identify(Configuration.Default, stream);
+                ImageMetaData meta = image.MetaData;
+                Assert.Equal(xResolution, meta.HorizontalResolution);
+                Assert.Equal(yResolution, meta.VerticalResolution);
+                Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+            }
+        }
+
         [Theory]
         [WithFile(TestImages.Gif.Trans, TestPixelTypes)]
         public void GifDecoder_IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provider)
@@ -88,7 +133,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
                 image.CompareFirstFrameToReferenceOutput(ImageComparer.Exact, provider);
             }
         }
-        
+
         [Fact]
         public void Decode_IgnoreMetadataIsFalse_CommentsAreRead()
         {
@@ -169,7 +214,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
         [InlineData(TestImages.Gif.Trans, 8)]
         public void DetectPixelSize(string imagePath, int expectedPixelSize)
         {
-            TestFile testFile = TestFile.Create(imagePath);
+            var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
                 Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
index 93cfaff7f..e9104ef8d 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -5,7 +5,7 @@ using System.IO;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using Xunit;
 // ReSharper disable InconsistentNaming
@@ -17,6 +17,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
         private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;
         private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.001F);
 
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Gif.Rings, (int)ImageMetaData.DefaultHorizontalResolution, (int)ImageMetaData.DefaultVerticalResolution , PixelResolutionUnit.PixelsPerInch},
+            { TestImages.Gif.Ratio1x4, 1, 4 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Gif.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
+        };
+
         [Theory]
         [WithTestPatternImages(100, 100, TestPixelTypes)]
         public void EncodeGeneratedPatterns<TPixel>(TestImageProvider<TPixel> provider)
@@ -43,6 +51,34 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
             }
         }
 
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var options = new GifEncoder()
+            {
+                IgnoreMetadata = false
+            };
+
+            var testFile = TestFile.Create(imagePath);
+            using (Image<Rgba32> input = testFile.CreateImage())
+            {
+                using (var memStream = new MemoryStream())
+                {
+                    input.Save(memStream, options);
+
+                    memStream.Position = 0;
+                    using (var output = Image.Load<Rgba32>(memStream))
+                    {
+                        ImageMetaData meta = output.MetaData;
+                        Assert.Equal(xResolution, meta.HorizontalResolution);
+                        Assert.Equal(yResolution, meta.VerticalResolution);
+                        Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                    }
+                }
+            }
+        }
+
         [Fact]
         public void Encode_IgnoreMetadataIsFalse_CommentsAreWritten()
         {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JFifMarkerTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JFifMarkerTests.cs
index 332899e8d..b2dc3534d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JFifMarkerTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JFifMarkerTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-
+using SixLabors.ImageSharp.MetaData;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             Assert.True(isJFif);
             Assert.Equal(1, marker.MajorVersion);
             Assert.Equal(1, marker.MinorVersion);
-            Assert.Equal(1, marker.DensityUnits);
+            Assert.Equal(PixelResolutionUnit.PixelsPerInch, marker.DensityUnits);
             Assert.Equal(96, marker.XDensity);
             Assert.Equal(96, marker.YDensity);
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index aed650b8e..8048dd424 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -290,7 +290,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
 
                 // no need to dispose when buffer is not array owner
-                buffers[i] = new Buffer2D<float>(new BasicArrayBuffer<float>(values), values.Length, 1);
+                var source = new MemorySource<float>(new BasicArrayBuffer<float>(values), true);
+                buffers[i] = new Buffer2D<float>(source, values.Length, 1);
             }
             return new JpegColorConverter.ComponentValues(buffers, 0);
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
index e266554d1..73167a4b7 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using SixLabors.Memory;
+
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 // ReSharper disable InconsistentNaming
@@ -13,33 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     {
         [Theory]
         [WithFileCollection(nameof(BaselineTestJpegs), PixelTypes.Rgba32)]
-        public void DecodeBaselineJpeg_Orig<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            if (SkipTest(provider))
-            {
-                return;
-            }
-
-            // For 32 bit test enviroments:
-            provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
-
-            using (Image<TPixel> image = provider.GetImage(GolangJpegDecoder))
-            {
-                image.DebugSave(provider);
-                provider.Utility.TestName = DecodeBaselineJpegOutputName;
-                image.CompareToReferenceOutput(
-                    this.GetImageComparer(provider),
-                    provider,
-                    appendPixelTypeToFileName: false);
-            }
-
-            provider.Configuration.MemoryAllocator.ReleaseRetainedResources();
-        }
-
-        [Theory]
-        [WithFileCollection(nameof(BaselineTestJpegs), PixelTypes.Rgba32)]
-        public void DecodeBaselineJpeg_PdfJs<TPixel>(TestImageProvider<TPixel> provider)
+        public void DecodeBaselineJpeg<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
             if (SkipTest(provider))
@@ -48,7 +22,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 return;
             }
 
-            using (Image<TPixel> image = provider.GetImage(PdfJsJpegDecoder))
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
             {
                 image.DebugSave(provider);
 
@@ -62,28 +36,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         [Theory]
         [WithFile(TestImages.Jpeg.Issues.CriticalEOF214, PixelTypes.Rgba32)]
-        public void DecodeBaselineJpeg_CriticalEOF_ShouldThrow_Golang<TPixel>(TestImageProvider<TPixel> provider)
+        public void DecodeBaselineJpeg_CriticalEOF_ShouldThrow<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
             // TODO: We need a public ImageDecoderException class in ImageSharp!
-            Assert.ThrowsAny<Exception>(() => provider.GetImage(GolangJpegDecoder));
-        }
-
-        [Theory]
-        [WithFile(TestImages.Jpeg.Issues.CriticalEOF214, PixelTypes.Rgba32)]
-        public void DecodeBaselineJpeg_CriticalEOF_ShouldThrow_PdfJs<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            // TODO: We need a public ImageDecoderException class in ImageSharp!
-            Assert.ThrowsAny<Exception>(() => provider.GetImage(PdfJsJpegDecoder));
-        }
-
-        [Theory(Skip = "Debug only, enable manually!")]
-        [WithFileCollection(nameof(BaselineTestJpegs), PixelTypes.Rgba32)]
-        public void CompareJpegDecoders_Baseline<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            this.CompareJpegDecodersImpl(provider, DecodeBaselineJpegOutputName);
+            Assert.ThrowsAny<Exception>(() => provider.GetImage(JpegDecoder));
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.MetaData.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.MetaData.cs
index 10b098d92..2e67c06c1 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.MetaData.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.MetaData.cs
@@ -15,34 +15,43 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     using System.Runtime.CompilerServices;
 
     using SixLabors.ImageSharp.Formats.Jpeg;
+    using SixLabors.ImageSharp.MetaData;
 
     public partial class JpegDecoderTests
     {
         // TODO: A JPEGsnoop & metadata expert should review if the Exif/Icc expectations are correct. 
         // I'm seeing several entries with Exif-related names in images where we do not decode an exif profile. (- Anton)
         public static readonly TheoryData<bool, string, int, bool, bool> MetaDataTestData =
-            new TheoryData<bool, string, int, bool, bool>
-                {
-                    { false, TestImages.Jpeg.Progressive.Progress, 24, false, false },
-                    { false, TestImages.Jpeg.Progressive.Fb, 24, false, true },
-                    { false, TestImages.Jpeg.Baseline.Cmyk, 32, false, true },
-                    { false, TestImages.Jpeg.Baseline.Ycck, 32, true, true },
-                    { false, TestImages.Jpeg.Baseline.Jpeg400, 8, false, false },
-                    { false, TestImages.Jpeg.Baseline.Snake, 24, true, true },
-                    { false, TestImages.Jpeg.Baseline.Jpeg420Exif, 24, true, false },
-
-                    { true, TestImages.Jpeg.Progressive.Progress, 24, false, false },
-                    { true, TestImages.Jpeg.Progressive.Fb, 24, false, true },
-                    { true, TestImages.Jpeg.Baseline.Cmyk, 32, false, true },
-                    { true, TestImages.Jpeg.Baseline.Ycck, 32, true, true },
-                    { true, TestImages.Jpeg.Baseline.Jpeg400, 8, false, false },
-                    { true, TestImages.Jpeg.Baseline.Snake, 24, true, true },
-                    { true, TestImages.Jpeg.Baseline.Jpeg420Exif, 24, true, false },
-                };
+        new TheoryData<bool, string, int, bool, bool>
+        {
+            { false, TestImages.Jpeg.Progressive.Progress, 24, false, false },
+            { false, TestImages.Jpeg.Progressive.Fb, 24, false, true },
+            { false, TestImages.Jpeg.Baseline.Cmyk, 32, false, true },
+            { false, TestImages.Jpeg.Baseline.Ycck, 32, true, true },
+            { false, TestImages.Jpeg.Baseline.Jpeg400, 8, false, false },
+            { false, TestImages.Jpeg.Baseline.Snake, 24, true, true },
+            { false, TestImages.Jpeg.Baseline.Jpeg420Exif, 24, true, false },
+
+            { true, TestImages.Jpeg.Progressive.Progress, 24, false, false },
+            { true, TestImages.Jpeg.Progressive.Fb, 24, false, true },
+            { true, TestImages.Jpeg.Baseline.Cmyk, 32, false, true },
+            { true, TestImages.Jpeg.Baseline.Ycck, 32, true, true },
+            { true, TestImages.Jpeg.Baseline.Jpeg400, 8, false, false },
+            { true, TestImages.Jpeg.Baseline.Snake, 24, true, true },
+            { true, TestImages.Jpeg.Baseline.Jpeg420Exif, 24, true, false },
+        };
+
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Jpeg.Baseline.Ratio1x1, 1, 1 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Jpeg.Baseline.Snake, 300, 300 , PixelResolutionUnit.PixelsPerInch},
+            { TestImages.Jpeg.Baseline.GammaDalaiLamaGray, 72, 72, PixelResolutionUnit.PixelsPerInch }
+        };
 
         [Theory]
         [MemberData(nameof(MetaDataTestData))]
-        public void MetaDataIsParsedCorrectly_Orig(
+        public void MetaDataIsParsedCorrectly(
             bool useIdentify,
             string imagePath,
             int expectedPixelSize,
@@ -51,7 +60,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         {
             TestMetaDataImpl(
                 useIdentify,
-                GolangJpegDecoder,
+                JpegDecoder,
                 imagePath,
                 expectedPixelSize,
                 exifProfilePresent,
@@ -59,21 +68,37 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         }
 
         [Theory]
-        [MemberData(nameof(MetaDataTestData))]
-        public void MetaDataIsParsedCorrectly_PdfJs(
-            bool useIdentify,
-            string imagePath,
-            int expectedPixelSize,
-            bool exifProfilePresent,
-            bool iccProfilePresent)
+        [MemberData(nameof(RatioFiles))]
+        public void Decode_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
         {
-            TestMetaDataImpl(
-                useIdentify,
-                PdfJsJpegDecoder,
-                imagePath,
-                expectedPixelSize,
-                exifProfilePresent,
-                iccProfilePresent);
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new JpegDecoder();
+                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                {
+                    ImageMetaData meta = image.MetaData;
+                    Assert.Equal(xResolution, meta.HorizontalResolution);
+                    Assert.Equal(yResolution, meta.VerticalResolution);
+                    Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Identify_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new JpegDecoder();
+                IImageInfo image = decoder.Identify(Configuration.Default, stream);
+                ImageMetaData meta = image.MetaData;
+                Assert.Equal(xResolution, meta.HorizontalResolution);
+                Assert.Equal(yResolution, meta.VerticalResolution);
+                Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+            }
         }
 
         private static void TestImageInfo(string imagePath, IImageDecoder decoder, bool useIdentify, Action<IImageInfo> test)
@@ -82,8 +107,9 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
                 IImageInfo imageInfo = useIdentify
-                                           ? ((IImageInfoDetector)decoder).Identify(Configuration.Default, stream)
-                                           : decoder.Decode<Rgba32>(Configuration.Default, stream);
+                ? ((IImageInfoDetector)decoder).Identify(Configuration.Default, stream)
+                : decoder.Decode<Rgba32>(Configuration.Default, stream);
+
                 test(imageInfo);
             }
         }
@@ -141,7 +167,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                         }
                     });
         }
-        
+
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
@@ -166,13 +192,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
             }
         }
-        
+
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
         public void Decoder_Reads_Correct_Resolution_From_Jfif(bool useIdentify)
         {
-            TestImageInfo(TestImages.Jpeg.Baseline.Floorplan, DefaultJpegDecoder, useIdentify,
+            TestImageInfo(TestImages.Jpeg.Baseline.Floorplan, JpegDecoder, useIdentify,
                 imageInfo =>
                     {
                         Assert.Equal(300, imageInfo.MetaData.HorizontalResolution);
@@ -185,7 +211,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [InlineData(true)]
         public void Decoder_Reads_Correct_Resolution_From_Exif(bool useIdentify)
         {
-            TestImageInfo(TestImages.Jpeg.Baseline.Jpeg420Exif, DefaultJpegDecoder, useIdentify,
+            TestImageInfo(TestImages.Jpeg.Baseline.Jpeg420Exif, JpegDecoder, useIdentify,
                 imageInfo =>
                     {
                         Assert.Equal(72, imageInfo.MetaData.HorizontalResolution);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
index c793b4034..77bc9f540 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Linq;
-using SixLabors.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 // ReSharper disable InconsistentNaming
@@ -15,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         [Theory]
         [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
-        public void DecodeProgressiveJpeg_Orig<TPixel>(TestImageProvider<TPixel> provider)
+        public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
             if (SkipTest(provider))
@@ -24,41 +22,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 return;
             }
 
-            // Golang decoder is unable to decode these:
-            if (PdfJsOnly.Any(fn => fn.Contains(provider.SourceFileOrDescription)))
-            {
-                return;
-            }
-
-            // For 32 bit test enviroments:
-            provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
-
-            using (Image<TPixel> image = provider.GetImage(GolangJpegDecoder))
-            {
-                image.DebugSave(provider);
-
-                provider.Utility.TestName = DecodeProgressiveJpegOutputName;
-                image.CompareToReferenceOutput(
-                    this.GetImageComparer(provider),
-                    provider,
-                    appendPixelTypeToFileName: false);
-            }
-
-            provider.Configuration.MemoryAllocator.ReleaseRetainedResources();
-        }
-
-        [Theory]
-        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
-        public void DecodeProgressiveJpeg_PdfJs<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            if (SkipTest(provider))
-            {
-                // skipping to avoid OutOfMemoryException on CI
-                return;
-            }
-
-            using (Image<TPixel> image = provider.GetImage(PdfJsJpegDecoder))
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
             {
                 image.DebugSave(provider);
 
@@ -69,13 +33,5 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     appendPixelTypeToFileName: false);
             }
         }
-
-        [Theory(Skip = "Debug only, enable manually!")]
-        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
-        public void CompareJpegDecoders_Progressive<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            this.CompareJpegDecodersImpl(provider, DecodeProgressiveJpegOutputName);
-        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 41cc6db51..4ae955c32 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -2,14 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
@@ -64,19 +60,15 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         private ITestOutputHelper Output { get; }
 
-        private static GolangJpegDecoder GolangJpegDecoder => new GolangJpegDecoder();
-
-        private static PdfJsJpegDecoder PdfJsJpegDecoder => new PdfJsJpegDecoder();
-
-        private static JpegDecoder DefaultJpegDecoder => new JpegDecoder();
+        private static JpegDecoder JpegDecoder => new JpegDecoder();
 
         [Fact]
-        public void ParseStream_BasicPropertiesAreCorrect1_PdfJs()
+        public void ParseStream_BasicPropertiesAreCorrect()
         {
             byte[] bytes = TestFile.Create(TestImages.Jpeg.Progressive.Progress).Bytes;
             using (var ms = new MemoryStream(bytes))
             {
-                var decoder = new PdfJsJpegDecoderCore(Configuration.Default, new JpegDecoder());
+                var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder());
                 decoder.ParseStream(ms);
 
                 // I don't know why these numbers are different. All I know is that the decoder works
@@ -89,9 +81,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         public const string DecodeBaselineJpegOutputName = "DecodeBaselineJpeg";
 
         [Theory]
-        [WithFile(TestImages.Jpeg.Baseline.Calliphora, CommonNonDefaultPixelTypes, false)]
-        [WithFile(TestImages.Jpeg.Baseline.Calliphora, CommonNonDefaultPixelTypes, true)]
-        public void JpegDecoder_IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provider, bool useOldDecoder)
+        [WithFile(TestImages.Jpeg.Baseline.Calliphora, CommonNonDefaultPixelTypes)]
+        public void JpegDecoder_IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
             if (SkipTest(provider))
@@ -102,8 +93,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             // For 32 bit test enviroments:
             provider.Configuration.MemoryAllocator = ArrayPoolMemoryAllocator.CreateWithModeratePooling();
 
-            IImageDecoder decoder = useOldDecoder ? (IImageDecoder)GolangJpegDecoder : PdfJsJpegDecoder;
-            using (Image<TPixel> image = provider.GetImage(decoder))
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
             {
                 image.DebugSave(provider);
 
@@ -125,34 +115,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 appendPixelTypeToFileName: false
                 ).SingleOrDefault();
 
-            if (report != null && report.TotalNormalizedDifference.HasValue)
+            if (report?.TotalNormalizedDifference != null)
             {
                 return report.DifferencePercentageString;
             }
 
             return "0%";
         }
-
-        private void CompareJpegDecodersImpl<TPixel>(TestImageProvider<TPixel> provider, string testName)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            this.Output.WriteLine(provider.SourceFileOrDescription);
-            provider.Utility.TestName = testName;
-
-            using (Image<TPixel> image = provider.GetImage(GolangJpegDecoder))
-            {
-                string d = this.GetDifferenceInPercentageString(image, provider);
-
-                this.Output.WriteLine($"Difference using ORIGINAL decoder: {d}");
-            }
-
-            using (Image<TPixel> image = provider.GetImage(PdfJsJpegDecoder))
-            {
-                string d = this.GetDifferenceInPercentageString(image, provider);
-                this.Output.WriteLine($"Difference using PDFJS decoder: {d}");
-            }
-        }
-
+        
         // DEBUG ONLY!
         // The PDF.js output should be saved by "tests\ImageSharp.Tests\Formats\Jpg\pdfjs\jpeg-converter.htm"
         // into "\tests\Images\ActualOutput\JpegDecoderTests\"
@@ -175,7 +145,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
             using (Image<TPixel> expectedImage = provider.GetReferenceOutputImage<TPixel>(appendPixelTypeToFileName: false))
             using (var pdfJsOriginalResult = Image.Load(pdfJsOriginalResultPath))
-            using (var pdfJsPortResult = Image.Load(sourceBytes, PdfJsJpegDecoder))
+            using (var pdfJsPortResult = Image.Load(sourceBytes, JpegDecoder))
             {
                 ImageSimilarityReport originalReport = comparer.CompareImagesOrFrames(expectedImage, pdfJsOriginalResult);
                 ImageSimilarityReport portReport = comparer.CompareImagesOrFrames(expectedImage, pdfJsPortResult);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index 911812ebb..a31ae37b7 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
@@ -14,16 +15,24 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     public class JpegEncoderTests
     {
         public static readonly TheoryData<JpegSubsample, int> BitsPerPixel_Quality =
-            new TheoryData<JpegSubsample, int>
-                {
-                    { JpegSubsample.Ratio420, 40 },
-                    { JpegSubsample.Ratio420, 60 },
-                    { JpegSubsample.Ratio420, 100 },
+        new TheoryData<JpegSubsample, int>
+        {
+            { JpegSubsample.Ratio420, 40 },
+            { JpegSubsample.Ratio420, 60 },
+            { JpegSubsample.Ratio420, 100 },
 
-                    { JpegSubsample.Ratio444, 40 },
-                    { JpegSubsample.Ratio444, 60 },
-                    { JpegSubsample.Ratio444, 100 },
-                };
+            { JpegSubsample.Ratio444, 40 },
+            { JpegSubsample.Ratio444, 60 },
+            { JpegSubsample.Ratio444, 100 },
+        };
+
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Jpeg.Baseline.Ratio1x1, 1, 1 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Jpeg.Baseline.Snake, 300, 300 , PixelResolutionUnit.PixelsPerInch},
+            { TestImages.Jpeg.Baseline.GammaDalaiLamaGray, 72, 72, PixelResolutionUnit.PixelsPerInch }
+        };
 
         [Theory]
         [WithFile(TestImages.Png.CalliphoraPartial, nameof(BitsPerPixel_Quality), PixelTypes.Rgba32)]
@@ -82,10 +91,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 image.Mutate(c => c.MakeOpaque());
 
                 var encoder = new JpegEncoder()
-                                  {
-                                      Subsample = subsample,
-                                      Quality = quality
-                                  };
+                {
+                    Subsample = subsample,
+                    Quality = quality
+                };
                 string info = $"{subsample}-Q{quality}";
                 ImageComparer comparer = GetComparer(quality, subsample);
 
@@ -93,7 +102,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 image.VerifyEncoder(provider, "jpeg", info, encoder, comparer, referenceImageExtension: "png");
             }
         }
-        
 
         [Theory]
         [InlineData(false)]
@@ -104,7 +112,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             {
                 IgnoreMetadata = ignoreMetaData
             };
-            
+
             using (Image<Rgba32> input = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan).CreateImage())
             {
                 using (var memStream = new MemoryStream())
@@ -126,7 +134,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 }
             }
         }
-        
+
         [Fact]
         public void Quality_0_And_1_Are_Identical()
         {
@@ -172,5 +180,30 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 Assert.NotEqual(memStream0.ToArray(), memStream1.ToArray());
             }
         }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var options = new JpegEncoder();
+
+            var testFile = TestFile.Create(imagePath);
+            using (Image<Rgba32> input = testFile.CreateImage())
+            {
+                using (var memStream = new MemoryStream())
+                {
+                    input.Save(memStream, options);
+
+                    memStream.Position = 0;
+                    using (var output = Image.Load<Rgba32>(memStream))
+                    {
+                        ImageMetaData meta = output.MetaData;
+                        Assert.Equal(xResolution, meta.HorizontalResolution);
+                        Assert.Equal(yResolution, meta.VerticalResolution);
+                        Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegFileMarkerTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegFileMarkerTests.cs
new file mode 100644
index 000000000..42eea2708
--- /dev/null
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegFileMarkerTests.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Formats.Jpg
+{
+    public class JpegFileMarkerTests
+    {
+        [Fact]
+        public void MarkerConstructorAssignsProperties()
+        {
+            const byte app1 = JpegConstants.Markers.APP1;
+            const int position = 5;
+            var marker = new JpegFileMarker(app1, position);
+
+            Assert.Equal(app1, marker.Marker);
+            Assert.Equal(position, marker.Position);
+            Assert.False(marker.Invalid);
+            Assert.Equal(app1.ToString("X"), marker.ToString());
+        }
+    }
+}
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
index 843843f79..cfa421a82 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
@@ -48,7 +47,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             where TPixel : struct, IPixel<TPixel>
         {
             string imageFile = provider.SourceFileOrDescription;
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(imageFile))
             using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryAllocator, decoder))
             using (var imageFrame = new ImageFrame<Rgba32>(Configuration.Default, decoder.ImageWidth, decoder.ImageHeight))
             {
@@ -68,7 +67,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             where TPixel : struct, IPixel<TPixel>
         {
             string imageFile = provider.SourceFileOrDescription;
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(imageFile))
             using (var pp = new JpegImagePostProcessor(Configuration.Default.MemoryAllocator, decoder))
             using (var image = new Image<Rgba32>(decoder.ImageWidth, decoder.ImageHeight))
             {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
index b0f342f5a..32538090d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
@@ -8,8 +8,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 
 using Xunit;
@@ -34,18 +32,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             TestImages.Jpeg.Baseline.Jpeg444,
         };
 
-        //[Theory] // Benchmark, enable manually
-        //[MemberData(nameof(DecodeJpegData))]
-        public void DecodeJpeg_Original(string fileName)
-        {
-            this.DecodeJpegBenchmarkImpl(fileName, new GolangJpegDecoder());
-        }
-
         // [Theory] // Benchmark, enable manually
         // [MemberData(nameof(DecodeJpegData))]
-        public void DecodeJpeg_PdfJs(string fileName)
+        public void DecodeJpeg(string fileName)
         {
-            this.DecodeJpegBenchmarkImpl(fileName, new PdfJsJpegDecoder());
+            this.DecodeJpegBenchmarkImpl(fileName, new JpegDecoder());
         }
 
         private void DecodeJpegBenchmarkImpl(string fileName, IImageDecoder decoder)
@@ -70,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 ExecutionCount,
                 () =>
                     {
-                        Image<Rgba32> img = Image.Load<Rgba32>(bytes, decoder);
+                        var img = Image.Load<Rgba32>(bytes, decoder);
                     },
                 // ReSharper disable once ExplicitCallerInfoArgument
                 $"Decode {fileName}");
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs
index 827a459cd..3657110c6 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs
@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Text;
+
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 using SixLabors.Primitives;
 
@@ -30,53 +28,20 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [InlineData(TestImages.Jpeg.Baseline.Jpeg400, JpegColorSpace.Grayscale)]
         [InlineData(TestImages.Jpeg.Baseline.Ycck, JpegColorSpace.Ycck)]
         [InlineData(TestImages.Jpeg.Baseline.Cmyk, JpegColorSpace.Cmyk)]
-        public void ColorSpace_IsDeducedCorrectlyGolang(string imageFile, object expectedColorSpaceValue)
+        public void ColorSpace_IsDeducedCorrectly(string imageFile, object expectedColorSpaceValue)
         {
             var expecteColorSpace = (JpegColorSpace)expectedColorSpaceValue;
 
-            using (GolangJpegDecoderCore decoder = JpegFixture.ParseGolangStream(imageFile))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(imageFile))
             {
                 Assert.Equal(expecteColorSpace, decoder.ColorSpace);
             }
         }
 
-        [Theory]
-        [InlineData(TestImages.Jpeg.Baseline.Testorig420, JpegColorSpace.YCbCr)]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg400, JpegColorSpace.Grayscale)]
-        [InlineData(TestImages.Jpeg.Baseline.Ycck, JpegColorSpace.Ycck)]
-        [InlineData(TestImages.Jpeg.Baseline.Cmyk, JpegColorSpace.Cmyk)]
-        public void ColorSpace_IsDeducedCorrectlyPdfJs(string imageFile, object expectedColorSpaceValue)
-        {
-            var expecteColorSpace = (JpegColorSpace)expectedColorSpaceValue;
-
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile))
-            {
-                Assert.Equal(expecteColorSpace, decoder.ColorSpace);
-            }
-        }
-
-        [Fact]
-        public void ComponentScalingIsCorrect_1ChannelJpegGolang()
-        {
-            using (GolangJpegDecoderCore decoder = JpegFixture.ParseGolangStream(TestImages.Jpeg.Baseline.Jpeg400))
-            {
-                Assert.Equal(1, decoder.ComponentCount);
-                Assert.Equal(1, decoder.Components.Length);
-
-                Size expectedSizeInBlocks = decoder.ImageSizeInPixels.DivideRoundUp(8);
-
-                Assert.Equal(expectedSizeInBlocks, decoder.ImageSizeInMCU);
-
-                var uniform1 = new Size(1, 1);
-                GolangComponent c0 = decoder.Components[0];
-                VerifyJpeg.VerifyComponent(c0, expectedSizeInBlocks, uniform1, uniform1);
-            }
-        }
-
         [Fact]
-        public void ComponentScalingIsCorrect_1ChannelJpegPdfJs()
+        public void ComponentScalingIsCorrect_1ChannelJpeg()
         {
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(TestImages.Jpeg.Baseline.Jpeg400))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(TestImages.Jpeg.Baseline.Jpeg400))
             {
                 Assert.Equal(1, decoder.ComponentCount);
                 Assert.Equal(1, decoder.Components.Length);
@@ -86,7 +51,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 Assert.Equal(expectedSizeInBlocks, decoder.ImageSizeInMCU);
 
                 var uniform1 = new Size(1, 1);
-                PdfJsFrameComponent c0 = decoder.Components[0];
+                JpegComponent c0 = decoder.Components[0];
                 VerifyJpeg.VerifyComponent(c0, expectedSizeInBlocks, uniform1, uniform1);
             }
         }
@@ -98,40 +63,16 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [InlineData(TestImages.Jpeg.Baseline.Testorig420)]
         [InlineData(TestImages.Jpeg.Baseline.Ycck)]
         [InlineData(TestImages.Jpeg.Baseline.Cmyk)]
-        public void PrintComponentDataGolang(string imageFile)
-        {
-            var sb = new StringBuilder();
-
-            using (GolangJpegDecoderCore decoder = JpegFixture.ParseGolangStream(imageFile))
-            {
-                sb.AppendLine(imageFile);
-                sb.AppendLine($"Size:{decoder.ImageSizeInPixels} MCU:{decoder.ImageSizeInMCU}");
-                GolangComponent c0 = decoder.Components[0];
-                GolangComponent c1 = decoder.Components[1];
-
-                sb.AppendLine($"Luma: SAMP: {c0.SamplingFactors} BLOCKS: {c0.SizeInBlocks}");
-                sb.AppendLine($"Chroma: {c1.SamplingFactors} BLOCKS: {c1.SizeInBlocks}");
-            }
-            this.Output.WriteLine(sb.ToString());
-        }
-
-        [Theory]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg444)]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg420Exif)]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg420Small)]
-        [InlineData(TestImages.Jpeg.Baseline.Testorig420)]
-        [InlineData(TestImages.Jpeg.Baseline.Ycck)]
-        [InlineData(TestImages.Jpeg.Baseline.Cmyk)]
-        public void PrintComponentDataPdfJs(string imageFile)
+        public void PrintComponentData(string imageFile)
         {
             var sb = new StringBuilder();
 
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(imageFile))
             {
                 sb.AppendLine(imageFile);
                 sb.AppendLine($"Size:{decoder.ImageSizeInPixels} MCU:{decoder.ImageSizeInMCU}");
-                PdfJsFrameComponent c0 = decoder.Components[0];
-                PdfJsFrameComponent c1 = decoder.Components[1];
+                JpegComponent c0 = decoder.Components[0];
+                JpegComponent c1 = decoder.Components[1];
 
                 sb.AppendLine($"Luma: SAMP: {c0.SamplingFactors} BLOCKS: {c0.SizeInBlocks}");
                 sb.AppendLine($"Chroma: {c1.SamplingFactors} BLOCKS: {c1.SizeInBlocks}");
@@ -152,48 +93,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         [Theory]
         [MemberData(nameof(ComponentVerificationData))]
-        public void ComponentScalingIsCorrect_MultiChannelJpegGolang(
-            string imageFile,
-            int componentCount,
-            object expectedLumaFactors,
-            object expectedChromaFactors)
-        {
-            var fLuma = (Size)expectedLumaFactors;
-            var fChroma = (Size)expectedChromaFactors;
-
-            using (GolangJpegDecoderCore decoder = JpegFixture.ParseGolangStream(imageFile))
-            {
-                Assert.Equal(componentCount, decoder.ComponentCount);
-                Assert.Equal(componentCount, decoder.Components.Length);
-
-                GolangComponent c0 = decoder.Components[0];
-                GolangComponent c1 = decoder.Components[1];
-                GolangComponent c2 = decoder.Components[2];
-
-                var uniform1 = new Size(1, 1);
-
-                Size expectedLumaSizeInBlocks = decoder.ImageSizeInMCU.MultiplyBy(fLuma);
-
-                Size divisor = fLuma.DivideBy(fChroma);
-
-                Size expectedChromaSizeInBlocks = expectedLumaSizeInBlocks.DivideRoundUp(divisor);
-
-                VerifyJpeg.VerifyComponent(c0, expectedLumaSizeInBlocks, fLuma, uniform1);
-                VerifyJpeg.VerifyComponent(c1, expectedChromaSizeInBlocks, fChroma, divisor);
-                VerifyJpeg.VerifyComponent(c2, expectedChromaSizeInBlocks, fChroma, divisor);
-
-                if (componentCount == 4)
-                {
-                    GolangComponent c3 = decoder.Components[2];
-                    VerifyJpeg.VerifyComponent(c3, expectedLumaSizeInBlocks, fLuma, uniform1);
-                }
-            }
-        }
-
-
-        [Theory]
-        [MemberData(nameof(ComponentVerificationData))]
-        public void ComponentScalingIsCorrect_MultiChannelJpegPdfJs(
+        public void ComponentScalingIsCorrect_MultiChannelJpeg(
             string imageFile,
             int componentCount,
             object expectedLumaFactors,
@@ -202,14 +102,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             var fLuma = (Size)expectedLumaFactors;
             var fChroma = (Size)expectedChromaFactors;
 
-            using (PdfJsJpegDecoderCore decoder = JpegFixture.ParsePdfJsStream(imageFile))
+            using (JpegDecoderCore decoder = JpegFixture.ParseJpegStream(imageFile))
             {
                 Assert.Equal(componentCount, decoder.ComponentCount);
                 Assert.Equal(componentCount, decoder.Components.Length);
 
-                PdfJsFrameComponent c0 = decoder.Components[0];
-                PdfJsFrameComponent c1 = decoder.Components[1];
-                PdfJsFrameComponent c2 = decoder.Components[2];
+                JpegComponent c0 = decoder.Components[0];
+                JpegComponent c1 = decoder.Components[1];
+                JpegComponent c2 = decoder.Components[2];
 
                 var uniform1 = new Size(1, 1);
 
@@ -225,7 +125,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
                 if (componentCount == 4)
                 {
-                    PdfJsFrameComponent c3 = decoder.Components[2];
+                    JpegComponent c3 = decoder.Components[2];
                     VerifyJpeg.VerifyComponent(c3, expectedLumaSizeInBlocks, fLuma, uniform1);
                 }
             }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
index 46a688b49..d5a1fb7ba 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs
@@ -4,8 +4,6 @@ using System.IO;
 using System.Linq;
 
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 
@@ -42,10 +40,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
         [Theory(Skip = "Debug only, enable manually!")]
         [WithFileCollection(nameof(AllTestJpegs), PixelTypes.Rgba32)]
-        public void PdfJsDecoder_ParseStream_SaveSpectralResult<TPixel>(TestImageProvider<TPixel> provider)
+        public void Decoder_ParseStream_SaveSpectralResult<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
-            var decoder = new PdfJsJpegDecoderCore(Configuration.Default, new JpegDecoder());
+            var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder());
 
             byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes;
 
@@ -58,25 +56,30 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             }
         }
 
-        [Theory(Skip = "Debug only, enable manually!")]
+        [Theory]
         [WithFileCollection(nameof(AllTestJpegs), PixelTypes.Rgba32)]
-        public void OriginalDecoder_ParseStream_SaveSpectralResult<TPixel>(TestImageProvider<TPixel> provider)
+        public void VerifySpectralCorrectness<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
-            var decoder = new GolangJpegDecoderCore(Configuration.Default, new JpegDecoder());
+            if (!TestEnvironment.IsWindows)
+            {
+                return;
+            }
+
+            var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder());
 
             byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes;
 
             using (var ms = new MemoryStream(sourceBytes))
             {
-                decoder.ParseStream(ms, false);
+                decoder.ParseStream(ms);
+                var imageSharpData = LibJpegTools.SpectralData.LoadFromImageSharpDecoder(decoder);
 
-                var data = LibJpegTools.SpectralData.LoadFromImageSharpDecoder(decoder);
-                VerifyJpeg.SaveSpectralImage(provider, data);
+                this.VerifySpectralCorrectnessImpl(provider, imageSharpData);
             }
         }
-
-        private void VerifySpectralCorrectness<TPixel>(
+        
+        private void VerifySpectralCorrectnessImpl<TPixel>(
             TestImageProvider<TPixel> provider,
             LibJpegTools.SpectralData imageSharpData)
             where TPixel : struct, IPixel<TPixel>
@@ -107,7 +110,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 this.Output.WriteLine($"Component{i}: {diff}");
                 averageDifference += diff.average;
                 totalDifference += diff.total;
-                tolerance += libJpegComponent.SpectralBlocks.Buffer.GetSpan().Length;
+                tolerance += libJpegComponent.SpectralBlocks.MemorySource.GetSpan().Length;
             }
             averageDifference /= componentCount;
 
@@ -119,51 +122,5 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 
             Assert.True(totalDifference < tolerance);
         }
-
-        [Theory]
-        [WithFileCollection(nameof(AllTestJpegs), PixelTypes.Rgba32)]
-        public void VerifySpectralCorrectness_PdfJs<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            if (!TestEnvironment.IsWindows)
-            {
-                return;
-            }
-
-            var decoder = new PdfJsJpegDecoderCore(Configuration.Default, new JpegDecoder());
-
-            byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes;
-
-            using (var ms = new MemoryStream(sourceBytes))
-            {
-                decoder.ParseStream(ms);
-                var imageSharpData = LibJpegTools.SpectralData.LoadFromImageSharpDecoder(decoder);
-
-                this.VerifySpectralCorrectness<TPixel>(provider, imageSharpData);
-            }
-        }
-
-        [Theory]
-        [WithFileCollection(nameof(AllTestJpegs), PixelTypes.Rgba32)]
-        public void VerifySpectralCorrectness_Golang<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            if (!TestEnvironment.IsWindows)
-            {
-                return;
-            }
-
-            var decoder = new GolangJpegDecoderCore(Configuration.Default, new GolangJpegDecoder());
-
-            byte[] sourceBytes = TestFile.Create(provider.SourceFileOrDescription).Bytes;
-
-            using (var ms = new MemoryStream(sourceBytes))
-            {
-                decoder.ParseStream(ms);
-                var imageSharpData = LibJpegTools.SpectralData.LoadFromImageSharpDecoder(decoder);
-
-                this.VerifySpectralCorrectness<TPixel>(provider, imageSharpData);
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs
index 7fe98e2af..d14fbc3fc 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs
@@ -10,8 +10,6 @@ using System.Text;
 
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 
 using Xunit;
 using Xunit.Abstractions;
@@ -175,23 +173,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
             Assert.False(failed);
         }
 
-        internal static GolangJpegDecoderCore ParseGolangStream(string testFileName, bool metaDataOnly = false)
+        internal static JpegDecoderCore ParseJpegStream(string testFileName, bool metaDataOnly = false)
         {
             byte[] bytes = TestFile.Create(testFileName).Bytes;
             using (var ms = new MemoryStream(bytes))
             {
-                var decoder = new GolangJpegDecoderCore(Configuration.Default, new JpegDecoder());
-                decoder.ParseStream(ms, metaDataOnly);
-                return decoder;
-            }
-        }
-
-        internal static PdfJsJpegDecoderCore ParsePdfJsStream(string testFileName, bool metaDataOnly = false)
-        {
-            byte[] bytes = TestFile.Create(testFileName).Bytes;
-            using (var ms = new MemoryStream(bytes))
-            {
-                var decoder = new PdfJsJpegDecoderCore(Configuration.Default, new JpegDecoder());
+                var decoder = new JpegDecoderCore(Configuration.Default, new JpegDecoder());
                 decoder.ParseStream(ms, metaDataOnly);
                 return decoder;
             }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
index 645ee4512..a10deb983 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.ComponentData.cs
@@ -1,18 +1,15 @@
+using System;
+using System.Linq;
+using System.Numerics;
+
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 {
-    using System;
-    using System.Linq;
-    using System.Numerics;
-
-    using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-    using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
-    using SixLabors.Memory;
-    using SixLabors.Primitives;
-
     internal static partial class LibJpegTools
     {
         /// <summary>
@@ -57,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 this.SpectralBlocks[x, y] = new Block8x8(data);
             }
 
-            public static ComponentData Load(PdfJsFrameComponent c, int index)
+            public static ComponentData Load(JpegComponent c, int index)
             {
                 var result = new ComponentData(
                     c.WidthInBlocks,
@@ -77,26 +74,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 return result;
             }
 
-            public static ComponentData Load(GolangComponent c)
-            {
-                var result = new ComponentData(
-                    c.SizeInBlocks.Width,
-                    c.SizeInBlocks.Height,
-                    c.Index
-                );
-
-                for (int y = 0; y < result.HeightInBlocks; y++)
-                {
-                    for (int x = 0; x < result.WidthInBlocks; x++)
-                    {
-                        short[] data = c.GetBlockReference(x, y).ToArray();
-                        result.MakeBlock(data, y, x);
-                    }
-                }
-
-                return result;
-            }
-
             public Image<Rgba32> CreateGrayScaleImage()
             {
                 var result = new Image<Rgba32>(this.WidthInBlocks * 8, this.HeightInBlocks * 8);
@@ -143,8 +120,16 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 
             public bool Equals(ComponentData other)
             {
-                if (object.ReferenceEquals(null, other)) return false;
-                if (object.ReferenceEquals(this, other)) return true;
+                if (other is null)
+                {
+                    return false;
+                }
+
+                if (ReferenceEquals(this, other))
+                {
+                    return true;
+                }
+
                 bool ok = this.Index == other.Index && this.HeightInBlocks == other.HeightInBlocks
                           && this.WidthInBlocks == other.WidthInBlocks;
                 //&& this.MinVal == other.MinVal
@@ -165,8 +150,8 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 
             public override bool Equals(object obj)
             {
-                if (Object.ReferenceEquals(null, obj)) return false;
-                if (Object.ReferenceEquals(this, obj)) return true;
+                if (obj is null) return false;
+                if (object.ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != this.GetType()) return false;
                 return this.Equals((ComponentData)obj);
             }
@@ -175,7 +160,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
             {
                 unchecked
                 {
-                    var hashCode = this.Index;
+                    int hashCode = this.Index;
                     hashCode = (hashCode * 397) ^ this.HeightInBlocks;
                     hashCode = (hashCode * 397) ^ this.WidthInBlocks;
                     hashCode = (hashCode * 397) ^ this.MinVal.GetHashCode();
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs
index ae8194e1a..bcfabca39 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/LibJpegTools.SpectralData.cs
@@ -5,11 +5,9 @@ using System;
 using System.Linq;
 using System.Numerics;
 
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
-using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
+using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
@@ -32,17 +30,9 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
                 this.Components = components;
             }
 
-            public static SpectralData LoadFromImageSharpDecoder(PdfJsJpegDecoderCore decoder)
+            public static SpectralData LoadFromImageSharpDecoder(JpegDecoderCore decoder)
             {
-                PdfJsFrameComponent[] srcComponents = decoder.Frame.Components;
-                LibJpegTools.ComponentData[] destComponents = srcComponents.Select(LibJpegTools.ComponentData.Load).ToArray();
-
-                return new SpectralData(destComponents);
-            }
-
-            public static SpectralData LoadFromImageSharpDecoder(GolangJpegDecoderCore decoder)
-            {
-                GolangComponent[] srcComponents = decoder.Components;
+                JpegComponent[] srcComponents = decoder.Frame.Components;
                 LibJpegTools.ComponentData[] destComponents = srcComponents.Select(LibJpegTools.ComponentData.Load).ToArray();
 
                 return new SpectralData(destComponents);
@@ -108,8 +98,16 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils
 
             public bool Equals(SpectralData other)
             {
-                if (object.ReferenceEquals(null, other)) return false;
-                if (object.ReferenceEquals(this, other)) return true;
+                if (other is null)
+                {
+                    return false;
+                }
+
+                if (ReferenceEquals(this, other))
+                {
+                    return true;
+                }
+
                 if (this.ComponentCount != other.ComponentCount)
                 {
                     return false;
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
index 6f04ba651..dc29b1949 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.Chunks.cs
@@ -77,8 +77,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         [Theory]
         [InlineData((uint)PngChunkType.Gamma)] // gAMA
         [InlineData((uint)PngChunkType.PaletteAlpha)] // tRNS
-        [InlineData(
-            (uint)PngChunkType.Physical)] // pHYs: It's ok to test physical as we don't throw for duplicate chunks.
+        [InlineData((uint)PngChunkType.Physical)] // pHYs: It's ok to test physical as we don't throw for duplicate chunks.
         //[InlineData(PngChunkTypes.Text)] //TODO: Figure out how to test this
         public void Decode_IncorrectCRCForNonCriticalChunk_ExceptionIsThrown(uint chunkType)
         {
@@ -112,9 +111,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
 
         private static void WriteChunk(MemoryStream memStream, string chunkName)
         {
-            memStream.Write(new byte[] { 0, 0, 0, 1 }, 0, 4);
-            memStream.Write(Encoding.GetEncoding("ASCII").GetBytes(chunkName), 0, 4);
-            memStream.Write(new byte[] { 0, 0, 0, 0, 0 }, 0, 5);
+            // Needs a minimum length of 9 for pHYs chunk.
+            memStream.Write(new byte[] { 0, 0, 0, 9 }, 0, 4);
+            memStream.Write(Encoding.GetEncoding("ASCII").GetBytes(chunkName), 0, 4); // 4 bytes chunk header
+            memStream.Write(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0, 9); // 9 bytes of chunk data
+            memStream.Write(new byte[] { 0, 0, 0, 0 }, 0, 4); // Junk Crc
         }
 
         private static void WriteDataChunk(MemoryStream memStream)
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
index 66e4f39fd..54f3e397c 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Text;
 
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
@@ -18,8 +19,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
     public partial class PngDecoderTests
     {
         private const PixelTypes PixelTypes = Tests.PixelTypes.Rgba32 | Tests.PixelTypes.RgbaVector | Tests.PixelTypes.Argb32;
-        
-        
 
         public static readonly string[] CommonTestImages =
         {
@@ -67,6 +66,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             TestImages.Png.GrayTrns16BitInterlaced
         };
 
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Png.Splash, 11810, 11810 , PixelResolutionUnit.PixelsPerMeter},
+            { TestImages.Png.Ratio1x4, 1, 4 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Png.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
+        };
+
         [Theory]
         [WithFileCollection(nameof(CommonTestImages), PixelTypes.Rgba32)]
         public void Decode<TPixel>(TestImageProvider<TPixel> provider)
@@ -218,5 +225,39 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
                 Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
             }
         }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Decode_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new PngDecoder();
+                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                {
+                    ImageMetaData meta = image.MetaData;
+                    Assert.Equal(xResolution, meta.HorizontalResolution);
+                    Assert.Equal(yResolution, meta.VerticalResolution);
+                    Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Identify_VerifyRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                var decoder = new PngDecoder();
+                IImageInfo image = decoder.Identify(Configuration.Default, stream);
+                ImageMetaData meta = image.MetaData;
+                Assert.Equal(xResolution, meta.HorizontalResolution);
+                Assert.Equal(yResolution, meta.VerticalResolution);
+                Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 3bcecedec..62de45064 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -7,9 +7,10 @@ using System.Linq;
 
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using Xunit;
@@ -61,6 +62,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
             80, 100, 120, 230
         };
 
+        public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
+        new TheoryData<string, int, int, PixelResolutionUnit>
+        {
+            { TestImages.Png.Splash, 11810, 11810 , PixelResolutionUnit.PixelsPerMeter},
+            { TestImages.Png.Ratio1x4, 1, 4 , PixelResolutionUnit.AspectRatio},
+            { TestImages.Png.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
+        };
+
         [Theory]
         [WithFile(TestImages.Png.Palette8Bpp, nameof(PngColorTypes), PixelTypes.Rgba32)]
         [WithTestPatternImages(nameof(PngColorTypes), 48, 24, PixelTypes.Rgba32)]
@@ -256,5 +265,30 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
                 Assert.Equal(expected, data);
             }
         }
+
+        [Theory]
+        [MemberData(nameof(RatioFiles))]
+        public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
+        {
+            var options = new PngEncoder();
+
+            var testFile = TestFile.Create(imagePath);
+            using (Image<Rgba32> input = testFile.CreateImage())
+            {
+                using (var memStream = new MemoryStream())
+                {
+                    input.Save(memStream, options);
+
+                    memStream.Position = 0;
+                    using (var output = Image.Load<Rgba32>(memStream))
+                    {
+                        ImageMetaData meta = output.MetaData;
+                        Assert.Equal(xResolution, meta.HorizontalResolution);
+                        Assert.Equal(yResolution, meta.VerticalResolution);
+                        Assert.Equal(resolutionUnit, meta.ResolutionUnits);
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
index e7fd21d96..81a31e42d 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
@@ -5,14 +5,12 @@ using System.IO;
 using Xunit;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.Formats.Png;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Png
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
-
     public class PngSmokeTests
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Helpers/UnitConverterHelperTests.cs b/tests/ImageSharp.Tests/Helpers/UnitConverterHelperTests.cs
new file mode 100644
index 000000000..57e280d93
--- /dev/null
+++ b/tests/ImageSharp.Tests/Helpers/UnitConverterHelperTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.Common.Helpers;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Helpers
+{
+    public class UnitConverterHelperTests
+    {
+        [Fact]
+        public void InchToFromMeter()
+        {
+            const double expected = 96D;
+            double actual = UnitConverter.InchToMeter(expected);
+            actual = UnitConverter.MeterToInch(actual);
+
+            Assert.Equal(expected, actual, 15);
+        }
+
+        [Fact]
+        public void InchToFromCm()
+        {
+            const double expected = 96D;
+            double actual = UnitConverter.InchToCm(expected);
+            actual = UnitConverter.CmToInch(actual);
+
+            Assert.Equal(expected, actual, 15);
+        }
+
+        [Fact]
+        public void CmToFromMeter()
+        {
+            const double expected = 96D;
+            double actual = UnitConverter.CmToMeter(expected);
+            actual = UnitConverter.MeterToCm(actual);
+
+            Assert.Equal(expected, actual, 15);
+        }
+    }
+}
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs b/tests/ImageSharp.Tests/IO/DoubleBufferedStreamReaderTests.cs
similarity index 87%
rename from tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs
rename to tests/ImageSharp.Tests/IO/DoubleBufferedStreamReaderTests.cs
index 20b199441..4fac8d954 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/DoubleBufferedStreamReaderTests.cs
+++ b/tests/ImageSharp.Tests/IO/DoubleBufferedStreamReaderTests.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.IO;
-using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort.Components;
+using SixLabors.ImageSharp.IO;
 using SixLabors.Memory;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Formats.Jpg
+namespace SixLabors.ImageSharp.Tests.IO
 {
     public class DoubleBufferedStreamReaderTests
     {
@@ -29,6 +29,24 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             }
         }
 
+        [Fact]
+        public void DoubleBufferedStreamReaderCanReadSingleByteFromOffset()
+        {
+            using (MemoryStream stream = this.CreateTestStream())
+            {
+                byte[] expected = stream.ToArray();
+                const int offset = 5;
+                var reader = new DoubleBufferedStreamReader(this.allocator, stream);
+                reader.Position = offset;
+
+                Assert.Equal(expected[offset], reader.ReadByte());
+
+                // We've read a whole chunk but increment by 1 in our reader.
+                Assert.Equal(stream.Position, DoubleBufferedStreamReader.ChunkLength + offset);
+                Assert.Equal(offset + 1, reader.Position);
+            }
+        }
+
         [Fact]
         public void DoubleBufferedStreamReaderCanReadSubsequentSingleByteCorrectly()
         {
@@ -138,7 +156,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 // Skip Again
                 reader.Skip(skip2);
 
-                // First Skap + First Read + Second Skip
+                // First Skip + First Read + Second Skip
                 int position = skip + plusOne + skip2;
 
                 Assert.Equal(position, reader.Position);
diff --git a/tests/ImageSharp.Tests/Image/ImageProcessingContextTests.cs b/tests/ImageSharp.Tests/Image/ImageProcessingContextTests.cs
index 4e149da50..041b6c846 100644
--- a/tests/ImageSharp.Tests/Image/ImageProcessingContextTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageProcessingContextTests.cs
@@ -1,17 +1,13 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-//using SixLabors.ImageSharp.Processing;
-
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
-
     public class ImageProcessingContextTests
     {
         [Fact]
diff --git a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
index 8310d67e8..e1c4a419e 100644
--- a/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageRotationTests.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
-
     public class ImageRotationTests
     {
         [Fact]
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
index 066be4a73..815684d84 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs
@@ -2,7 +2,16 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using SixLabors.Memory;
+using System.Buffers;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Runtime.CompilerServices;
+
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.MetaData;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Shapes;
+using SixLabors.ImageSharp.Processing;
 using Xunit;
 
 // ReSharper disable InconsistentNaming
@@ -12,12 +21,135 @@ namespace SixLabors.ImageSharp.Tests
     {
         public class WrapMemory
         {
+            /// <summary>
+            /// A <see cref="MemoryManager{T}"/> exposing the locked pixel memory of a <see cref="Bitmap"/> instance.
+            /// TODO: This should be an example in https://github.com/SixLabors/Samples
+            /// </summary>
+            class BitmapMemoryManager : MemoryManager<Bgra32>
+            {
+                private readonly Bitmap bitmap;
+
+                private readonly BitmapData bmpData;
+
+                private readonly int length;
+
+                public BitmapMemoryManager(Bitmap bitmap)
+                {
+                    if (bitmap.PixelFormat != PixelFormat.Format32bppArgb)
+                    {
+                        throw new ArgumentException("bitmap.PixelFormat != PixelFormat.Format32bppArgb", nameof(bitmap));
+                    }
+
+                    this.bitmap = bitmap;
+                    var rectangle = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
+                    this.bmpData = bitmap.LockBits(rectangle, ImageLockMode.ReadWrite, bitmap.PixelFormat);
+                    this.length = bitmap.Width * bitmap.Height;
+                }
+
+                public bool IsDisposed { get; private set; }
+
+                protected override void Dispose(bool disposing)
+                {
+                    if (this.IsDisposed)
+                    {
+                        return;
+                    }
+
+                    if (disposing)
+                    {
+                        this.bitmap.UnlockBits(this.bmpData);
+                    }
+                    
+                    this.IsDisposed = true;
+                }
+
+                public override unsafe Span<Bgra32> GetSpan()
+                {
+                    void* ptr = (void*) this.bmpData.Scan0;
+                    return new Span<Bgra32>(ptr, this.length);
+                }
+
+                public override unsafe MemoryHandle Pin(int elementIndex = 0)
+                {
+                    void* ptr = (void*)this.bmpData.Scan0;
+                    return new MemoryHandle(ptr);
+                }
+
+                public override void Unpin()
+                {
+                }
+            }
+
             [Fact]
-            public void ConsumedBuffer_IsMemoryOwner_ReturnsFalse()
+            public void WrapMemory_CreatedImageIsCorrect()
             {
-                var memory = new Memory<int>(new int[55]);
-                var buffer = new ConsumedBuffer<int>(memory);
-                Assert.False(buffer.IsMemoryOwner);
+                Configuration cfg = Configuration.Default.ShallowCopy();
+                var metaData = new ImageMetaData();
+
+                var array = new Rgba32[25];
+                var memory = new Memory<Rgba32>(array);
+
+                using (var image = Image.WrapMemory(cfg, memory, 5, 5, metaData))
+                {
+                    ref Rgba32 pixel0 = ref image.GetPixelSpan()[0];
+                    Assert.True(Unsafe.AreSame(ref array[0], ref pixel0));
+
+                    Assert.Equal(cfg, image.GetConfiguration());
+                    Assert.Equal(metaData, image.MetaData);
+                }
+            }
+
+            [Fact]
+            public void WrapSystemDrawingBitmap_WhenObserved()
+            {
+                using (var bmp = new Bitmap(51, 23))
+                {
+                    using (var memoryManager = new BitmapMemoryManager(bmp))
+                    {
+                        Memory<Bgra32> memory = memoryManager.Memory;
+                        Bgra32 bg = NamedColors<Bgra32>.Red;
+                        Bgra32 fg = NamedColors<Bgra32>.Green;
+
+                        using (var image = Image.WrapMemory(memory, bmp.Width, bmp.Height))
+                        {
+                            Assert.Equal(memory, image.GetPixelMemory());
+                            image.Mutate(c => c.Fill(bg).Fill(fg, new RectangularPolygon(10, 10, 10, 10)));
+                        }
+
+                        Assert.False(memoryManager.IsDisposed);
+                    }
+
+                    string fn = System.IO.Path.Combine(
+                        TestEnvironment.ActualOutputDirectoryFullPath,
+                        $"{nameof(this.WrapSystemDrawingBitmap_WhenObserved)}.bmp");
+
+                    bmp.Save(fn, ImageFormat.Bmp);
+                }
+            }
+
+            [Fact]
+            public void WrapSystemDrawingBitmap_WhenOwned()
+            {
+                using (var bmp = new Bitmap(51, 23))
+                {
+                    var memoryManager = new BitmapMemoryManager(bmp);
+                    Bgra32 bg = NamedColors<Bgra32>.Red;
+                    Bgra32 fg = NamedColors<Bgra32>.Green;
+
+                    using (var image = Image.WrapMemory(memoryManager, bmp.Width, bmp.Height))
+                    {
+                        Assert.Equal(memoryManager.Memory, image.GetPixelMemory());
+                        image.Mutate(c => c.Fill(bg).Fill(fg, new RectangularPolygon(10, 10, 10, 10)));
+                    }
+
+                    Assert.True(memoryManager.IsDisposed);
+
+                    string fn = System.IO.Path.Combine(
+                        TestEnvironment.ActualOutputDirectoryFullPath,
+                        $"{nameof(this.WrapSystemDrawingBitmap_WhenOwned)}.bmp");
+
+                    bmp.Save(fn, ImageFormat.Bmp);
+                }
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Issues/Issue412.cs b/tests/ImageSharp.Tests/Issues/Issue412.cs
index a1bf7f36a..6123c822b 100644
--- a/tests/ImageSharp.Tests/Issues/Issue412.cs
+++ b/tests/ImageSharp.Tests/Issues/Issue412.cs
@@ -2,12 +2,10 @@
 
 using Xunit;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing;
+using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp.Tests.Issues
 {
-    using SixLabors.ImageSharp.Processing;
-
     public class Issue412
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
index c8e304b41..89bb9d95f 100644
--- a/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
+++ b/tests/ImageSharp.Tests/Memory/ArrayPoolMemoryManagerTests.cs
@@ -3,6 +3,8 @@
 
 // ReSharper disable InconsistentNaming
 
+using System.Buffers;
+
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Tests.Memory
@@ -30,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         private bool CheckIsRentingPooledBuffer<T>(int length)
             where T : struct
         {
-            IBuffer<T> buffer = this.MemoryAllocator.Allocate<T>(length);
+            IMemoryOwner<T> buffer = this.MemoryAllocator.Allocate<T>(length);
             ref T ptrToPrevPosition0 = ref buffer.GetReference();
             buffer.Dispose();
             
@@ -126,18 +128,18 @@ namespace SixLabors.ImageSharp.Tests.Memory
         }
 
         [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void CleaningRequests_AreControlledByAllocationParameter_Clean(bool clean)
+        [InlineData(AllocationOptions.None)]
+        [InlineData(AllocationOptions.Clean)]
+        public void CleaningRequests_AreControlledByAllocationParameter_Clean(AllocationOptions options)
         {
-            using (IBuffer<int> firstAlloc = this.MemoryAllocator.Allocate<int>(42))
+            using (IMemoryOwner<int> firstAlloc = this.MemoryAllocator.Allocate<int>(42))
             {
                 firstAlloc.GetSpan().Fill(666);
             }
 
-            using (IBuffer<int> secondAlloc = this.MemoryAllocator.Allocate<int>(42, clean))
+            using (IMemoryOwner<int> secondAlloc = this.MemoryAllocator.Allocate<int>(42, options))
             {
-                int expected = clean ? 0 : 666;
+                int expected = options == AllocationOptions.Clean ? 0 : 666;
                 Assert.Equal(expected, secondAlloc.GetSpan()[0]);
             }
         }
@@ -147,7 +149,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [InlineData(true)]
         public void ReleaseRetainedResources_ReplacesInnerArrayPool(bool keepBufferAlive)
         {
-            IBuffer<int> buffer = this.MemoryAllocator.Allocate<int>(32);
+            IMemoryOwner<int> buffer = this.MemoryAllocator.Allocate<int>(32);
             ref int ptrToPrev0 = ref MemoryMarshal.GetReference(buffer.GetSpan());
 
             if (!keepBufferAlive)
@@ -165,7 +167,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void ReleaseRetainedResources_DisposingPreviouslyAllocatedBuffer_IsAllowed()
         {
-            IBuffer<int> buffer = this.MemoryAllocator.Allocate<int>(32);
+            IMemoryOwner<int> buffer = this.MemoryAllocator.Allocate<int>(32);
             this.MemoryAllocator.ReleaseRetainedResources();
             buffer.Dispose();
         }
@@ -181,11 +183,11 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
             int arrayLengthThreshold = PoolSelectorThresholdInBytes / sizeof(int);
 
-            IBuffer<int> small = this.MemoryAllocator.Allocate<int>(arrayLengthThreshold - 1);
+            IMemoryOwner<int> small = this.MemoryAllocator.Allocate<int>(arrayLengthThreshold - 1);
             ref int ptr2Small = ref small.GetReference();
             small.Dispose();
 
-            IBuffer<int> large = this.MemoryAllocator.Allocate<int>(arrayLengthThreshold + 1);
+            IMemoryOwner<int> large = this.MemoryAllocator.Allocate<int>(arrayLengthThreshold + 1);
             
             Assert.False(Unsafe.AreSame(ref ptr2Small, ref large.GetReference()));
         }
diff --git a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
index 301a76f56..5753d92b3 100644
--- a/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Buffer2DTests.cs
@@ -1,26 +1,27 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-// ReSharper disable InconsistentNaming
-namespace SixLabors.ImageSharp.Tests.Memory
-{
-    using System;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
+using System;
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
-    using SixLabors.ImageSharp.PixelFormats;
-    using SixLabors.Memory;
-    using SixLabors.ImageSharp.Tests.Common;
-    using SixLabors.Primitives;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+using SixLabors.Primitives;
 
-    using Xunit;
+using Xunit;
 
+// ReSharper disable InconsistentNaming
+
+namespace SixLabors.ImageSharp.Tests.Memory
+{
     public class Buffer2DTests
     {
         // ReSharper disable once ClassNeverInstantiated.Local
         private class Assert : Xunit.Assert
         {
-            public static void SpanPointsTo<T>(Span<T> span, IBuffer<T> buffer, int bufferOffset = 0)
+            public static void SpanPointsTo<T>(Span<T> span, IMemoryOwner<T> buffer, int bufferOffset = 0)
                 where T : struct
             {
                 ref T actual = ref MemoryMarshal.GetReference(span);
@@ -30,31 +31,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
             }
         }
 
-        private MemoryAllocator MemoryAllocator { get; } = new MockMemoryAllocator();
-
-        private class MockMemoryAllocator : MemoryAllocator
-        {
-            internal override IBuffer<T> Allocate<T>(int length, bool clear)
-            {
-                var array = new T[length + 42];
-
-                if (!clear)
-                {
-                    Span<byte> data = MemoryMarshal.Cast<T, byte>(array.AsSpan());
-                    for (int i = 0; i < data.Length; i++)
-                    {
-                        data[i] = 42;
-                    }
-                }
-
-                return new BasicArrayBuffer<T>(array, length);
-            }
-
-            internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, bool clear)
-            {
-                throw new NotImplementedException();
-            }
-        }
+        private MemoryAllocator MemoryAllocator { get; } = new TestMemoryAllocator();
 
         [Theory]
         [InlineData(7, 42)]
@@ -65,14 +42,14 @@ namespace SixLabors.ImageSharp.Tests.Memory
             {
                 Assert.Equal(width, buffer.Width);
                 Assert.Equal(height, buffer.Height);
-                Assert.Equal(width * height, buffer.Buffer.Length());
+                Assert.Equal(width * height, buffer.Memory.Length);
             }
         }
 
         [Fact]
         public void CreateClean()
         {
-            using (Buffer2D<int> buffer = this.MemoryAllocator.Allocate2D<int>(42, 42, true))
+            using (Buffer2D<int> buffer = this.MemoryAllocator.Allocate2D<int>(42, 42, AllocationOptions.Clean))
             {
                 Span<int> span = buffer.GetSpan();
                 for (int j = 0; j < span.Length; j++)
@@ -94,7 +71,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
                 // Assert.Equal(width * y, span.Start);
                 Assert.Equal(width, span.Length);
-                Assert.SpanPointsTo(span, buffer.Buffer, width * y);
+                Assert.SpanPointsTo(span, buffer.MemorySource.MemoryOwner, width * y);
             }
         }
 
@@ -110,7 +87,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
                 // Assert.Equal(width * y + x, span.Start);
                 Assert.Equal(width - x, span.Length);
-                Assert.SpanPointsTo(span, buffer.Buffer, width * y + x);
+                Assert.SpanPointsTo(span, buffer.MemorySource.MemoryOwner, width * y + x);
             }
         }
 
@@ -122,7 +99,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             using (Buffer2D<TestStructs.Foo> buffer = this.MemoryAllocator.Allocate2D<TestStructs.Foo>(width, height))
             {
-                Span<TestStructs.Foo> span = buffer.Buffer.GetSpan();
+                Span<TestStructs.Foo> span = buffer.MemorySource.GetSpan();
 
                 ref TestStructs.Foo actual = ref buffer[x, y];
 
@@ -131,92 +108,24 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 Assert.True(Unsafe.AreSame(ref expected, ref actual));
             }
         }
-        
-        public class SwapOrCopyContent
-        {
-            private MemoryAllocator MemoryAllocator { get; } = new MockMemoryAllocator();
-            
-            [Fact]
-            public void WhenBothBuffersAreMemoryOwners_ShouldSwap()
-            {
-                using (Buffer2D<int> a = this.MemoryAllocator.Allocate2D<int>(10, 5))
-                using (Buffer2D<int> b = this.MemoryAllocator.Allocate2D<int>(3, 7))
-                {
-                    IBuffer<int> aa = a.Buffer;
-                    IBuffer<int> bb = b.Buffer;
-
-                    Buffer2D<int>.SwapOrCopyContent(a, b);
-
-                    Assert.Equal(bb, a.Buffer);
-                    Assert.Equal(aa, b.Buffer);
-                      
-                    Assert.Equal(new Size(3, 7), a.Size());
-                    Assert.Equal(new Size(10, 5), b.Size());
-                }
-            }
 
-            [Fact]
-            public void WhenDestIsNotMemoryOwner_SameSize_ShouldCopy()
+        [Fact]
+        public void SwapOrCopyContent()
+        {
+            using (Buffer2D<int> a = this.MemoryAllocator.Allocate2D<int>(10, 5))
+            using (Buffer2D<int> b = this.MemoryAllocator.Allocate2D<int>(3, 7))
             {
-                var data = new Rgba32[3 * 7];
-                var color = new Rgba32(1, 2, 3, 4);
-                
-                var mmg = new TestMemoryManager<Rgba32>(data);
-                var aBuff = new ConsumedBuffer<Rgba32>(mmg.Memory);
-
-                using (Buffer2D<Rgba32> a = new Buffer2D<Rgba32>(aBuff, 3, 7))
-                {
-                    IBuffer<Rgba32> aa = a.Buffer;
-
-                    // Precondition:
-                    Assert.Equal(aBuff, aa);
+                IMemoryOwner<int> aa = a.MemorySource.MemoryOwner;
+                IMemoryOwner<int> bb = b.MemorySource.MemoryOwner;
 
-                    using (Buffer2D<Rgba32> b = this.MemoryAllocator.Allocate2D<Rgba32>(3, 7))
-                    {
-                        IBuffer<Rgba32> bb = b.Buffer;
-                        bb.GetSpan()[10] = color;
+                Buffer2D<int>.SwapOrCopyContent(a, b);
 
-                        // Act:
-                        Buffer2D<Rgba32>.SwapOrCopyContent(a, b);
+                Assert.Equal(bb, a.MemorySource.MemoryOwner);
+                Assert.Equal(aa, b.MemorySource.MemoryOwner);
 
-                        // Assert:
-                        Assert.Equal(aBuff, a.Buffer);
-                        Assert.Equal(bb, b.Buffer);
-                    }
-
-                    // Assert:
-                    Assert.Equal(color, a.Buffer.GetSpan()[10]);
-                }
-            }
-
-            [Fact]
-            public void WhenDestIsNotMemoryOwner_DifferentSize_Throws()
-            {
-                var data = new Rgba32[3 * 7];
-                var color = new Rgba32(1, 2, 3, 4);
-                data[10] = color;
-
-                var mmg = new TestMemoryManager<Rgba32>(data);
-                var aBuff = new ConsumedBuffer<Rgba32>(mmg.Memory);
-
-                using (Buffer2D<Rgba32> a = new Buffer2D<Rgba32>(aBuff, 3, 7))
-                {
-                    IBuffer<Rgba32> aa = a.Buffer;
-                    using (Buffer2D<Rgba32> b = this.MemoryAllocator.Allocate2D<Rgba32>(3, 8))
-                    {
-                        IBuffer<Rgba32> bb = b.Buffer;
-
-                        Assert.ThrowsAny<InvalidOperationException>(
-                            () =>
-                                {
-                                    Buffer2D<Rgba32>.SwapOrCopyContent(a, b);
-                                });
-                    }
-
-                    Assert.Equal(color, a.Buffer.GetSpan()[10]);
-                }
+                Assert.Equal(new Size(3, 7), a.Size());
+                Assert.Equal(new Size(10, 5), b.Size());
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
index a0a68a705..e57c13164 100644
--- a/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
+++ b/tests/ImageSharp.Tests/Memory/BufferTestSuite.cs
@@ -63,15 +63,6 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
         public static readonly TheoryData<int> LenthValues = new TheoryData<int> { 0, 1, 7, 1023, 1024 };
 
-        [Fact]
-        public void IsMemoryOwner()
-        {
-            using (IBuffer<float> buffer = this.MemoryAllocator.Allocate<float>(42))
-            {
-                Assert.True(buffer.IsMemoryOwner);
-            }
-        }
-
         [Theory]
         [MemberData(nameof(LenthValues))]
         public void HasCorrectLength_byte(int desiredLength)
@@ -96,7 +87,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         private void TestHasCorrectLength<T>(int desiredLength)
             where T : struct
         {
-            using (IBuffer<T> buffer = this.MemoryAllocator.Allocate<T>(desiredLength))
+            using (IMemoryOwner<T> buffer = this.MemoryAllocator.Allocate<T>(desiredLength))
             {
                 Assert.Equal(desiredLength, buffer.GetSpan().Length);
             }
@@ -124,12 +115,12 @@ namespace SixLabors.ImageSharp.Tests.Memory
             this.TestCanAllocateCleanBuffer<CustomStruct>(desiredLength);
         }
 
-        private IBuffer<T> Allocate<T>(int desiredLength, bool clean, bool managedByteBuffer)
+        private IMemoryOwner<T> Allocate<T>(int desiredLength, AllocationOptions options, bool managedByteBuffer)
             where T : struct
         {
             if (managedByteBuffer)
             {
-                if (!(this.MemoryAllocator.AllocateManagedByteBuffer(desiredLength, clean) is IBuffer<T> buffer))
+                if (!(this.MemoryAllocator.AllocateManagedByteBuffer(desiredLength, options) is IMemoryOwner<T> buffer))
                 {
                     throw new InvalidOperationException("typeof(T) != typeof(byte)");
                 }
@@ -137,7 +128,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
                 return buffer;
             }
 
-            return this.MemoryAllocator.Allocate<T>(desiredLength, clean);
+            return this.MemoryAllocator.Allocate<T>(desiredLength, options);
         }
 
         private void TestCanAllocateCleanBuffer<T>(int desiredLength, bool testManagedByteBuffer = false)
@@ -147,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
 
             for (int i = 0; i < 10; i++)
             {
-                using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, true, testManagedByteBuffer))
+                using (IMemoryOwner<T> buffer = this.Allocate<T>(desiredLength, AllocationOptions.Clean, testManagedByteBuffer))
                 {
                     Assert.True(buffer.GetSpan().SequenceEqual(expected));
                 }
@@ -172,7 +163,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         private void TestSpanPropertyIsAlwaysTheSame<T>(int desiredLength, bool testManagedByteBuffer = false)
             where T : struct
         {
-            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            using (IMemoryOwner<T> buffer = this.Allocate<T>(desiredLength, AllocationOptions.None, testManagedByteBuffer))
             {
                 ref T a = ref MemoryMarshal.GetReference(buffer.GetSpan());
                 ref T b = ref MemoryMarshal.GetReference(buffer.GetSpan());
@@ -201,7 +192,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         private void TestWriteAndReadElements<T>(int desiredLength, Func<int, T> getExpectedValue, bool testManagedByteBuffer = false)
             where T : struct
         {
-            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            using (IMemoryOwner<T> buffer = this.Allocate<T>(desiredLength, AllocationOptions.None, testManagedByteBuffer))
             {
                 T[] expectedVals = new T[buffer.Length()];
 
@@ -247,7 +238,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         {
             var dummy = default(T);
 
-            using (IBuffer<T> buffer = this.Allocate<T>(desiredLength, false, testManagedByteBuffer))
+            using (IMemoryOwner<T> buffer = this.Allocate<T>(desiredLength, AllocationOptions.None, testManagedByteBuffer))
             {
                 Assert.ThrowsAny<Exception>(
                     () =>
@@ -294,7 +285,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public void GetMemory_ReturnsValidMemory()
         {
-            using (IBuffer<CustomStruct> buffer = this.MemoryAllocator.Allocate<CustomStruct>(42))
+            using (IMemoryOwner<CustomStruct> buffer = this.MemoryAllocator.Allocate<CustomStruct>(42))
             {
                 Span<CustomStruct> span0 = buffer.GetSpan();
                 span0[10].A = 30;
@@ -311,7 +302,7 @@ namespace SixLabors.ImageSharp.Tests.Memory
         [Fact]
         public unsafe void GetMemory_ResultIsPinnable()
         {
-            using (IBuffer<int> buffer = this.MemoryAllocator.Allocate<int>(42))
+            using (IMemoryOwner<int> buffer = this.MemoryAllocator.Allocate<int>(42))
             {
                 Span<int> span0 = buffer.GetSpan();
                 span0[10] = 30;
diff --git a/tests/ImageSharp.Tests/Memory/MemorySourceTests.cs b/tests/ImageSharp.Tests/Memory/MemorySourceTests.cs
new file mode 100644
index 000000000..9cdfb5635
--- /dev/null
+++ b/tests/ImageSharp.Tests/Memory/MemorySourceTests.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Buffers;
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Memory;
+
+using Xunit;
+// ReSharper disable InconsistentNaming
+
+namespace SixLabors.ImageSharp.Tests.Memory
+{
+    public class MemorySourceTests
+    {
+        public class Construction
+        {
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void InitializeAsOwner(bool isInternalMemorySource)
+            {
+                var data = new Rgba32[21];
+                var mmg = new TestMemoryManager<Rgba32>(data);
+
+                var a = new MemorySource<Rgba32>(mmg, isInternalMemorySource);
+
+                Assert.Equal(mmg, a.MemoryOwner);
+                Assert.Equal(mmg.Memory, a.Memory);
+                Assert.Equal(isInternalMemorySource, a.HasSwappableContents);
+            }
+
+            [Fact]
+            public void InitializeAsObserver_MemoryOwner_IsNull()
+            {
+                var data = new Rgba32[21];
+                var mmg = new TestMemoryManager<Rgba32>(data);
+
+                var a = new MemorySource<Rgba32>(mmg.Memory);
+
+                Assert.Null(a.MemoryOwner);
+                Assert.Equal(mmg.Memory, a.Memory);
+                Assert.False(a.HasSwappableContents);
+            }
+        }
+
+        public class Dispose
+        {
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void WhenOwnershipIsTransfered_ShouldDisposeMemoryOwner(bool isInternalMemorySource)
+            {
+                var mmg = new TestMemoryManager<int>(new int[10]);
+                var bmg = new MemorySource<int>(mmg, isInternalMemorySource);
+                
+                bmg.Dispose();
+                Assert.True(mmg.IsDisposed);
+            }
+
+            [Fact]
+            public void WhenMemoryObserver_ShouldNotDisposeAnything()
+            {
+                var mmg = new TestMemoryManager<int>(new int[10]);
+                var bmg = new MemorySource<int>(mmg.Memory);
+
+                bmg.Dispose();
+                Assert.False(mmg.IsDisposed);
+            }
+        }
+        
+        public class SwapOrCopyContent
+        {
+            private MemoryAllocator MemoryAllocator { get; } = new TestMemoryAllocator();
+
+            private MemorySource<T> AllocateMemorySource<T>(int length, AllocationOptions options = AllocationOptions.None)
+                where T : struct
+            {
+                IMemoryOwner<T> owner = this.MemoryAllocator.Allocate<T>(length, options);
+                return new MemorySource<T>(owner, true);
+            }
+
+            [Fact]
+            public void WhenBothAreMemoryOwners_ShouldSwap()
+            {
+                MemorySource<int> a = this.AllocateMemorySource<int>(13);
+                MemorySource<int> b = this.AllocateMemorySource<int>(17);
+
+                IMemoryOwner<int> aa = a.MemoryOwner;
+                IMemoryOwner<int> bb = b.MemoryOwner;
+
+                Memory<int> aaa = a.Memory;
+                Memory<int> bbb = b.Memory;
+
+                MemorySource<int>.SwapOrCopyContent(ref a, ref b);
+
+                Assert.Equal(bb, a.MemoryOwner);
+                Assert.Equal(aa, b.MemoryOwner);
+
+                Assert.Equal(bbb, a.Memory);
+                Assert.Equal(aaa, b.Memory);
+                Assert.NotEqual(a.Memory, b.Memory);
+            }
+
+            [Theory]
+            [InlineData(false, false)]
+            [InlineData(true, true)]
+            [InlineData(true, false)]
+            public void WhenDestIsNotMemoryOwner_SameSize_ShouldCopy(bool sourceIsOwner, bool isInternalMemorySource)
+            {
+                var data = new Rgba32[21];
+                var color = new Rgba32(1, 2, 3, 4);
+
+                var destOwner = new TestMemoryManager<Rgba32>(data);
+                var dest = new MemorySource<Rgba32>(destOwner.Memory);
+
+                IMemoryOwner<Rgba32> sourceOwner = this.MemoryAllocator.Allocate<Rgba32>(21);
+
+                MemorySource<Rgba32> source = sourceIsOwner
+                                                   ? new MemorySource<Rgba32>(sourceOwner, isInternalMemorySource)
+                                                   : new MemorySource<Rgba32>(sourceOwner.Memory);
+                
+                sourceOwner.Memory.Span[10] = color;
+
+                // Act:
+                MemorySource<Rgba32>.SwapOrCopyContent(ref dest, ref source);
+
+                // Assert:
+                Assert.Equal(color, dest.Memory.Span[10]);
+                Assert.NotEqual(sourceOwner, dest.MemoryOwner);
+                Assert.NotEqual(destOwner, source.MemoryOwner);
+            }
+
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void WhenDestIsNotMemoryOwner_DifferentSize_Throws(bool sourceIsOwner)
+            {
+                var data = new Rgba32[21];
+                var color = new Rgba32(1, 2, 3, 4);
+
+                var destOwner = new TestMemoryManager<Rgba32>(data);
+                var dest = new MemorySource<Rgba32>(destOwner.Memory);
+
+                IMemoryOwner<Rgba32> sourceOwner = this.MemoryAllocator.Allocate<Rgba32>(22);
+
+                MemorySource<Rgba32> source = sourceIsOwner
+                                                   ? new MemorySource<Rgba32>(sourceOwner, true)
+                                                   : new MemorySource<Rgba32>(sourceOwner.Memory);
+                sourceOwner.Memory.Span[10] = color;
+
+                // Act:
+                Assert.ThrowsAny<InvalidOperationException>(
+                    () => MemorySource<Rgba32>.SwapOrCopyContent(ref dest, ref source)
+                );
+                
+                Assert.Equal(color, source.Memory.Span[10]);
+                Assert.NotEqual(color, dest.Memory.Span[10]);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/ICC/Various/IccProfileIdTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/Various/IccProfileIdTests.cs
new file mode 100644
index 000000000..46b8b31b4
--- /dev/null
+++ b/tests/ImageSharp.Tests/MetaData/Profiles/ICC/Various/IccProfileIdTests.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.MetaData.Profiles.Icc;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Icc
+{
+    public class IccProfileIdTests
+    {
+        [Fact]
+        public void ZeroIsEqualToDefault()
+        {
+            Assert.True(IccProfileId.Zero.Equals(default));
+
+            Assert.False(default(IccProfileId).IsSet);
+        }
+
+        [Fact]
+        public void SetIsTrueWhenNonDefaultValue()
+        {
+            var id = new IccProfileId(1, 2, 3, 4);
+
+            Assert.True(id.IsSet);
+
+            Assert.Equal(1u, id.Part1);
+            Assert.Equal(2u, id.Part2);
+            Assert.Equal(3u, id.Part3);
+            Assert.Equal(4u, id.Part4);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs
index 36473fa56..120619fb5 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelBlenders/PorterDuffCompositorTests.cs
@@ -5,7 +5,6 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelBlenders
 {
     using SixLabors.ImageSharp.PixelFormats;
     using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Drawing;
 
     using Xunit;
 
diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
index c0e69a902..ca7e48d0b 100644
--- a/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperationsTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -57,8 +58,8 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
                 int times = 200000;
                 int count = 1024;
 
-                using (IBuffer<ImageSharp.PixelFormats.Rgba32> source = Configuration.Default.MemoryAllocator.Allocate<ImageSharp.PixelFormats.Rgba32>(count))
-                using (IBuffer<Vector4> dest = Configuration.Default.MemoryAllocator.Allocate<Vector4>(count))
+                using (IMemoryOwner<ImageSharp.PixelFormats.Rgba32> source = Configuration.Default.MemoryAllocator.Allocate<ImageSharp.PixelFormats.Rgba32>(count))
+                using (IMemoryOwner<Vector4> dest = Configuration.Default.MemoryAllocator.Allocate<Vector4>(count))
                 {
                     this.Measure(
                         times,
@@ -537,7 +538,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
             where TDest : struct
         {
             public TSource[] SourceBuffer { get; }
-            public IBuffer<TDest> ActualDestBuffer { get; }
+            public IMemoryOwner<TDest> ActualDestBuffer { get; }
             public TDest[] ExpectedDestBuffer { get; }
 
             public TestBuffers(TSource[] source, TDest[] expectedDest)
@@ -586,7 +587,7 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats
         internal static void TestOperation<TSource, TDest>(
             TSource[] source,
             TDest[] expected,
-            Action<TSource[], IBuffer<TDest>> action)
+            Action<TSource[], IMemoryOwner<TDest>> action)
             where TSource : struct
             where TDest : struct
         {
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
index 46198991a..5f6e825f6 100644
--- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
@@ -2,12 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-
-using SixLabors.ImageSharp.Processing.Binarization;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
-using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs
index bf15db366..569c4ba21 100644
--- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryThresholdTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Binarization;
-using SixLabors.ImageSharp.Processing.Binarization.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Binarization;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs b/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs
index 3e1a7acc0..c98f91046 100644
--- a/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Binarization/OrderedDitherFactoryTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Convolution/BoxBlurTest.cs b/tests/ImageSharp.Tests/Processing/Convolution/BoxBlurTest.cs
index 07c69a94c..e425b6315 100644
--- a/tests/ImageSharp.Tests/Processing/Convolution/BoxBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Convolution/BoxBlurTest.cs
@@ -2,15 +2,12 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.Primitives;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Convolution
 {
-    using SixLabors.ImageSharp.Processing.Convolution;
-    using SixLabors.ImageSharp.Processing.Convolution.Processors;
-
     public class BoxBlurTest : BaseImageOperationsExtensionTest
     {
         [Fact]
diff --git a/tests/ImageSharp.Tests/Processing/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Convolution/DetectEdgesTest.cs
index 45a5b0313..60fa19b49 100644
--- a/tests/ImageSharp.Tests/Processing/Convolution/DetectEdgesTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Convolution/DetectEdgesTest.cs
@@ -5,15 +5,13 @@ using System.Collections.Generic;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using SixLabors.ImageSharp.Tests.TestUtilities;
 using SixLabors.Primitives;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Convolution
 {
-    using SixLabors.ImageSharp.Processing.Convolution;
-    using SixLabors.ImageSharp.Processing.Convolution.Processors;
-
     public class DetectEdgesTest : BaseImageOperationsExtensionTest
     {
 
diff --git a/tests/ImageSharp.Tests/Processing/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Convolution/GaussianBlurTest.cs
index 5399a7ec8..c87a834eb 100644
--- a/tests/ImageSharp.Tests/Processing/Convolution/GaussianBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Convolution/GaussianBlurTest.cs
@@ -2,15 +2,12 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.Primitives;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Convolution
 {
-    using SixLabors.ImageSharp.Processing.Convolution;
-    using SixLabors.ImageSharp.Processing.Convolution.Processors;
-
     public class GaussianBlurTest : BaseImageOperationsExtensionTest
     {
         [Fact]
diff --git a/tests/ImageSharp.Tests/Processing/Convolution/GaussianSharpenTest.cs b/tests/ImageSharp.Tests/Processing/Convolution/GaussianSharpenTest.cs
index 518c2960f..675498745 100644
--- a/tests/ImageSharp.Tests/Processing/Convolution/GaussianSharpenTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Convolution/GaussianSharpenTest.cs
@@ -2,15 +2,12 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.Primitives;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Convolution
 {
-    using SixLabors.ImageSharp.Processing.Convolution;
-    using SixLabors.ImageSharp.Processing.Convolution.Processors;
-
     public class GaussianSharpenTest : BaseImageOperationsExtensionTest
     {
         [Fact]
diff --git a/tests/ImageSharp.Tests/Processing/Convolution/Processors/LaplacianKernelFactoryTests.cs b/tests/ImageSharp.Tests/Processing/Convolution/Processors/LaplacianKernelFactoryTests.cs
index 439632210..8b3524fe6 100644
--- a/tests/ImageSharp.Tests/Processing/Convolution/Processors/LaplacianKernelFactoryTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Convolution/Processors/LaplacianKernelFactoryTests.cs
@@ -3,10 +3,10 @@
 
 using System;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Convolution.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Convolution;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.Processing.Convolution.Processors
+namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
 {
     public class LaplacianKernelFactoryTests
     {
diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
index e53de85fe..f393d5923 100644
--- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
-using SixLabors.ImageSharp.Processing.Dithering.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs
index 6aa8fbba6..7775de2d2 100644
--- a/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Effects/BackgroundColorTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Overlays;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs
index 2f4ba0516..9cd24fc6d 100644
--- a/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Effects/OilPaintTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
diff --git a/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs b/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs
index 245e104f9..a93eaf0bc 100644
--- a/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Effects/PixelateTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Effects;
-using SixLabors.ImageSharp.Processing.Effects.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Effects;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
diff --git a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs
index 7e06e67d7..d651f2f04 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/BlackWhiteTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Filters
diff --git a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs
index e47430efa..e210450a8 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/BrightnessTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
diff --git a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
index ee99938bb..aeafe5fe1 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs
index 2f9a8331d..21a552e6a 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/ContrastTest.cs
@@ -7,8 +7,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
 {
-    using SixLabors.ImageSharp.Processing.Filters;
-    using SixLabors.ImageSharp.Processing.Filters.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Filters;
 
     public class ContrastTest : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
index cac1d7057..414a0d74e 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
@@ -8,8 +8,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
-    using SixLabors.ImageSharp.Processing.Filters.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Filters;
 
     public class FilterTest : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs
index 667354b28..d63d97820 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/GrayscaleTest.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using SixLabors.ImageSharp.Processing.Processors;
 using SixLabors.ImageSharp.Tests.TestUtilities;
 
diff --git a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs b/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs
index 61220d59f..f56578dd6 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/HueTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs
index 61fd206db..c93afc942 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/InvertTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
diff --git a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs
index a0a551d09..a98252140 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/KodachromeTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Filters
diff --git a/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs
index 5bd4394ab..c104f8c25 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/LomographTest.cs
@@ -9,8 +9,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Processing.Filters;
-    using SixLabors.ImageSharp.Processing.Filters.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Filters;
 
     public class LomographTest : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs b/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs
index 96811544c..adbb8cf29 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/OpacityTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Effects
diff --git a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs
index 4f7c410f0..f28827b71 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/PolaroidTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs
index 830580fc2..4b8e80881 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/SaturateTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Filters
diff --git a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs
index 5e01e26f4..9351c8443 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/SepiaTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Filters;
-using SixLabors.ImageSharp.Processing.Filters.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Filters;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Filters
diff --git a/tests/ImageSharp.Tests/Processing/Normalization/HistogramEqualizationTests.cs b/tests/ImageSharp.Tests/Processing/Normalization/HistogramEqualizationTests.cs
new file mode 100644
index 000000000..1595ed32c
--- /dev/null
+++ b/tests/ImageSharp.Tests/Processing/Normalization/HistogramEqualizationTests.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Tests.Processing.Normalization
+{
+    public class HistogramEqualizationTests
+    {
+        [Theory]
+        [InlineData(256)]
+        [InlineData(65536)]
+        public void HistogramEqualizationTest(int luminanceLevels)
+        {
+            // Arrange
+            byte[] pixels = new byte[]
+            {
+                52,  55,  61,  59,  70,  61,  76,  61,
+                62,  59,  55, 104,  94,  85,  59,  71,
+                63,  65,  66, 113, 144, 104,  63,  72,
+                64,  70,  70, 126, 154, 109,  71,  69,
+                67,  73,  68, 106, 122,  88,  68,  68,
+                68,  79,  60,  79,  77,  66,  58,  75,
+                69,  85,  64,  58,  55,  61,  65,  83,
+                70,  87,  69,  68,  65,  73,  78,  90
+            };
+
+            var image = new Image<Rgba32>(8, 8);
+            for (int y = 0; y < 8; y++)
+            {
+                for (int x = 0; x < 8; x++)
+                {
+                    byte luminance = pixels[y * 8 + x];
+                    image[x, y] = new Rgba32(luminance, luminance, luminance);
+                }
+            }
+
+            byte[] expected = new byte[]
+            {
+                0,    12,   53,   32,  146,   53,  174,   53,
+                57,   32,   12,  227,  219,  202,   32,  154,
+                65,   85,   93,  239,  251,  227,   65,  158,
+                73,  146,  146,  247,  255,  235,  154,  130,
+                97,  166,  117,  231,  243,  210,  117,  117,
+                117, 190,   36,  190,  178,   93,   20,  170,
+                130, 202,   73,   20,   12,   53,   85,  194,
+                146, 206,  130,  117,   85,  166,  182,  215
+            };
+
+            // Act
+            image.Mutate(x => x.HistogramEqualization(luminanceLevels));
+
+            // Assert
+            for (int y = 0; y < 8; y++)
+            {
+                for (int x = 0; x < 8; x++)
+                {
+                    Rgba32 actual = image[x, y];
+                    Assert.Equal(expected[y * 8 + x], actual.R);
+                    Assert.Equal(expected[y * 8 + x], actual.G);
+                    Assert.Equal(expected[y * 8 + x], actual.B);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/ImageSharp.Tests/Processing/Overlays/GlowTest.cs b/tests/ImageSharp.Tests/Processing/Overlays/GlowTest.cs
index 4165ea24e..899082e36 100644
--- a/tests/ImageSharp.Tests/Processing/Overlays/GlowTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Overlays/GlowTest.cs
@@ -5,8 +5,8 @@ using System;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Overlays;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Overlays/VignetteTest.cs b/tests/ImageSharp.Tests/Processing/Overlays/VignetteTest.cs
index bd42cf14e..f47bffe26 100644
--- a/tests/ImageSharp.Tests/Processing/Overlays/VignetteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Overlays/VignetteTest.cs
@@ -3,8 +3,8 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Primitives;
-using SixLabors.ImageSharp.Processing.Overlays;
-using SixLabors.ImageSharp.Processing.Overlays.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Overlays;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
index eb5785919..44fdfc703 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
@@ -3,10 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Binarization;
-using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
index b1092782c..988c9125b 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryThresholdTest.cs
@@ -10,7 +10,6 @@ using Xunit;
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
 {
     using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Binarization;
 
     public class BinaryThresholdTest : FileTestBase
     {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
index b49fbf435..0c40debad 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BoxBlurTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Convolution;
-
     public class BoxBlurTest : FileTestBase
     {
         public static readonly TheoryData<int> BoxBlurValues
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
index ae172a0bf..a32239d96 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs
@@ -3,7 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Convolution;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
index 3b6a52bb1..6bd3b34bb 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianBlurTest.cs
@@ -3,7 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Convolution;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
index 3d97cf0d0..8eb1f85eb 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/GaussianSharpenTest.cs
@@ -3,7 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Convolution;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
index ba31e35a2..9774cb50c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
@@ -5,8 +5,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Dithering;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-using SixLabors.ImageSharp.Processing.Dithering.Ordered;
+using SixLabors.ImageSharp.Processing.Processors.Dithering;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
index 1e234e81e..792c7b080 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/BackgroundColorTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Overlays;
-
     public class BackgroundColorTest : FileTestBase
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
index 715e997bf..d4429aaf3 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/OilPaintTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Effects;
-
     public class OilPaintTest : FileTestBase
     {
         public static readonly TheoryData<int, int> OilPaintValues = new TheoryData<int, int>
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
index 84831e415..cb9a0ba0c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Effects/PixelateTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Effects;
-
     public class PixelateTest : FileTestBase
     {
         public static readonly TheoryData<int> PixelateValues
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
index f360faff4..64aeae053 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
     using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
     [GroupOutput("Filters")]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
index 14f5fa080..ed790cbac 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/BrightnessTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class BrightnessTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
index fd7724531..3d48e16ec 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class ColorBlindnessTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
index c6afc5e11..e5e4fa4a9 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/ContrastTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class ContrastTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
index d275c1b1a..479a3c33a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class FilterTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
index 192034fbb..f08ec147e 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/GrayscaleTest.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class GrayscaleTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
index 6e3fd5fef..4ce700bad 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/HueTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class HueTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
index de105437b..1b4c70646 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/InvertTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class InvertTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
index 2265e0b0b..b7b635c2d 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/KodachromeTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class KodachromeTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
index 92c5b788c..013ec3874 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/LomographTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class LomographTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
index c76bf3b1d..35e405f4c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/OpacityTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Effects
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class OpacityTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
index 19fcc6788..3b39542a5 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/PolaroidTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class PolaroidTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
index 18d77660e..31fab8b65 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/SaturateTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class SaturateTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
index 50bf0e3a1..b7d381f5f 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/SepiaTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 {
-    using SixLabors.ImageSharp.Processing.Filters;
+    using SixLabors.ImageSharp.Processing;
 
     [GroupOutput("Filters")]
     public class SepiaTest
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
index 5c610fb31..479ee346a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/GlowTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Overlays
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Overlays;
-
     public class GlowTest : FileTestBase
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
index 1c69b531c..3a378a095 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Overlays/VignetteTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
 using SixLabors.Primitives;
@@ -9,9 +10,6 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Overlays
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Overlays;
-
     public class VignetteTest : FileTestBase
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
index bae22e7a9..d31f999d0 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
+    using SixLabors.ImageSharp.Processing;
 
     public class AutoOrientTests : FileTestBase
     {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
index 0936bf477..c154c8ff3 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/CropTest.cs
@@ -3,8 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
index 86b37365d..728527021 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/EntropyCropTest.cs
@@ -3,8 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
index 0ac8a9459..d7e7a724c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
+    using SixLabors.ImageSharp.Processing;
 
     public class FlipTests
     {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
index 3294ecc73..6cce62d14 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/PadTest.cs
@@ -2,13 +2,11 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
-
     public class PadTest : FileTestBase
     {
         [Theory]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
index ab19c21eb..d5f015404 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
@@ -7,9 +7,7 @@ using System.Text;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
 using SixLabors.Primitives;
 using Xunit.Abstractions;
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
index 6a6dc45f7..746d8da16 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
@@ -3,10 +3,10 @@
 
 using System;
 
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
@@ -92,7 +92,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         {
             using (Image<TPixel> image0 = provider.GetImage())
             {
-                var mmg = TestMemoryManager<TPixel>.CreateAsCopyOfPixelData(image0);
+                var mmg = TestMemoryManager<TPixel>.CreateAsCopyOf(image0.GetPixelSpan());
 
                 using (var image1 = Image.WrapMemory(mmg.Memory, image0.Width, image0.Height))
                 {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
index b2865d9da..d6376b179 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
+    using SixLabors.ImageSharp.Processing;
 
     public class RotateFlipTests : FileTestBase
     {
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
index 2163f5fc9..c0db205f9 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
@@ -3,8 +3,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
@@ -25,7 +23,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
             RotateMode.Rotate180,
             RotateMode.Rotate270
         };
-        
+
         [Theory]
         [WithTestPatternImages(nameof(RotateAngles), 100, 50, DefaultPixelType)]
         [WithTestPatternImages(nameof(RotateAngles), 50, 100, DefaultPixelType)]
@@ -38,7 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
                 image.DebugSave(provider, value);
             }
         }
-        
+
         [Theory]
         [WithTestPatternImages(nameof(RotateEnumValues), 100, 50, DefaultPixelType)]
         [WithTestPatternImages(nameof(RotateEnumValues), 50, 100, DefaultPixelType)]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
index 30c9e682d..ae2b12e87 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
@@ -1,19 +1,17 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Reflection;
-
-    using SixLabors.ImageSharp.Processing;
-    using SixLabors.ImageSharp.Processing.Transforms;
-    using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
-
     public class SkewTest : FileTestBase
     {
         public static readonly TheoryData<float, float> SkewValues
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
index fae876aff..8ec8409ad 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
@@ -4,8 +4,7 @@ using System.Reflection;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
@@ -14,7 +13,6 @@ using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 {
-
     public class AffineTransformTests
     {
         private readonly ITestOutputHelper Output;
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/AutoOrientTests.cs
index d01e84220..bba4661db 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/AutoOrientTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/AutoOrientTests.cs
@@ -7,8 +7,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
-    using SixLabors.ImageSharp.Processing.Transforms.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
     public class AutoOrientTests : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/CropTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/CropTest.cs
index 78b6852e4..154167f15 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/CropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/CropTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/EntropyCropTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/EntropyCropTest.cs
index 9c2176b25..03a8628a5 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/EntropyCropTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/EntropyCropTest.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
index 41aeb1ad5..39adcaa3f 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
@@ -9,8 +9,8 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
-    using SixLabors.ImageSharp.Processing.Transforms.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
     public class FlipTests : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
index dd4c31458..82d768255 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
@@ -2,13 +2,13 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 {
-    using SixLabors.ImageSharp.Processing.Transforms;
-    using SixLabors.ImageSharp.Processing.Transforms.Processors;
+    using SixLabors.ImageSharp.Processing;
+    using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
     public class PadTest : BaseImageOperationsExtensionTest
     {
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/ProjectiveTransformTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/ProjectiveTransformTests.cs
index ece3f1742..f0a924d27 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/ProjectiveTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/ProjectiveTransformTests.cs
@@ -6,16 +6,14 @@ using System.Numerics;
 using System.Reflection;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using Xunit;
+using Xunit.Abstractions;
 // ReSharper disable InconsistentNaming
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 {
-    using Xunit.Abstractions;
-
     public class ProjectiveTransformTests
     {
         private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.03f, 3);
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
index ee72f361b..948c79d8d 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
@@ -2,9 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
-using SixLabors.ImageSharp.Processing.Transforms.Resamplers;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
index 9a396e871..dccf7afa6 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
index 2bf7cded8..ae312d723 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
@@ -3,9 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs
index 9df8e267c..73754b971 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/SkewTest.cs
@@ -3,8 +3,8 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
-using SixLabors.ImageSharp.Processing.Transforms;
-using SixLabors.ImageSharp.Processing.Transforms.Processors;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs
index 5de92a40b..146ed6230 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/TransformsHelpersTest.cs
@@ -3,8 +3,7 @@
 
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Transforms;
-
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Processing.Transforms
diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
index 91b331639..c2b1c26c5 100644
--- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
+++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Quantization;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
 
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index b0bdad8e5..142b923ed 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -65,6 +65,9 @@ namespace SixLabors.ImageSharp.Tests
             public const string Banner7Adam7InterlaceMode = "Png/banner7-adam.png";
             public const string Banner8Index = "Png/banner8-index.png";
 
+            public const string Ratio1x4 = "Png/ratio-1x4.png";
+            public const string Ratio4x1 = "Png/ratio-4x1.png";
+
             public static class Bad
             {
                 // Odd chunk lengths
@@ -79,7 +82,7 @@ namespace SixLabors.ImageSharp.Tests
                 Powerpoint, SplashInterlaced, Interlaced,
                 Filter0, Filter1, Filter2, Filter3, Filter4,
                 FilterVar, VimImage1, VimImage2, VersioningImage1,
-                VersioningImage2
+                VersioningImage2, Ratio4x1, Ratio1x4
             };
         }
 
@@ -124,13 +127,14 @@ namespace SixLabors.ImageSharp.Tests
                 public const string Jpeg420Small = "Jpg/baseline/jpeg420small.jpg";
                 public const string Testorig420 = "Jpg/baseline/testorig.jpg";
                 public const string MultiScanBaselineCMYK = "Jpg/baseline/MultiScanBaselineCMYK.jpg";
+                public const string Ratio1x1 = "Jpg/baseline/ratio-1x1.jpg";
 
                 public static readonly string[] All =
-                    {
-                        Cmyk, Ycck, Exif, Floorplan,
-                        Calliphora, Turtle, GammaDalaiLamaGray,
-                        Hiyamugi, Jpeg400, Jpeg420Exif, Jpeg444,
-                    };
+                {
+                    Cmyk, Ycck, Exif, Floorplan,
+                    Calliphora, Turtle, GammaDalaiLamaGray,
+                    Hiyamugi, Jpeg400, Jpeg420Exif, Jpeg444, Ratio1x1
+                };
             }
 
             public static class Issues
@@ -176,15 +180,17 @@ namespace SixLabors.ImageSharp.Tests
             public const string Cheers = "Gif/cheers.gif";
             public const string Trans = "Gif/trans.gif";
             public const string Kumin = "Gif/kumin.gif";
+            public const string Ratio4x1 = "Gif/base_4x1.gif";
+            public const string Ratio1x4 = "Gif/base_1x4.gif";
 
-            public class Issues
+            public static class Issues
             {
                 public const string BadAppExtLength = "Gif/issues/issue405_badappextlength252.gif";
                 public const string BadAppExtLength_2 = "Gif/issues/issue405_badappextlength252-2.gif";
                 public const string BadDescriptorWidth = "Gif/issues/issue403_baddescriptorwidth.gif";
             }
 
-            public static readonly string[] All = { Rings, Giphy, Cheers, Trans, Kumin };
+            public static readonly string[] All = { Rings, Giphy, Cheers, Trans, Kumin, Ratio4x1, Ratio1x4 };
         }
     }
 }
diff --git a/tests/ImageSharp.Tests/TestUtilities/ApproximateFloatComparer.cs b/tests/ImageSharp.Tests/TestUtilities/ApproximateFloatComparer.cs
index 24363173a..102a629be 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ApproximateFloatComparer.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ApproximateFloatComparer.cs
@@ -15,7 +15,7 @@ namespace SixLabors.ImageSharp.Tests
         IEqualityComparer<CieXyChromaticityCoordinates>,
         IEqualityComparer<RgbPrimariesChromaticityCoordinates>,
         IEqualityComparer<CieXyz>,
-        IEqualityComparer<IRgbWorkingSpace>
+        IEqualityComparer<RgbWorkingSpace>
     {
         private readonly float Eps;
 
@@ -76,9 +76,9 @@ namespace SixLabors.ImageSharp.Tests
             throw new NotImplementedException();
         }
 
-        public bool Equals(IRgbWorkingSpace x, IRgbWorkingSpace y)
+        public bool Equals(RgbWorkingSpace x, RgbWorkingSpace y)
         {
-            if (x is IRgbWorkingSpace g1 && y is IRgbWorkingSpace g2)
+            if (x is RgbWorkingSpace g1 && y is RgbWorkingSpace g2)
             {
                 return this.Equals(g1.WhitePoint, g2.WhitePoint)
                     && this.Equals(g1.ChromaticityCoordinates, g2.ChromaticityCoordinates);
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Tests
                 && this.Equals(x.ChromaticityCoordinates, y.ChromaticityCoordinates);
         }
 
-        public int GetHashCode(IRgbWorkingSpace obj)
+        public int GetHashCode(RgbWorkingSpace obj)
         {
             throw new NotImplementedException();
         }
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
index 70e762585..97ed30b99 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
@@ -4,8 +4,6 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
-
 using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Tests
diff --git a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
index f0daa0abb..7cc369244 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ReferenceCodecs/SystemDrawingBridge.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Drawing;
 using System.Drawing.Imaging;
 
@@ -43,7 +44,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (IBuffer<Bgra32> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgra32>(w))
+            using (IMemoryOwner<Bgra32> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgra32>(w))
             {
                 fixed (Bgra32* destPtr = &workBuffer.GetReference())
                 {
@@ -89,7 +90,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
 
             var image = new Image<TPixel>(w, h);
 
-            using (IBuffer<Bgr24> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgr24>(w))
+            using (IMemoryOwner<Bgr24> workBuffer = Configuration.Default.MemoryAllocator.Allocate<Bgr24>(w))
             {
                 fixed (Bgr24* destPtr = &workBuffer.GetReference())
                 {
@@ -122,7 +123,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs
             long destRowByteCount = data.Stride;
             long sourceRowByteCount = w * sizeof(Bgra32);
 
-            using (IBuffer<Bgra32> workBuffer = image.GetConfiguration().MemoryAllocator.Allocate<Bgra32>(w))
+            using (IMemoryOwner<Bgra32> workBuffer = image.GetConfiguration().MemoryAllocator.Allocate<Bgra32>(w))
             {
                 fixed (Bgra32* sourcePtr = &workBuffer.GetReference())
                 {
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestMemoryAllocator.cs b/tests/ImageSharp.Tests/TestUtilities/TestMemoryAllocator.cs
new file mode 100644
index 000000000..a580fc7ad
--- /dev/null
+++ b/tests/ImageSharp.Tests/TestUtilities/TestMemoryAllocator.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Buffers;
+using System.Runtime.InteropServices;
+
+using SixLabors.Memory;
+
+namespace SixLabors.ImageSharp.Tests.Memory
+{
+    internal class TestMemoryAllocator : MemoryAllocator
+    {
+        public TestMemoryAllocator(byte dirtyValue = 42)
+        {
+            this.DirtyValue = dirtyValue;
+        }
+
+        /// <summary>
+        /// The value to initilazie the result buffer with, with non-clean options (<see cref="AllocationOptions.None"/>)
+        /// </summary>
+        public byte DirtyValue { get; }
+
+        internal override IMemoryOwner<T> Allocate<T>(int length, AllocationOptions options = AllocationOptions.None)
+        {
+            T[] array = this.AllocateArray<T>(length, options);
+
+            return new BasicArrayBuffer<T>(array, length);
+        }
+
+        internal override IManagedByteBuffer AllocateManagedByteBuffer(int length, AllocationOptions options = AllocationOptions.None)
+        {
+            byte[] array = this.AllocateArray<byte>(length, options);
+            return new ManagedByteBuffer(array);
+        }
+        
+        private T[] AllocateArray<T>(int length, AllocationOptions options)
+            where T : struct
+        {
+            var array = new T[length + 42];
+
+            if (options == AllocationOptions.None)
+            {
+                Span<byte> data = MemoryMarshal.Cast<T, byte>(array.AsSpan());
+                data.Fill(this.DirtyValue);
+            }
+
+            return array;
+        }
+
+        private class ManagedByteBuffer : BasicArrayBuffer<byte>, IManagedByteBuffer
+        {
+            public ManagedByteBuffer(byte[] array)
+                : base(array)
+            {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs b/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs
index e7ecb2dda..9274e5727 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestMemoryManager.cs
@@ -3,22 +3,17 @@ using System.Buffers;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Advanced;
-    using SixLabors.ImageSharp.PixelFormats;
-
     class TestMemoryManager<T> : MemoryManager<T>
-        where T : struct, IPixel<T>
+        where T : struct
     {
         public TestMemoryManager(T[] pixelArray)
         {
             this.PixelArray = pixelArray;
         }
 
-        public T[] PixelArray { get; }
+        public T[] PixelArray { get; private set; }
 
-        protected override void Dispose(bool disposing)
-        {
-        }
+        public bool IsDisposed { get; private set; }
 
         public override Span<T> GetSpan()
         {
@@ -35,16 +30,17 @@ namespace SixLabors.ImageSharp.Tests
             throw new NotImplementedException();
         }
 
-        public static TestMemoryManager<T> CreateAsCopyOfPixelData(Span<T> pixelData)
+        public static TestMemoryManager<T> CreateAsCopyOf(Span<T> copyThisBuffer)
         {
-            var pixelArray = new T[pixelData.Length];
-            pixelData.CopyTo(pixelArray);
+            var pixelArray = new T[copyThisBuffer.Length];
+            copyThisBuffer.CopyTo(pixelArray);
             return new TestMemoryManager<T>(pixelArray);
         }
 
-        public static TestMemoryManager<T> CreateAsCopyOfPixelData(Image<T> image)
+        protected override void Dispose(bool disposing)
         {
-            return CreateAsCopyOfPixelData(image.GetPixelSpan());
+            this.IsDisposed = true;
+            this.PixelArray = null;
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs
index 03ab422e5..81310c1a0 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs
@@ -214,7 +214,7 @@ namespace SixLabors.ImageSharp.Tests
 
             using (Image<TPixel> image0 = provider.GetImage())
             {
-                var mmg = TestMemoryManager<TPixel>.CreateAsCopyOfPixelData(image0.GetPixelSpan());
+                var mmg = TestMemoryManager<TPixel>.CreateAsCopyOf(image0.GetPixelSpan());
 
                 using (var image1 = Image.WrapMemory(mmg.Memory, image0.Width, image0.Height))
                 {
@@ -228,6 +228,8 @@ namespace SixLabors.ImageSharp.Tests
                     // TODO: Investigate the cause of pixel inaccuracies under Linux
                     if (TestEnvironment.IsWindows)
                     {
+                        string testNameBackup = provider.Utility.TestName;
+
                         if (useReferenceOutputFrom != null)
                         {
                             provider.Utility.TestName = useReferenceOutputFrom;
@@ -239,6 +241,8 @@ namespace SixLabors.ImageSharp.Tests
                             testOutputDetails,
                             appendPixelTypeToFileName: appendPixelTypeToFileName,
                             appendSourceFileOrDescription: appendSourceFileOrDescription);
+
+                        provider.Utility.TestName = testNameBackup;
                     }
                 }
             }
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs
index b9fa70f22..c935a4b98 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs
@@ -5,7 +5,6 @@ using Moq;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Transforms;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 using SixLabors.Primitives;
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
index cab61bc59..6e8278276 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
@@ -7,15 +7,14 @@ using System.Linq;
 using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.Memory;
 
 using Xunit;
 using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using SixLabors.ImageSharp.Processing.Effects;
-    using SixLabors.Memory;
-
     public class TestUtilityExtensionsTests
     {
         public TestUtilityExtensionsTests(ITestOutputHelper output)
@@ -55,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests
             where TPixel : struct, IPixel<TPixel>
         {
             Image<TPixel> a = provider.GetImage();
-            Image<TPixel> b = provider.GetImage(x=>x.OilPaint(3, 2));
+            Image<TPixel> b = provider.GetImage(x => x.OilPaint(3, 2));
 
             Assert.False(a.IsEquivalentTo(b, compareAlpha));
         }
diff --git a/tests/Images/Input/Gif/base_1x4.gif b/tests/Images/Input/Gif/base_1x4.gif
new file mode 100644
index 000000000..b5d481fee
Binary files /dev/null and b/tests/Images/Input/Gif/base_1x4.gif differ
diff --git a/tests/Images/Input/Gif/base_4x1.gif b/tests/Images/Input/Gif/base_4x1.gif
new file mode 100644
index 000000000..81a672e24
Binary files /dev/null and b/tests/Images/Input/Gif/base_4x1.gif differ
diff --git a/tests/Images/Input/Jpg/baseline/ratio-1x1.jpg b/tests/Images/Input/Jpg/baseline/ratio-1x1.jpg
new file mode 100644
index 000000000..0162ac9ae
Binary files /dev/null and b/tests/Images/Input/Jpg/baseline/ratio-1x1.jpg differ
diff --git a/tests/Images/Input/Png/ratio-1x4.png b/tests/Images/Input/Png/ratio-1x4.png
new file mode 100644
index 000000000..559e5261e
Binary files /dev/null and b/tests/Images/Input/Png/ratio-1x4.png differ
diff --git a/tests/Images/Input/Png/ratio-4x1.png b/tests/Images/Input/Png/ratio-4x1.png
new file mode 100644
index 000000000..3e07e8ecb
Binary files /dev/null and b/tests/Images/Input/Png/ratio-4x1.png differ