Simplify drawing namespaces.

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

src/ImageSharp.Drawing/Processing/Drawing/Brushes/BrushApplicator.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Brushes/Brushes.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/ColorStop{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawBezierExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawImageExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawLineExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawPathCollectionExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawPathExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawPolygonExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/DrawRectangleExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Text/DrawTextExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/EllipticGradientBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillPathBuilderExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillPathCollectionExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillPathExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillPolygonExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillRectangleExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/FillRegionExtensions.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientBrushBase{TPixel}.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/GradientRepetitionMode.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/IBrush.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Pens/IPen.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Brushes/ImageBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/LinearGradientBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/PatternBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Pens/Pens.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Pens/Pen{TPixel}.cs → 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>

src/ImageSharp.Drawing/Processing/Drawing/Processors/DrawImageProcessor.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Processors/FillProcessor.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Processors/FillRegionProcessor.cs → 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

src/ImageSharp.Drawing/Processing/Text/Processors/DrawTextProcessor.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/GradientBrushes/RadialGradientBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Drawing/Brushes/RecolorBrush{TPixel}.cs → 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

src/ImageSharp.Drawing/Processing/Drawing/Brushes/SolidBrush{TPixel}.cs → 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.

src/ImageSharp.Drawing/Processing/Text/TextGraphicsOptions.cs → 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.

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
 {

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;

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
 {

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;

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)

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),

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;
             }

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())

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;
 

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;
 

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;
 

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;
 

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

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)

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;
 

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
     {

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

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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

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

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;
 

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]

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;
 

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