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/Processing/Drawing/Brushes/BrushApplicator.cs b/src/ImageSharp.Drawing/Processing/BrushApplicator.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs
rename to src/ImageSharp.Drawing/Processing/BrushApplicator.cs
index 7672681da..04e2d0b9d 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Processing/BrushApplicator.cs
@@ -6,7 +6,7 @@ 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
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 97%
rename from src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs
rename to src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs
index a20d7f730..114de7610 100644
--- a/src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs
+++ b/src/ImageSharp.Drawing/Processing/DrawTextExtensions.cs
@@ -3,12 +3,10 @@
 
 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.
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 d0a1ef1c2..a844457ac 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 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
index 779848856..7e24dbbe2 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
@@ -7,7 +7,7 @@ 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.
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 99%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
index 21f2066fb..30d78bc83 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
@@ -9,7 +9,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.
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 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.cs
index 506df3886..e4b2eadb4 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/DrawImageProcessor.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.Drawing.Processors
+namespace SixLabors.ImageSharp.Processing.Processors.Drawing
 {
     /// <summary>
     /// Combines two images together by blending the pixels.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
similarity index 96%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
index 4214041a7..595c94687 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillProcessor.cs
@@ -5,12 +5,11 @@ using System;
 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.ImageSharp.Processing;
 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.
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
index 1e968b97e..1cc954dd9 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor.cs
@@ -4,13 +4,11 @@
 using System;
 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
diff --git a/src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs
rename to src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
index 9327f9449..9f1158154 100644
--- a/src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs
+++ b/src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor.cs
@@ -6,15 +6,12 @@ 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.
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 99%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
index a7da2cc5b..480c42ee0 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
@@ -8,7 +8,7 @@ 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
diff --git a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
index 791c307bf..8a2d47c6c 100644
--- a/src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
@@ -7,7 +7,7 @@ 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.
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/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 112c4a1a8..5fbd9f112 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
@@ -11,7 +11,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
index 01846708a..624b54278 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawText.cs
@@ -9,9 +9,8 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Text;
-using SixLabors.ImageSharp.Processing.Drawing;
 using System.Linq;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -21,7 +20,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(this.TextPhrase, this.TextIterations));
 
@@ -38,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));
                 }
             }
         }
@@ -50,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 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))));
             }
         }
 
@@ -60,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 d03e69f38..ba6d055e3 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawTextOutline.cs
@@ -8,9 +8,8 @@ using System.Drawing.Drawing2D;
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Text;
-using SixLabors.ImageSharp.Processing.Drawing;
 using System.Linq;
+using SixLabors.ImageSharp.Processing.Processors.Text;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -20,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));
 
@@ -50,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))));
             }
         }
 
@@ -60,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 d78379fc0..8aadb85bf 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
@@ -12,7 +12,6 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 
 namespace SixLabors.ImageSharp.Benchmarks
 {
@@ -36,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 ac56caa46..643e4ac9a 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
@@ -10,7 +10,6 @@ using BenchmarkDotNet.Attributes;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using CoreRectangle = SixLabors.Primitives.Rectangle;
 using CoreSize = SixLabors.Primitives.Size;
 
@@ -30,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.Tests/Drawing/BeziersTests.cs b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
index 1790d1a20..443b49c7c 100644
--- a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
@@ -5,7 +5,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.Memory;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
index 4c681fb89..40ad92adc 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Drawing;
+using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
index 424b875e0..96af63fd5 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawPathTests.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.Drawing.Pens;
 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 c65d04d9d..f13f808b6 100644
--- a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
@@ -5,14 +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.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..1f01d54f4 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
diff --git a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
index b664d1a14..d3b39709a 100644
--- a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.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.Drawing.Pens;
 using SixLabors.Shapes;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/LineTests.cs b/tests/ImageSharp.Tests/Drawing/LineTests.cs
index 6be81e0aa..747c75cde 100644
--- a/tests/ImageSharp.Tests/Drawing/LineTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineTests.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.Drawing.Pens;
 
 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 a0b958860..f9a41baba 100644
--- a/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
@@ -6,7 +6,6 @@ using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 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 e8a6eef1d..94d3d49ff 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -4,7 +4,6 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.Shapes;
 using Xunit;
 
diff --git a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
index 8dcce8167..c8d3fe1bc 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
@@ -5,7 +5,6 @@ using System.Numerics;
 
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Processing.Drawing;
 using SixLabors.Shapes;
 
 using Xunit;
diff --git a/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs b/tests/ImageSharp.Tests/Drawing/SolidFillBlendedShapesTests.cs
index 7d73d1b65..0c08f66c6 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 ed46f323a..e42b4b481 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
@@ -6,8 +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.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/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/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/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