diff --git a/ImageSharp.46.sln b/ImageSharp.46.sln
deleted file mode 100644
index 270d391cc..000000000
--- a/ImageSharp.46.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp46", "src\ImageSharp46\ImageSharp46.csproj", "{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Tests46", "tests\ImageSharp.Tests46\ImageSharp.Tests46.csproj", "{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleBenchmark", "tests\ConsoleBenchmark\ConsoleBenchmark.csproj", "{8783E3A1-79F1-4E37-AA79-F06C48BED5E7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8783E3A1-79F1-4E37-AA79-F06C48BED5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8783E3A1-79F1-4E37-AA79-F06C48BED5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8783E3A1-79F1-4E37-AA79-F06C48BED5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8783E3A1-79F1-4E37-AA79-F06C48BED5E7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/ImageSharp46/Bootstrapper.cs b/src/ImageSharp46/Bootstrapper.cs
deleted file mode 100644
index 35a4a5225..000000000
--- a/src/ImageSharp46/Bootstrapper.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// <copyright file="Bootstrapper.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Threading.Tasks;
-
-    using Formats;
-
-    /// <summary>
-    /// Provides initialization code which allows extending the library.
-    /// </summary>
-    public class Bootstrapper
-    {
-        /// <summary>
-        /// A new instance Initializes a new instance of the <see cref="Bootstrapper"/> class.
-        /// with lazy initialization.
-        /// </summary>
-        private static readonly Lazy<Bootstrapper> Lazy = new Lazy<Bootstrapper>(() => new Bootstrapper());
-
-        /// <summary>
-        /// The default list of supported <see cref="IImageFormat"/>
-        /// </summary>
-        private readonly List<IImageFormat> imageFormats;
-
-        /// <summary>
-        /// Prevents a default instance of the <see cref="Bootstrapper"/> class from being created.
-        /// </summary>
-        private Bootstrapper()
-        {
-            this.imageFormats = new List<IImageFormat>
-            {
-                new BmpFormat(),
-                new JpegFormat(),
-                new PngFormat(),
-                new GifFormat()
-            };
-        }
-
-        /// <summary>
-        /// Gets the current bootstrapper instance.
-        /// </summary>
-        public static Bootstrapper Instance => Lazy.Value;
-
-        /// <summary>
-        /// Gets the collection of supported <see cref="IImageFormat"/>
-        /// </summary>
-        public IReadOnlyCollection<IImageFormat> ImageFormats => new ReadOnlyCollection<IImageFormat>(this.imageFormats);
-
-        /// <summary>
-        /// Gets or sets the global parallel options for processing tasks in parallel.
-        /// </summary>
-        public ParallelOptions ParallelOptions { get; set; } = new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount };
-
-        /// <summary>
-        /// Adds a new <see cref="IImageFormat"/> to the collection of supported image formats.
-        /// </summary>
-        /// <param name="format">The new format to add.</param>
-        public void AddImageFormat(IImageFormat format)
-        {
-            this.imageFormats.Add(format);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Colors/Color.cs b/src/ImageSharp46/Colors/Color.cs
deleted file mode 100644
index c4ea2d762..000000000
--- a/src/ImageSharp46/Colors/Color.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-// <copyright file="Color.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Globalization;
-    using System.Numerics;
-
-    /// <summary>
-    /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color : IPackedPixel<uint>, IEquatable<Color>
-    {
-        private const int RedShift = 0;
-        private const int GreenShift = 8;
-        private const int BlueShift = 16;
-        private const int AlphaShift = 24;
-
-        /// <summary>
-        /// The maximum byte value.
-        /// </summary>
-        private static readonly Vector4 MaxBytes = new Vector4(255);
-
-        /// <summary>
-        /// The half vector value.
-        /// </summary>
-        private static readonly Vector4 Half = new Vector4(0.5f);
-
-        /// <summary>
-        /// The packed value.
-        /// </summary>
-        private uint packedValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <param name="a">The alpha component.</param>
-        public Color(byte r, byte g, byte b, byte a = 255)
-        {
-            this.packedValue = Pack(r, g, b, a);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="hex">
-        /// The hexadecimal representation of the combined color components arranged
-        /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
-        /// </param>
-        public Color(string hex)
-        {
-            Guard.NotNullOrEmpty(hex, nameof(hex));
-
-            hex = ToRgbaHex(hex);
-
-            if (hex == null || !uint.TryParse(hex, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out this.packedValue))
-            {
-                throw new ArgumentException("Hexadecimal string is not in the correct format.", nameof(hex));
-            }
-
-            // Order parsed from hex string will be backwards, so reverse it.
-            this.packedValue = Pack(this.A, this.B, this.G, this.R);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="r">The red component.</param>
-        /// <param name="g">The green component.</param>
-        /// <param name="b">The blue component.</param>
-        /// <param name="a">The alpha component.</param>
-        public Color(float r, float g, float b, float a = 1)
-        {
-            this.packedValue = Pack(r, g, b, a);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="vector">
-        /// The vector containing the components for the packed vector.
-        /// </param>
-        public Color(Vector3 vector)
-        {
-            this.packedValue = Pack(ref vector);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="vector">
-        /// The vector containing the components for the packed vector.
-        /// </param>
-        public Color(Vector4 vector)
-        {
-            this.packedValue = Pack(ref vector);
-        }
-
-        /// <summary>
-        /// Gets or sets the red component.
-        /// </summary>
-        public byte R
-        {
-            get
-            {
-                return (byte)(this.packedValue >> RedShift);
-            }
-
-            set
-            {
-                this.packedValue = this.packedValue & 0xFFFFFF00 | (uint)value << RedShift;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the green component.
-        /// </summary>
-        public byte G
-        {
-            get
-            {
-                return (byte)(this.packedValue >> GreenShift);
-            }
-
-            set
-            {
-                this.packedValue = this.packedValue & 0xFFFF00FF | (uint)value << GreenShift;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the blue component.
-        /// </summary>
-        public byte B
-        {
-            get
-            {
-                return (byte)(this.packedValue >> BlueShift);
-            }
-
-            set
-            {
-                this.packedValue = this.packedValue & 0xFF00FFFF | (uint)value << BlueShift;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the alpha component.
-        /// </summary>
-        public byte A
-        {
-            get
-            {
-                return (byte)(this.packedValue >> AlphaShift);
-            }
-
-            set
-            {
-                this.packedValue = this.packedValue & 0x00FFFFFF | (uint)value << AlphaShift;
-            }
-        }
-
-        /// <inheritdoc/>
-        public uint PackedValue
-        {
-            get
-            {
-                return this.packedValue;
-            }
-
-            set
-            {
-                this.packedValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Color"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Color"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Color"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Color left, Color right)
-        {
-            return left.packedValue == right.packedValue;
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Color"/> objects for equality.
-        /// </summary>
-        /// <param name="left">The <see cref="Color"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="Color"/> on the right side of the operand.</param>
-        /// <returns>
-        /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Color left, Color right)
-        {
-            return left.packedValue != right.packedValue;
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Color"/> struct.
-        /// </summary>
-        /// <param name="hex">
-        /// The hexadecimal representation of the combined color components arranged
-        /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Color"/>.
-        /// </returns>
-        public static Color FromHex(string hex)
-        {
-            return new Color(hex);
-        }
-
-        /// <inheritdoc/>
-        public void PackFromBytes(byte x, byte y, byte z, byte w)
-        {
-            this.packedValue = Pack(x, y, z, w);
-        }
-
-        /// <summary>
-        /// Converts the value of this instance to a hexadecimal string.
-        /// </summary>
-        /// <returns>A hexadecimal string representation of the value.</returns>
-        public string ToHex()
-        {
-            uint hexOrder = Pack(this.A, this.B, this.G, this.R);
-            return hexOrder.ToString("X8");
-        }
-
-        /// <inheritdoc/>
-        public void ToBytes(byte[] bytes, int startIndex, ComponentOrder componentOrder)
-        {
-            switch (componentOrder)
-            {
-                case ComponentOrder.ZYX:
-                    bytes[startIndex] = this.B;
-                    bytes[startIndex + 1] = this.G;
-                    bytes[startIndex + 2] = this.R;
-                    break;
-                case ComponentOrder.ZYXW:
-                    bytes[startIndex] = this.B;
-                    bytes[startIndex + 1] = this.G;
-                    bytes[startIndex + 2] = this.R;
-                    bytes[startIndex + 3] = this.A;
-                    break;
-                case ComponentOrder.XYZ:
-                    bytes[startIndex] = this.R;
-                    bytes[startIndex + 1] = this.G;
-                    bytes[startIndex + 2] = this.B;
-                    break;
-                case ComponentOrder.XYZW:
-                    bytes[startIndex] = this.R;
-                    bytes[startIndex + 1] = this.G;
-                    bytes[startIndex + 2] = this.B;
-                    bytes[startIndex + 3] = this.A;
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void PackFromVector4(Vector4 vector)
-        {
-            this.packedValue = Pack(ref vector);
-        }
-
-        /// <inheritdoc/>
-        public Vector4 ToVector4()
-        {
-            return new Vector4(this.R, this.G, this.B, this.A) / MaxBytes;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            return (obj is Color) && this.Equals((Color)obj);
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Color other)
-        {
-            return this.packedValue == other.packedValue;
-        }
-
-        /// <summary>
-        /// Gets a string representation of the packed vector.
-        /// </summary>
-        /// <returns>A string representation of the packed vector.</returns>
-        public override string ToString()
-        {
-            return this.ToVector4().ToString();
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.packedValue.GetHashCode();
-        }
-
-        /// <summary>
-        /// Packs a <see cref="Vector4"/> into a uint.
-        /// </summary>
-        /// <param name="vector">The vector containing the values to pack.</param>
-        /// <returns>The <see cref="uint"/> containing the packed values.</returns>
-        private static uint Pack(ref Vector4 vector)
-        {
-            vector = Vector4.Clamp(vector, Vector4.Zero, Vector4.One);
-            vector *= MaxBytes;
-            vector += Half;
-            return (uint)(((byte)vector.X << RedShift)
-                        | ((byte)vector.Y << GreenShift)
-                        | ((byte)vector.Z << BlueShift)
-                        | (byte)vector.W << AlphaShift);
-        }
-
-        /// <summary>
-        /// Packs a <see cref="Vector3"/> into a uint.
-        /// </summary>
-        /// <param name="vector">The vector containing the values to pack.</param>
-        /// <returns>The <see cref="uint"/> containing the packed values.</returns>
-        private static uint Pack(ref Vector3 vector)
-        {
-            Vector4 value = new Vector4(vector, 1);
-            return Pack(ref value);
-        }
-
-        /// <summary>
-        /// Packs the four floats into a <see cref="uint"/>.
-        /// </summary>
-        /// <param name="x">The x-component</param>
-        /// <param name="y">The y-component</param>
-        /// <param name="z">The z-component</param>
-        /// <param name="w">The w-component</param>
-        /// <returns>The <see cref="uint"/></returns>
-        private static uint Pack(float x, float y, float z, float w)
-        {
-            Vector4 value = new Vector4(x, y, z, w);
-            return Pack(ref value);
-        }
-
-        /// <summary>
-        /// Packs the four floats into a <see cref="uint"/>.
-        /// </summary>
-        /// <param name="x">The x-component</param>
-        /// <param name="y">The y-component</param>
-        /// <param name="z">The z-component</param>
-        /// <param name="w">The w-component</param>
-        /// <returns>The <see cref="uint"/></returns>
-        private static uint Pack(byte x, byte y, byte z, byte w)
-        {
-            return (uint)(x << RedShift | y << GreenShift | z << BlueShift | w << AlphaShift);
-        }
-
-        /// <summary>
-        /// Converts the specified hex value to an rrggbbaa hex value.
-        /// </summary>
-        /// <param name="hex">The hex value to convert.</param>
-        /// <returns>
-        /// A rrggbbaa hex value.
-        /// </returns>
-        private static string ToRgbaHex(string hex)
-        {
-            hex = hex.StartsWith("#") ? hex.Substring(1) : hex;
-
-            if (hex.Length == 8)
-            {
-                return hex;
-            }
-
-            if (hex.Length == 6)
-            {
-                return hex + "FF";
-            }
-
-            if (hex.Length < 3 || hex.Length > 4)
-            {
-                return null;
-            }
-
-            string red = char.ToString(hex[0]);
-            string green = char.ToString(hex[1]);
-            string blue = char.ToString(hex[2]);
-            string alpha = hex.Length == 3 ? "F" : char.ToString(hex[3]);
-
-            return red + red + green + green + blue + blue + alpha + alpha;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Colors/ColorConstants.cs b/src/ImageSharp46/Colors/ColorConstants.cs
deleted file mode 100644
index f3b01f466..000000000
--- a/src/ImageSharp46/Colors/ColorConstants.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// <copyright file="ColorConstants.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Provides useful color definitions.
-    /// </summary>
-    public static class ColorConstants
-    {
-        /// <summary>
-        /// Provides a lazy, one time method of returning the colors.
-        /// </summary>
-        private static readonly Lazy<Color[]> SafeColors = new Lazy<Color[]>(GetWebSafeColors);
-
-        /// <summary>
-        /// Gets a collection of named, web safe, colors as defined in the CSS Color Module Level 4.
-        /// </summary>
-        public static Color[] WebSafeColors => SafeColors.Value;
-
-        /// <summary>
-        /// Returns an array of web safe colors.
-        /// </summary>
-        /// <returns></returns>
-        private static Color[] GetWebSafeColors()
-        {
-            return new List<Color>
-            {
-                Color.AliceBlue,
-                Color.AntiqueWhite,
-                Color.Aqua,
-                Color.Aquamarine,
-                Color.Azure,
-                Color.Beige,
-                Color.Bisque,
-                Color.Black,
-                Color.BlanchedAlmond,
-                Color.Blue,
-                Color.BlueViolet,
-                Color.Brown,
-                Color.BurlyWood,
-                Color.CadetBlue,
-                Color.Chartreuse,
-                Color.Chocolate,
-                Color.Coral,
-                Color.CornflowerBlue,
-                Color.Cornsilk,
-                Color.Crimson,
-                Color.Cyan,
-                Color.DarkBlue,
-                Color.DarkCyan,
-                Color.DarkGoldenrod,
-                Color.DarkGray,
-                Color.DarkGreen,
-                Color.DarkKhaki,
-                Color.DarkMagenta,
-                Color.DarkOliveGreen,
-                Color.DarkOrange,
-                Color.DarkOrchid,
-                Color.DarkRed,
-                Color.DarkSalmon,
-                Color.DarkSeaGreen,
-                Color.DarkSlateBlue,
-                Color.DarkSlateGray,
-                Color.DarkTurquoise,
-                Color.DarkViolet,
-                Color.DeepPink,
-                Color.DeepSkyBlue,
-                Color.DimGray,
-                Color.DodgerBlue,
-                Color.Firebrick,
-                Color.FloralWhite,
-                Color.ForestGreen,
-                Color.Fuchsia,
-                Color.Gainsboro,
-                Color.GhostWhite,
-                Color.Gold,
-                Color.Goldenrod,
-                Color.Gray,
-                Color.Green,
-                Color.GreenYellow,
-                Color.Honeydew,
-                Color.HotPink,
-                Color.IndianRed,
-                Color.Indigo,
-                Color.Ivory,
-                Color.Khaki,
-                Color.Lavender,
-                Color.LavenderBlush,
-                Color.LawnGreen,
-                Color.LemonChiffon,
-                Color.LightBlue,
-                Color.LightCoral,
-                Color.LightCyan,
-                Color.LightGoldenrodYellow,
-                Color.LightGray,
-                Color.LightGreen,
-                Color.LightPink,
-                Color.LightSalmon,
-                Color.LightSeaGreen,
-                Color.LightSkyBlue,
-                Color.LightSlateGray,
-                Color.LightSteelBlue,
-                Color.LightYellow,
-                Color.Lime,
-                Color.LimeGreen,
-                Color.Linen,
-                Color.Magenta,
-                Color.Maroon,
-                Color.MediumAquamarine,
-                Color.MediumBlue,
-                Color.MediumOrchid,
-                Color.MediumPurple,
-                Color.MediumSeaGreen,
-                Color.MediumSlateBlue,
-                Color.MediumSpringGreen,
-                Color.MediumTurquoise,
-                Color.MediumVioletRed,
-                Color.MidnightBlue,
-                Color.MintCream,
-                Color.MistyRose,
-                Color.Moccasin,
-                Color.NavajoWhite,
-                Color.Navy,
-                Color.OldLace,
-                Color.Olive,
-                Color.OliveDrab,
-                Color.Orange,
-                Color.OrangeRed,
-                Color.Orchid,
-                Color.PaleGoldenrod,
-                Color.PaleGreen,
-                Color.PaleTurquoise,
-                Color.PaleVioletRed,
-                Color.PapayaWhip,
-                Color.PeachPuff,
-                Color.Peru,
-                Color.Pink,
-                Color.Plum,
-                Color.PowderBlue,
-                Color.Purple,
-                Color.RebeccaPurple,
-                Color.Red,
-                Color.RosyBrown,
-                Color.RoyalBlue,
-                Color.SaddleBrown,
-                Color.Salmon,
-                Color.SandyBrown,
-                Color.SeaGreen,
-                Color.SeaShell,
-                Color.Sienna,
-                Color.Silver,
-                Color.SkyBlue,
-                Color.SlateBlue,
-                Color.SlateGray,
-                Color.Snow,
-                Color.SpringGreen,
-                Color.SteelBlue,
-                Color.Tan,
-                Color.Teal,
-                Color.Thistle,
-                Color.Tomato,
-                Color.Transparent,
-                Color.Turquoise,
-                Color.Violet,
-                Color.Wheat,
-                Color.White,
-                Color.WhiteSmoke,
-                Color.Yellow,
-                Color.YellowGreen
-            }.ToArray();
-        }
-    }
-}
diff --git a/src/ImageSharp46/Colors/ColorDefinitions.cs b/src/ImageSharp46/Colors/ColorDefinitions.cs
deleted file mode 100644
index 46e0f8709..000000000
--- a/src/ImageSharp46/Colors/ColorDefinitions.cs
+++ /dev/null
@@ -1,728 +0,0 @@
-// <copyright file="ColorDefinitions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
-    {
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0F8FF.
-        /// </summary>
-        public static readonly Color AliceBlue = new Color(240, 248, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAEBD7.
-        /// </summary>
-        public static readonly Color AntiqueWhite = new Color(250, 235, 215, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly Color Aqua = new Color(0, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7FFFD4.
-        /// </summary>
-        public static readonly Color Aquamarine = new Color(127, 255, 212, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0FFFF.
-        /// </summary>
-        public static readonly Color Azure = new Color(240, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5F5DC.
-        /// </summary>
-        public static readonly Color Beige = new Color(245, 245, 220, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4C4.
-        /// </summary>
-        public static readonly Color Bisque = new Color(255, 228, 196, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #000000.
-        /// </summary>
-        public static readonly Color Black = new Color(0, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFEBCD.
-        /// </summary>
-        public static readonly Color BlanchedAlmond = new Color(255, 235, 205, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #0000FF.
-        /// </summary>
-        public static readonly Color Blue = new Color(0, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8A2BE2.
-        /// </summary>
-        public static readonly Color BlueViolet = new Color(138, 43, 226, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A52A2A.
-        /// </summary>
-        public static readonly Color Brown = new Color(165, 42, 42, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DEB887.
-        /// </summary>
-        public static readonly Color BurlyWood = new Color(222, 184, 135, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #5F9EA0.
-        /// </summary>
-        public static readonly Color CadetBlue = new Color(95, 158, 160, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7FFF00.
-        /// </summary>
-        public static readonly Color Chartreuse = new Color(127, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D2691E.
-        /// </summary>
-        public static readonly Color Chocolate = new Color(210, 105, 30, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF7F50.
-        /// </summary>
-        public static readonly Color Coral = new Color(255, 127, 80, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6495ED.
-        /// </summary>
-        public static readonly Color CornflowerBlue = new Color(100, 149, 237, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF8DC.
-        /// </summary>
-        public static readonly Color Cornsilk = new Color(255, 248, 220, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DC143C.
-        /// </summary>
-        public static readonly Color Crimson = new Color(220, 20, 60, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly Color Cyan = new Color(0, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00008B.
-        /// </summary>
-        public static readonly Color DarkBlue = new Color(0, 0, 139, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008B8B.
-        /// </summary>
-        public static readonly Color DarkCyan = new Color(0, 139, 139, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B8860B.
-        /// </summary>
-        public static readonly Color DarkGoldenrod = new Color(184, 134, 11, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A9A9A9.
-        /// </summary>
-        public static readonly Color DarkGray = new Color(169, 169, 169, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #006400.
-        /// </summary>
-        public static readonly Color DarkGreen = new Color(0, 100, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BDB76B.
-        /// </summary>
-        public static readonly Color DarkKhaki = new Color(189, 183, 107, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B008B.
-        /// </summary>
-        public static readonly Color DarkMagenta = new Color(139, 0, 139, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #556B2F.
-        /// </summary>
-        public static readonly Color DarkOliveGreen = new Color(85, 107, 47, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF8C00.
-        /// </summary>
-        public static readonly Color DarkOrange = new Color(255, 140, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9932CC.
-        /// </summary>
-        public static readonly Color DarkOrchid = new Color(153, 50, 204, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B0000.
-        /// </summary>
-        public static readonly Color DarkRed = new Color(139, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E9967A.
-        /// </summary>
-        public static readonly Color DarkSalmon = new Color(233, 150, 122, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8FBC8B.
-        /// </summary>
-        public static readonly Color DarkSeaGreen = new Color(143, 188, 139, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #483D8B.
-        /// </summary>
-        public static readonly Color DarkSlateBlue = new Color(72, 61, 139, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #2F4F4F.
-        /// </summary>
-        public static readonly Color DarkSlateGray = new Color(47, 79, 79, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00CED1.
-        /// </summary>
-        public static readonly Color DarkTurquoise = new Color(0, 206, 209, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9400D3.
-        /// </summary>
-        public static readonly Color DarkViolet = new Color(148, 0, 211, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF1493.
-        /// </summary>
-        public static readonly Color DeepPink = new Color(255, 20, 147, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00BFFF.
-        /// </summary>
-        public static readonly Color DeepSkyBlue = new Color(0, 191, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #696969.
-        /// </summary>
-        public static readonly Color DimGray = new Color(105, 105, 105, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #1E90FF.
-        /// </summary>
-        public static readonly Color DodgerBlue = new Color(30, 144, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B22222.
-        /// </summary>
-        public static readonly Color Firebrick = new Color(178, 34, 34, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFAF0.
-        /// </summary>
-        public static readonly Color FloralWhite = new Color(255, 250, 240, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #228B22.
-        /// </summary>
-        public static readonly Color ForestGreen = new Color(34, 139, 34, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly Color Fuchsia = new Color(255, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DCDCDC.
-        /// </summary>
-        public static readonly Color Gainsboro = new Color(220, 220, 220, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F8F8FF.
-        /// </summary>
-        public static readonly Color GhostWhite = new Color(248, 248, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFD700.
-        /// </summary>
-        public static readonly Color Gold = new Color(255, 215, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DAA520.
-        /// </summary>
-        public static readonly Color Goldenrod = new Color(218, 165, 32, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #808080.
-        /// </summary>
-        public static readonly Color Gray = new Color(128, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008000.
-        /// </summary>
-        public static readonly Color Green = new Color(0, 128, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #ADFF2F.
-        /// </summary>
-        public static readonly Color GreenYellow = new Color(173, 255, 47, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0FFF0.
-        /// </summary>
-        public static readonly Color Honeydew = new Color(240, 255, 240, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF69B4.
-        /// </summary>
-        public static readonly Color HotPink = new Color(255, 105, 180, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #CD5C5C.
-        /// </summary>
-        public static readonly Color IndianRed = new Color(205, 92, 92, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4B0082.
-        /// </summary>
-        public static readonly Color Indigo = new Color(75, 0, 130, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFF0.
-        /// </summary>
-        public static readonly Color Ivory = new Color(255, 255, 240, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0E68C.
-        /// </summary>
-        public static readonly Color Khaki = new Color(240, 230, 140, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E6E6FA.
-        /// </summary>
-        public static readonly Color Lavender = new Color(230, 230, 250, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF0F5.
-        /// </summary>
-        public static readonly Color LavenderBlush = new Color(255, 240, 245, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7CFC00.
-        /// </summary>
-        public static readonly Color LawnGreen = new Color(124, 252, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFACD.
-        /// </summary>
-        public static readonly Color LemonChiffon = new Color(255, 250, 205, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #ADD8E6.
-        /// </summary>
-        public static readonly Color LightBlue = new Color(173, 216, 230, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F08080.
-        /// </summary>
-        public static readonly Color LightCoral = new Color(240, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E0FFFF.
-        /// </summary>
-        public static readonly Color LightCyan = new Color(224, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAFAD2.
-        /// </summary>
-        public static readonly Color LightGoldenrodYellow = new Color(250, 250, 210, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D3D3D3.
-        /// </summary>
-        public static readonly Color LightGray = new Color(211, 211, 211, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #90EE90.
-        /// </summary>
-        public static readonly Color LightGreen = new Color(144, 238, 144, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFB6C1.
-        /// </summary>
-        public static readonly Color LightPink = new Color(255, 182, 193, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFA07A.
-        /// </summary>
-        public static readonly Color LightSalmon = new Color(255, 160, 122, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #20B2AA.
-        /// </summary>
-        public static readonly Color LightSeaGreen = new Color(32, 178, 170, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #87CEFA.
-        /// </summary>
-        public static readonly Color LightSkyBlue = new Color(135, 206, 250, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #778899.
-        /// </summary>
-        public static readonly Color LightSlateGray = new Color(119, 136, 153, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B0C4DE.
-        /// </summary>
-        public static readonly Color LightSteelBlue = new Color(176, 196, 222, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFE0.
-        /// </summary>
-        public static readonly Color LightYellow = new Color(255, 255, 224, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FF00.
-        /// </summary>
-        public static readonly Color Lime = new Color(0, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #32CD32.
-        /// </summary>
-        public static readonly Color LimeGreen = new Color(50, 205, 50, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAF0E6.
-        /// </summary>
-        public static readonly Color Linen = new Color(250, 240, 230, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly Color Magenta = new Color(255, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #800000.
-        /// </summary>
-        public static readonly Color Maroon = new Color(128, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #66CDAA.
-        /// </summary>
-        public static readonly Color MediumAquamarine = new Color(102, 205, 170, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #0000CD.
-        /// </summary>
-        public static readonly Color MediumBlue = new Color(0, 0, 205, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BA55D3.
-        /// </summary>
-        public static readonly Color MediumOrchid = new Color(186, 85, 211, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9370DB.
-        /// </summary>
-        public static readonly Color MediumPurple = new Color(147, 112, 219, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #3CB371.
-        /// </summary>
-        public static readonly Color MediumSeaGreen = new Color(60, 179, 113, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7B68EE.
-        /// </summary>
-        public static readonly Color MediumSlateBlue = new Color(123, 104, 238, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FA9A.
-        /// </summary>
-        public static readonly Color MediumSpringGreen = new Color(0, 250, 154, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #48D1CC.
-        /// </summary>
-        public static readonly Color MediumTurquoise = new Color(72, 209, 204, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #C71585.
-        /// </summary>
-        public static readonly Color MediumVioletRed = new Color(199, 21, 133, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #191970.
-        /// </summary>
-        public static readonly Color MidnightBlue = new Color(25, 25, 112, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5FFFA.
-        /// </summary>
-        public static readonly Color MintCream = new Color(245, 255, 250, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4E1.
-        /// </summary>
-        public static readonly Color MistyRose = new Color(255, 228, 225, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4B5.
-        /// </summary>
-        public static readonly Color Moccasin = new Color(255, 228, 181, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFDEAD.
-        /// </summary>
-        public static readonly Color NavajoWhite = new Color(255, 222, 173, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #000080.
-        /// </summary>
-        public static readonly Color Navy = new Color(0, 0, 128, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FDF5E6.
-        /// </summary>
-        public static readonly Color OldLace = new Color(253, 245, 230, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #808000.
-        /// </summary>
-        public static readonly Color Olive = new Color(128, 128, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6B8E23.
-        /// </summary>
-        public static readonly Color OliveDrab = new Color(107, 142, 35, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFA500.
-        /// </summary>
-        public static readonly Color Orange = new Color(255, 165, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF4500.
-        /// </summary>
-        public static readonly Color OrangeRed = new Color(255, 69, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DA70D6.
-        /// </summary>
-        public static readonly Color Orchid = new Color(218, 112, 214, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #EEE8AA.
-        /// </summary>
-        public static readonly Color PaleGoldenrod = new Color(238, 232, 170, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #98FB98.
-        /// </summary>
-        public static readonly Color PaleGreen = new Color(152, 251, 152, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #AFEEEE.
-        /// </summary>
-        public static readonly Color PaleTurquoise = new Color(175, 238, 238, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DB7093.
-        /// </summary>
-        public static readonly Color PaleVioletRed = new Color(219, 112, 147, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFEFD5.
-        /// </summary>
-        public static readonly Color PapayaWhip = new Color(255, 239, 213, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFDAB9.
-        /// </summary>
-        public static readonly Color PeachPuff = new Color(255, 218, 185, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #CD853F.
-        /// </summary>
-        public static readonly Color Peru = new Color(205, 133, 63, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFC0CB.
-        /// </summary>
-        public static readonly Color Pink = new Color(255, 192, 203, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DDA0DD.
-        /// </summary>
-        public static readonly Color Plum = new Color(221, 160, 221, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B0E0E6.
-        /// </summary>
-        public static readonly Color PowderBlue = new Color(176, 224, 230, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #800080.
-        /// </summary>
-        public static readonly Color Purple = new Color(128, 0, 128, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #0.
-        /// </summary>
-        public static readonly Color RebeccaPurple = new Color(102, 51, 153, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF0000.
-        /// </summary>
-        public static readonly Color Red = new Color(255, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BC8F8F.
-        /// </summary>
-        public static readonly Color RosyBrown = new Color(188, 143, 143, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4169E1.
-        /// </summary>
-        public static readonly Color RoyalBlue = new Color(65, 105, 225, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B4513.
-        /// </summary>
-        public static readonly Color SaddleBrown = new Color(139, 69, 19, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FA8072.
-        /// </summary>
-        public static readonly Color Salmon = new Color(250, 128, 114, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F4A460.
-        /// </summary>
-        public static readonly Color SandyBrown = new Color(244, 164, 96, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #2E8B57.
-        /// </summary>
-        public static readonly Color SeaGreen = new Color(46, 139, 87, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF5EE.
-        /// </summary>
-        public static readonly Color SeaShell = new Color(255, 245, 238, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A0522D.
-        /// </summary>
-        public static readonly Color Sienna = new Color(160, 82, 45, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #C0C0C0.
-        /// </summary>
-        public static readonly Color Silver = new Color(192, 192, 192, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #87CEEB.
-        /// </summary>
-        public static readonly Color SkyBlue = new Color(135, 206, 235, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6A5ACD.
-        /// </summary>
-        public static readonly Color SlateBlue = new Color(106, 90, 205, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #708090.
-        /// </summary>
-        public static readonly Color SlateGray = new Color(112, 128, 144, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFAFA.
-        /// </summary>
-        public static readonly Color Snow = new Color(255, 250, 250, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FF7F.
-        /// </summary>
-        public static readonly Color SpringGreen = new Color(0, 255, 127, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4682B4.
-        /// </summary>
-        public static readonly Color SteelBlue = new Color(70, 130, 180, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D2B48C.
-        /// </summary>
-        public static readonly Color Tan = new Color(210, 180, 140, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008080.
-        /// </summary>
-        public static readonly Color Teal = new Color(0, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D8BFD8.
-        /// </summary>
-        public static readonly Color Thistle = new Color(216, 191, 216, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF6347.
-        /// </summary>
-        public static readonly Color Tomato = new Color(255, 99, 71, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly Color Transparent = new Color(255, 255, 255, 0);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #40E0D0.
-        /// </summary>
-        public static readonly Color Turquoise = new Color(64, 224, 208, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #EE82EE.
-        /// </summary>
-        public static readonly Color Violet = new Color(238, 130, 238, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5DEB3.
-        /// </summary>
-        public static readonly Color Wheat = new Color(245, 222, 179, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly Color White = new Color(255, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5F5F5.
-        /// </summary>
-        public static readonly Color WhiteSmoke = new Color(245, 245, 245, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFF00.
-        /// </summary>
-        public static readonly Color Yellow = new Color(255, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9ACD32.
-        /// </summary>
-        public static readonly Color YellowGreen = new Color(154, 205, 50, 255);
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Colors/ColorTransforms.cs b/src/ImageSharp46/Colors/ColorTransforms.cs
deleted file mode 100644
index e710b69e9..000000000
--- a/src/ImageSharp46/Colors/ColorTransforms.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// <copyright file="ColorTransforms.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Numerics;
-
-    /// <summary>
-    /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
-    {
-        /// <summary>
-        /// Blends two colors by multiplication.
-        /// <remarks>
-        /// The source color is multiplied by the destination color and replaces the destination.
-        /// The resultant color is always at least as dark as either the source or destination color.
-        /// Multiplying any color with black results in black. Multiplying any color with white preserves the
-        /// original color.
-        /// </remarks>
-        /// </summary>
-        /// <param name="source">The source color.</param>
-        /// <param name="destination">The destination color.</param>
-        /// <returns>
-        /// The <see cref="Color"/>.
-        /// </returns>
-        public static Color Multiply(Color source, Color destination)
-        {
-            if (destination == Color.Black)
-            {
-                return Color.Black;
-            }
-
-            if (destination == Color.White)
-            {
-                return source;
-            }
-
-            // TODO: This will use less memory than using Vector4
-            // but we should test speed vs memory to see which is best balance.
-            byte r = (byte)(source.R * destination.R).Clamp(0, 255);
-            byte g = (byte)(source.G * destination.G).Clamp(0, 255);
-            byte b = (byte)(source.B * destination.B).Clamp(0, 255);
-            byte a = (byte)(source.A * destination.A).Clamp(0, 255);
-
-            return new Color(r, g, b, a);
-        }
-
-        /// <summary>
-        /// Linearly interpolates from one color to another based on the given weighting.
-        /// </summary>
-        /// <param name="from">The first color value.</param>
-        /// <param name="to">The second color value.</param>
-        /// <param name="amount">
-        /// A value between 0 and 1 indicating the weight of the second source vector.
-        /// At amount = 0, "from" is returned, at amount = 1, "to" is returned.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Color"/>
-        /// </returns>
-        public static Color Lerp(Color from, Color to, float amount)
-        {
-            return new Color(Vector4.Lerp(from.ToVector4(), to.ToVector4(), amount));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Colors/ColorspaceTransforms.cs b/src/ImageSharp46/Colors/ColorspaceTransforms.cs
deleted file mode 100644
index 0c70dd98b..000000000
--- a/src/ImageSharp46/Colors/ColorspaceTransforms.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-// <copyright file="ColorspaceTransforms.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Numerics;
-
-    /// <summary>
-    /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
-    {
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001F;
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="Bgra32"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Bgra32"/>.
-        /// </returns>
-        public static implicit operator Color(Bgra32 color)
-        {
-            return new Color(color.R, color.G, color.B, color.A);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Cmyk"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="cmykColor">The instance of <see cref="Cmyk"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(Cmyk cmykColor)
-        {
-            float r = (1 - cmykColor.C) * (1 - cmykColor.K);
-            float g = (1 - cmykColor.M) * (1 - cmykColor.K);
-            float b = (1 - cmykColor.Y) * (1 - cmykColor.K);
-            return new Color(r, g, b, 1);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="YCbCr"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="YCbCr"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(YCbCr color)
-        {
-            byte y = color.Y;
-            int cb = color.Cb - 128;
-            int cr = color.Cr - 128;
-
-            byte r = (byte)(y + (1.402F * cr)).Clamp(0, 255);
-            byte g = (byte)(y - (0.34414F * cb) - (0.71414F * cr)).Clamp(0, 255);
-            byte b = (byte)(y + (1.772F * cb)).Clamp(0, 255);
-
-            return new Color(r, g, b);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="CieXyz"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="CieXyz"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(CieXyz color)
-        {
-            float x = color.X / 100F;
-            float y = color.Y / 100F;
-            float z = color.Z / 100F;
-
-            // Then XYZ to RGB (multiplication by 100 was done above already)
-            float r = (x * 3.2406F) + (y * -1.5372F) + (z * -0.4986F);
-            float g = (x * -0.9689F) + (y * 1.8758F) + (z * 0.0415F);
-            float b = (x * 0.0557F) + (y * -0.2040F) + (z * 1.0570F);
-
-            Vector4 vector = new Vector4(r, g, b, 1).Compress();
-            return new Color(vector);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Hsv"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="Hsv"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(Hsv color)
-        {
-            float s = color.S;
-            float v = color.V;
-
-            if (Math.Abs(s) < Epsilon)
-            {
-                return new Color(v, v, v, 1);
-            }
-
-            float h = (Math.Abs(color.H - 360) < Epsilon) ? 0 : color.H / 60;
-            int i = (int)Math.Truncate(h);
-            float f = h - i;
-
-            float p = v * (1.0F - s);
-            float q = v * (1.0F - (s * f));
-            float t = v * (1.0F - (s * (1.0F - f)));
-
-            float r, g, b;
-            switch (i)
-            {
-                case 0:
-                    r = v;
-                    g = t;
-                    b = p;
-                    break;
-
-                case 1:
-                    r = q;
-                    g = v;
-                    b = p;
-                    break;
-
-                case 2:
-                    r = p;
-                    g = v;
-                    b = t;
-                    break;
-
-                case 3:
-                    r = p;
-                    g = q;
-                    b = v;
-                    break;
-
-                case 4:
-                    r = t;
-                    g = p;
-                    b = v;
-                    break;
-
-                default:
-                    r = v;
-                    g = p;
-                    b = q;
-                    break;
-            }
-
-            return new Color(r, g, b, 1);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Hsl"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="Hsl"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(Hsl color)
-        {
-            float rangedH = color.H / 360F;
-            float r = 0;
-            float g = 0;
-            float b = 0;
-            float s = color.S;
-            float l = color.L;
-
-            if (Math.Abs(l) > Epsilon)
-            {
-                if (Math.Abs(s) < Epsilon)
-                {
-                    r = g = b = l;
-                }
-                else
-                {
-                    float temp2 = (l < 0.5f) ? l * (1f + s) : l + s - (l * s);
-                    float temp1 = (2f * l) - temp2;
-
-                    r = GetColorComponent(temp1, temp2, rangedH + 0.3333333F);
-                    g = GetColorComponent(temp1, temp2, rangedH);
-                    b = GetColorComponent(temp1, temp2, rangedH - 0.3333333F);
-                }
-            }
-
-            return new Color(r, g, b, 1);
-        }
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="CieLab"/> to a
-        /// <see cref="Color"/>.
-        /// </summary>
-        /// <param name="cieLabColor">The instance of <see cref="CieLab"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Color"/>.
-        /// </returns>
-        public static implicit operator Color(CieLab cieLabColor)
-        {
-            // First convert back to XYZ...
-            float y = (cieLabColor.L + 16F) / 116F;
-            float x = (cieLabColor.A / 500F) + y;
-            float z = y - (cieLabColor.B / 200F);
-
-            float x3 = x * x * x;
-            float y3 = y * y * y;
-            float z3 = z * z * z;
-
-            x = x3 > 0.008856F ? x3 : (x - 0.137931F) / 7.787F;
-            y = (cieLabColor.L > 7.999625F) ? y3 : (cieLabColor.L / 903.3F);
-            z = (z3 > 0.008856F) ? z3 : (z - 0.137931F) / 7.787F;
-
-            x *= 0.95047F;
-            z *= 1.08883F;
-
-            // Then XYZ to RGB (multiplication by 100 was done above already)
-            float r = (x * 3.2406F) + (y * -1.5372F) + (z * -0.4986F);
-            float g = (x * -0.9689F) + (y * 1.8758F) + (z * 0.0415F);
-            float b = (x * 0.0557F) + (y * -0.2040F) + (z * 1.0570F);
-
-            return new Color(new Vector4(r, g, b, 1F).Compress());
-        }
-
-        /// <summary>
-        /// Gets the color component from the given values.
-        /// </summary>
-        /// <param name="first">The first value.</param>
-        /// <param name="second">The second value.</param>
-        /// <param name="third">The third value.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        private static float GetColorComponent(float first, float second, float third)
-        {
-            third = MoveIntoRange(third);
-            if (third < 0.1666667F)
-            {
-                return first + ((second - first) * 6.0f * third);
-            }
-
-            if (third < 0.5)
-            {
-                return second;
-            }
-
-            if (third < 0.6666667F)
-            {
-                return first + ((second - first) * (0.6666667F - third) * 6.0f);
-            }
-
-            return first;
-        }
-
-        /// <summary>
-        /// Moves the specific value within the acceptable range for
-        /// conversion.
-        /// <remarks>Used for converting <see cref="Hsl"/> colors to this type.</remarks>
-        /// </summary>
-        /// <param name="value">The value to shift.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        private static float MoveIntoRange(float value)
-        {
-            if (value < 0.0)
-            {
-                value += 1.0f;
-            }
-            else if (value > 1.0)
-            {
-                value -= 1.0f;
-            }
-
-            return value;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/Bgra32.cs b/src/ImageSharp46/Colors/Colorspaces/Bgra32.cs
deleted file mode 100644
index ff9203b03..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/Bgra32.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// <copyright file="Bgra32.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents an BGRA (blue, green, red, alpha) color.
-    /// </summary>
-    public struct Bgra32 : IEquatable<Bgra32>
-    {
-        /// <summary>
-        /// Represents a 32 bit <see cref="Bgra32"/> that has B, G, R, and A values set to zero.
-        /// </summary>
-        public static readonly Bgra32 Empty = default(Bgra32);
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector4 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bgra32"/> struct.
-        /// </summary>
-        /// <param name="b">The blue component of this <see cref="Bgra32"/>.</param>
-        /// <param name="g">The green component of this <see cref="Bgra32"/>.</param>
-        /// <param name="r">The red component of this <see cref="Bgra32"/>.</param>
-        /// <param name="a">The alpha component of this <see cref="Bgra32"/>.</param>
-        public Bgra32(byte b, byte g, byte r, byte a = 255)
-            : this()
-        {
-            this.backingVector = Vector4.Clamp(new Vector4(b, g, r, a), Vector4.Zero, new Vector4(255));
-        }
-
-        /// <summary>
-        /// Gets the blue component of the color
-        /// </summary>
-        public byte B => (byte)this.backingVector.X;
-
-        /// <summary>
-        /// Gets the green component of the color
-        /// </summary>
-        public byte G => (byte)this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the red component of the color
-        /// </summary>
-        public byte R => (byte)this.backingVector.Z;
-
-        /// <summary>
-        /// Gets the alpha component of the color
-        /// </summary>
-        public byte A => (byte)this.backingVector.W;
-
-        /// <summary>
-        /// Gets the <see cref="Bgra32"/> integer representation of the color.
-        /// </summary>
-        public int Bgra => (this.R << 16) | (this.G << 8) | (this.B << 0) | (this.A << 24);
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Bgra32"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="Bgra32"/>.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
-        /// </param>
-        /// <returns>
-        /// An instance of <see cref="Bgra32"/>.
-        /// </returns>
-        public static implicit operator Bgra32(Color color)
-        {
-            return new Bgra32(color.B, color.G, color.R, color.A);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Bgra32"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Bgra32"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Bgra32"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Bgra32 left, Bgra32 right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Bgra32"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Bgra32"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Bgra32"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Bgra32 left, Bgra32 right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Bgra32)
-            {
-                Bgra32 color = (Bgra32)obj;
-
-                return this.backingVector == color.backingVector;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Bgra32 [ Empty ]";
-            }
-
-            return $"Bgra32 [ B={this.B}, G={this.G}, R={this.R}, A={this.A} ]";
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Bgra32 other)
-        {
-            return this.backingVector.Equals(other.backingVector);
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Bgra32"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(Bgra32 color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/CieLab.cs b/src/ImageSharp46/Colors/Colorspaces/CieLab.cs
deleted file mode 100644
index b0c042a3c..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/CieLab.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-// <copyright file="CieLab.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents an CIE LAB 1976 color.
-    /// <see href="https://en.wikipedia.org/wiki/Lab_color_space"/>
-    /// </summary>
-    public struct CieLab : IEquatable<CieLab>, IAlmostEquatable<CieLab, float>
-    {
-        /// <summary>
-        /// Represents a <see cref="CieLab"/> that has L, A, B values set to zero.
-        /// </summary>
-        public static readonly CieLab Empty = default(CieLab);
-
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001f;
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector3 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CieLab"/> struct.
-        /// </summary>
-        /// <param name="l">The lightness dimension.</param>
-        /// <param name="a">The a (green - magenta) component.</param>
-        /// <param name="b">The b (blue - yellow) component.</param>
-        public CieLab(float l, float a, float b)
-            : this()
-        {
-            this.backingVector = Vector3.Clamp(new Vector3(l, a, b), new Vector3(0, -100, -100), new Vector3(100));
-        }
-
-        /// <summary>
-        /// Gets the lightness dimension.
-        /// <remarks>A value ranging between 0 (black), 100 (diffuse white) or higher (specular white).</remarks>
-        /// </summary>
-        public float L => this.backingVector.X;
-
-        /// <summary>
-        /// Gets the a color component.
-        /// <remarks>Negative is green, positive magenta.</remarks>
-        /// </summary>
-        public float A => this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the b color component.
-        /// <remarks>Negative is blue, positive is yellow</remarks>
-        /// </summary>
-        public float B => this.backingVector.Z;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieLab"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="CieLab"/>.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
-        /// </param>
-        /// <returns>
-        /// An instance of <see cref="CieLab"/>.
-        /// </returns>
-        public static implicit operator CieLab(Color color)
-        {
-            // First convert to CIE XYZ
-            Vector4 vector = color.ToVector4().Expand();
-            float x = (vector.X * 0.4124F) + (vector.Y * 0.3576F) + (vector.Z * 0.1805F);
-            float y = (vector.X * 0.2126F) + (vector.Y * 0.7152F) + (vector.Z * 0.0722F);
-            float z = (vector.X * 0.0193F) + (vector.Y * 0.1192F) + (vector.Z * 0.9505F);
-
-            // Now to LAB
-            x /= 0.95047F;
-            //y /= 1F;
-            z /= 1.08883F;
-
-            x = x > 0.008856F ? (float)Math.Pow(x, 0.3333333F) : ((903.3F * x) + 16F) / 116F;
-            y = y > 0.008856F ? (float)Math.Pow(y, 0.3333333F) : ((903.3F * y) + 16F) / 116F;
-            z = z > 0.008856F ? (float)Math.Pow(z, 0.3333333F) : ((903.3F * z) + 16F) / 116F;
-
-            float l = Math.Max(0, (116F * y) - 16F);
-            float a = 500F * (x - y);
-            float b = 200F * (y - z);
-
-            return new CieLab(l, a, b);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="CieLab"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="CieLab"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="CieLab"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(CieLab left, CieLab right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="CieLab"/> objects for inequality
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="CieLab"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="CieLab"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(CieLab left, CieLab right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "CieLab [Empty]";
-            }
-
-            return $"CieLab [ L={this.L:#0.##}, A={this.A:#0.##}, B={this.B:#0.##}]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is CieLab)
-            {
-                return this.Equals((CieLab)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(CieLab other)
-        {
-            return this.AlmostEquals(other, Epsilon);
-        }
-
-        /// <inheritdoc/>
-        public bool AlmostEquals(CieLab other, float precision)
-        {
-            Vector3 result = Vector3.Abs(this.backingVector - other.backingVector);
-
-            return result.X < precision
-                && result.Y < precision
-                && result.Z < precision;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="CieLab"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(CieLab color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/CieXyz.cs b/src/ImageSharp46/Colors/Colorspaces/CieXyz.cs
deleted file mode 100644
index 8e9d5f796..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/CieXyz.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// <copyright file="CieXyz.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents an CIE 1931 color
-    /// <see href="https://en.wikipedia.org/wiki/CIE_1931_color_space"/>
-    /// </summary>
-    public struct CieXyz : IEquatable<CieXyz>, IAlmostEquatable<CieXyz, float>
-    {
-        /// <summary>
-        /// Represents a <see cref="CieXyz"/> that has Y, Cb, and Cr values set to zero.
-        /// </summary>
-        public static readonly CieXyz Empty = default(CieXyz);
-
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001f;
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector3 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CieXyz"/> struct.
-        /// </summary>
-        /// <param name="y">The y luminance component.</param>
-        /// <param name="x">X is a mix (a linear combination) of cone response curves chosen to be nonnegative</param>
-        /// <param name="z">Z is quasi-equal to blue stimulation, or the S cone of the human eye.</param>
-        public CieXyz(float x, float y, float z)
-            : this()
-        {
-            // Not clamping as documentation about this space seems to indicate "usual" ranges
-            this.backingVector = new Vector3(x, y, z);
-        }
-
-        /// <summary>
-        /// Gets the Y luminance component.
-        /// <remarks>A value ranging between 380 and 780.</remarks>
-        /// </summary>
-        public float X => this.backingVector.X;
-
-        /// <summary>
-        /// Gets the Cb chroma component.
-        /// <remarks>A value ranging between 380 and 780.</remarks>
-        /// </summary>
-        public float Y => this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the Cr chroma component.
-        /// <remarks>A value ranging between 380 and 780.</remarks>
-        /// </summary>
-        public float Z => this.backingVector.Z;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="CieXyz"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="CieXyz"/>.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
-        /// </param>
-        /// <returns>
-        /// An instance of <see cref="CieXyz"/>.
-        /// </returns>
-        public static implicit operator CieXyz(Color color)
-        {
-            Vector4 vector = color.ToVector4().Expand();
-
-            float x = (vector.X * 0.4124F) + (vector.Y * 0.3576F) + (vector.Z * 0.1805F);
-            float y = (vector.X * 0.2126F) + (vector.Y * 0.7152F) + (vector.Z * 0.0722F);
-            float z = (vector.X * 0.0193F) + (vector.Y * 0.1192F) + (vector.Z * 0.9505F);
-
-            x *= 100F;
-            y *= 100F;
-            z *= 100F;
-
-            return new CieXyz(x, y, z);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="CieXyz"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="CieXyz"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="CieXyz"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(CieXyz left, CieXyz right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="CieXyz"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="CieXyz"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="CieXyz"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(CieXyz left, CieXyz right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "CieXyz [ Empty ]";
-            }
-
-            return $"CieXyz [ X={this.X:#0.##}, Y={this.Y:#0.##}, Z={this.Z:#0.##} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is CieXyz)
-            {
-                return this.Equals((CieXyz)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(CieXyz other)
-        {
-            return this.AlmostEquals(other, Epsilon);
-        }
-
-        /// <inheritdoc/>
-        public bool AlmostEquals(CieXyz other, float precision)
-        {
-            Vector3 result = Vector3.Abs(this.backingVector - other.backingVector);
-
-            return result.X < precision
-                && result.Y < precision
-                && result.Z < precision;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Hsv"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(CieXyz color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/Cmyk.cs b/src/ImageSharp46/Colors/Colorspaces/Cmyk.cs
deleted file mode 100644
index 15bea263c..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/Cmyk.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// <copyright file="Cmyk.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents an CMYK (cyan, magenta, yellow, keyline) color.
-    /// </summary>
-    public struct Cmyk : IEquatable<Cmyk>, IAlmostEquatable<Cmyk, float>
-    {
-        /// <summary>
-        /// Represents a <see cref="Cmyk"/> that has C, M, Y, and K values set to zero.
-        /// </summary>
-        public static readonly Cmyk Empty = default(Cmyk);
-
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001f;
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector4 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Cmyk"/> struct.
-        /// </summary>
-        /// <param name="c">The cyan component.</param>
-        /// <param name="m">The magenta component.</param>
-        /// <param name="y">The yellow component.</param>
-        /// <param name="k">The keyline black component.</param>
-        public Cmyk(float c, float m, float y, float k)
-            : this()
-        {
-            this.backingVector = Vector4.Clamp(new Vector4(c, m, y, k), Vector4.Zero, Vector4.One);
-        }
-
-        /// <summary>
-        /// Gets the cyan color component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float C => this.backingVector.X;
-
-        /// <summary>
-        /// Gets the magenta color component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float M => this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the yellow color component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float Y => this.backingVector.Z;
-
-        /// <summary>
-        /// Gets the keyline black color component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float K => this.backingVector.W;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Cmyk"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="Cmyk"/>.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Bgra32"/> to convert.
-        /// </param>
-        /// <returns>
-        /// An instance of <see cref="Cmyk"/>.
-        /// </returns>
-        public static implicit operator Cmyk(Color color)
-        {
-            float c = 1f - (color.R / 255F);
-            float m = 1f - (color.G / 255F);
-            float y = 1f - (color.B / 255F);
-
-            float k = Math.Min(c, Math.Min(m, y));
-
-            if (Math.Abs(k - 1.0f) <= Epsilon)
-            {
-                return new Cmyk(0, 0, 0, 1);
-            }
-
-            c = (c - k) / (1 - k);
-            m = (m - k) / (1 - k);
-            y = (y - k) / (1 - k);
-
-            return new Cmyk(c, m, y, k);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Cmyk"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Cmyk"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Cmyk"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Cmyk left, Cmyk right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Cmyk"/> objects for inequality
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Cmyk"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Cmyk"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Cmyk left, Cmyk right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Cmyk [Empty]";
-            }
-
-            return $"Cmyk [ C={this.C:#0.##}, M={this.M:#0.##}, Y={this.Y:#0.##}, K={this.K:#0.##}]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Cmyk)
-            {
-                return this.Equals((Cmyk)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Cmyk other)
-        {
-            return this.AlmostEquals(other, Epsilon);
-        }
-
-        /// <inheritdoc/>
-        public bool AlmostEquals(Cmyk other, float precision)
-        {
-            Vector4 result = Vector4.Abs(this.backingVector - other.backingVector);
-
-            return result.X < precision
-                && result.Y < precision
-                && result.Z < precision
-                && result.W < precision;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Cmyk"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(Cmyk color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/Hsl.cs b/src/ImageSharp46/Colors/Colorspaces/Hsl.cs
deleted file mode 100644
index 1cc54ec8c..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/Hsl.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-// <copyright file="Hsl.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents a Hsl (hue, saturation, lightness) color.
-    /// </summary>
-    public struct Hsl : IEquatable<Hsl>, IAlmostEquatable<Hsl, float>
-    {
-        /// <summary>
-        /// Represents a <see cref="Hsl"/> that has H, S, and L values set to zero.
-        /// </summary>
-        public static readonly Hsl Empty = default(Hsl);
-
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001F;
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector3 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Hsl"/> struct.
-        /// </summary>
-        /// <param name="h">The h hue component.</param>
-        /// <param name="s">The s saturation component.</param>
-        /// <param name="l">The l value (lightness) component.</param>
-        public Hsl(float h, float s, float l)
-        {
-            this.backingVector = Vector3.Clamp(new Vector3(h, s, l), Vector3.Zero, new Vector3(360, 1, 1));
-        }
-
-        /// <summary>
-        /// Gets the hue component.
-        /// <remarks>A value ranging between 0 and 360.</remarks>
-        /// </summary>
-        public float H => this.backingVector.X;
-
-        /// <summary>
-        /// Gets the saturation component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float S => this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the lightness component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float L => this.backingVector.Z;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Hsl"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="Hsl"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Hsl"/>.
-        /// </returns>
-        public static implicit operator Hsl(Color color)
-        {
-            float r = color.R / 255F;
-            float g = color.G / 255F;
-            float b = color.B / 255F;
-
-            float max = Math.Max(r, Math.Max(g, b));
-            float min = Math.Min(r, Math.Min(g, b));
-            float chroma = max - min;
-            float h = 0;
-            float s = 0;
-            float l = (max + min) / 2;
-
-            if (Math.Abs(chroma) < Epsilon)
-            {
-                return new Hsl(0, s, l);
-            }
-
-            if (Math.Abs(r - max) < Epsilon)
-            {
-                h = (g - b) / chroma;
-            }
-            else if (Math.Abs(g - max) < Epsilon)
-            {
-                h = 2 + ((b - r) / chroma);
-            }
-            else if (Math.Abs(b - max) < Epsilon)
-            {
-                h = 4 + ((r - g) / chroma);
-            }
-
-            h *= 60;
-            if (h < 0.0)
-            {
-                h += 360;
-            }
-
-            if (l <= .5f)
-            {
-                s = chroma / (max + min);
-            }
-            else
-            {
-                s = chroma / (2 - chroma);
-            }
-
-            return new Hsl(h, s, l);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Hsl"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Hsl"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Hsl"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Hsl left, Hsl right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Hsl"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Hsl"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Hsl"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Hsl left, Hsl right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Hsl [ Empty ]";
-            }
-
-            return $"Hsl [ H={this.H:#0.##}, S={this.S:#0.##}, L={this.L:#0.##} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Hsl)
-            {
-                return this.Equals((Hsl)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Hsl other)
-        {
-            return this.AlmostEquals(other, Epsilon);
-        }
-
-        /// <inheritdoc/>
-        public bool AlmostEquals(Hsl other, float precision)
-        {
-            Vector3 result = Vector3.Abs(this.backingVector - other.backingVector);
-
-            return result.X < precision
-                && result.Y < precision
-                && result.Z < precision;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Hsl"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(Hsl color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/Hsv.cs b/src/ImageSharp46/Colors/Colorspaces/Hsv.cs
deleted file mode 100644
index b55e07e6b..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/Hsv.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// <copyright file="Hsv.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Represents a HSV (hue, saturation, value) color. Also known as HSB (hue, saturation, brightness).
-    /// </summary>
-    public struct Hsv : IEquatable<Hsv>, IAlmostEquatable<Hsv, float>
-    {
-        /// <summary>
-        /// Represents a <see cref="Hsv"/> that has H, S, and V values set to zero.
-        /// </summary>
-        public static readonly Hsv Empty = default(Hsv);
-
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001F;
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector3 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Hsv"/> struct.
-        /// </summary>
-        /// <param name="h">The h hue component.</param>
-        /// <param name="s">The s saturation component.</param>
-        /// <param name="v">The v value (brightness) component.</param>
-        public Hsv(float h, float s, float v)
-        {
-            this.backingVector = Vector3.Clamp(new Vector3(h, s, v), Vector3.Zero, new Vector3(360, 1, 1));
-        }
-
-        /// <summary>
-        /// Gets the hue component.
-        /// <remarks>A value ranging between 0 and 360.</remarks>
-        /// </summary>
-        public float H => this.backingVector.X;
-
-        /// <summary>
-        /// Gets the saturation component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float S => this.backingVector.Y;
-
-        /// <summary>
-        /// Gets the value (brightness) component.
-        /// <remarks>A value ranging between 0 and 1.</remarks>
-        /// </summary>
-        public float V => this.backingVector.Z;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Hsv"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="Hsv"/>.
-        /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
-        /// <returns>
-        /// An instance of <see cref="Hsv"/>.
-        /// </returns>
-        public static implicit operator Hsv(Color color)
-        {
-            float r = color.R / 255F;
-            float g = color.G / 255F;
-            float b = color.B / 255F;
-
-            float max = Math.Max(r, Math.Max(g, b));
-            float min = Math.Min(r, Math.Min(g, b));
-            float chroma = max - min;
-            float h = 0;
-            float s = 0;
-            float v = max;
-
-            if (Math.Abs(chroma) < Epsilon)
-            {
-                return new Hsv(0, s, v);
-            }
-
-            if (Math.Abs(r - max) < Epsilon)
-            {
-                h = (g - b) / chroma;
-            }
-            else if (Math.Abs(g - max) < Epsilon)
-            {
-                h = 2 + ((b - r) / chroma);
-            }
-            else if (Math.Abs(b - max) < Epsilon)
-            {
-                h = 4 + ((r - g) / chroma);
-            }
-
-            h *= 60;
-            if (h < 0.0)
-            {
-                h += 360;
-            }
-
-            s = chroma / v;
-
-            return new Hsv(h, s, v);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Hsv"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Hsv"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Hsv"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Hsv left, Hsv right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Hsv"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Hsv"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Hsv"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Hsv left, Hsv right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Hsv [ Empty ]";
-            }
-
-            return $"Hsv [ H={this.H:#0.##}, S={this.S:#0.##}, V={this.V:#0.##} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Hsv)
-            {
-                return this.Equals((Hsv)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Hsv other)
-        {
-            return this.AlmostEquals(other, Epsilon);
-        }
-
-        /// <inheritdoc/>
-        public bool AlmostEquals(Hsv other, float precision)
-        {
-            Vector3 result = Vector3.Abs(this.backingVector - other.backingVector);
-
-            return result.X < precision
-                && result.Y < precision
-                && result.Z < precision;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Hsv"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private static int GetHashCode(Hsv color) => color.backingVector.GetHashCode();
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/IAlmostEquatable.cs b/src/ImageSharp46/Colors/Colorspaces/IAlmostEquatable.cs
deleted file mode 100644
index 1163657ed..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/IAlmostEquatable.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// <copyright file="IAlmostEquatable.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// Defines a generalized method that a value type or class implements to create
-    /// a type-specific method for determining approximate equality of instances.
-    /// </summary>
-    /// <typeparam name="TColor">The type of objects to compare.</typeparam>
-    /// <typeparam name="TPrecision">The object specifying the type to specify precision with.</typeparam>
-    public interface IAlmostEquatable<in TColor, in TPrecision>
-        where TPrecision : struct, IComparable<TPrecision>
-    {
-        /// <summary>
-        /// Indicates whether the current object is equal to another object of the same type
-        /// when compared to the specified precision level.
-        /// </summary>
-        /// <param name="other">An object to compare with this object.</param>
-        /// <param name="precision">The object specifying the level of precision.</param>
-        /// <returns>
-        /// true if the current object is equal to the other parameter; otherwise, false.
-        /// </returns>
-        bool AlmostEquals(TColor other, TPrecision precision);
-    }
-}
diff --git a/src/ImageSharp46/Colors/Colorspaces/YCbCr.cs b/src/ImageSharp46/Colors/Colorspaces/YCbCr.cs
deleted file mode 100644
index c9a0872c5..000000000
--- a/src/ImageSharp46/Colors/Colorspaces/YCbCr.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// <copyright file="YCbCr.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-
-    /// <summary>
-    /// Represents an YCbCr (luminance, blue chroma, red chroma) color conforming to the full range standard used in digital imaging systems.
-    /// <see href="http://en.wikipedia.org/wiki/YCbCr"/>
-    /// </summary>
-    public struct YCbCr : IEquatable<YCbCr>
-    {
-        /// <summary>
-        /// Represents a <see cref="YCbCr"/> that has Y, Cb, and Cr values set to zero.
-        /// </summary>
-        public static readonly YCbCr Empty = default(YCbCr);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="YCbCr"/> struct.
-        /// </summary>
-        /// <param name="y">The y luminance component.</param>
-        /// <param name="cb">The cb chroma component.</param>
-        /// <param name="cr">The cr chroma component.</param>
-        public YCbCr(byte y, byte cb, byte cr)
-            : this()
-        {
-            this.Y = y;
-            this.Cb = cb;
-            this.Cr = cr;
-        }
-
-        /// <summary>
-        /// Gets the Y luminance component.
-        /// <remarks>A value ranging between 0 and 255.</remarks>
-        /// </summary>
-        public byte Y { get; }
-
-        /// <summary>
-        /// Gets the Cb chroma component.
-        /// <remarks>A value ranging between 0 and 255.</remarks>
-        /// </summary>
-        public byte Cb { get; }
-
-        /// <summary>
-        /// Gets the Cr chroma component.
-        /// <remarks>A value ranging between 0 and 255.</remarks>
-        /// </summary>
-        public byte Cr { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="YCbCr"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
-        /// <see cref="YCbCr"/>.
-        /// </summary>
-        /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
-        /// </param>
-        /// <returns>
-        /// An instance of <see cref="YCbCr"/>.
-        /// </returns>
-        public static implicit operator YCbCr(Color color)
-        {
-            byte r = color.R;
-            byte g = color.G;
-            byte b = color.B;
-
-            byte y = (byte)((0.299F * r) + (0.587F * g) + (0.114F * b));
-            byte cb = (byte)(128 + ((-0.168736F * r) - (0.331264F * g) + (0.5F * b)));
-            byte cr = (byte)(128 + ((0.5F * r) - (0.418688F * g) - (0.081312F * b)));
-
-            return new YCbCr(y, cb, cr);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="YCbCr"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="YCbCr"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="YCbCr"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(YCbCr left, YCbCr right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="YCbCr"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="YCbCr"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="YCbCr"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(YCbCr left, YCbCr right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = this.Y.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.Cb.GetHashCode();
-                hashCode = (hashCode * 397) ^ this.Cr.GetHashCode();
-                return hashCode;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "YCbCr [ Empty ]";
-            }
-
-            return $"YCbCr [ Y={this.Y}, Cb={this.Cb}, Cr={this.Cr} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is YCbCr)
-            {
-                return this.Equals((YCbCr)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(YCbCr other)
-        {
-            return this.Y == other.Y && this.Cb == other.Cb && this.Cr == other.Cr;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Colors/ComponentOrder.cs b/src/ImageSharp46/Colors/ComponentOrder.cs
deleted file mode 100644
index 7372ab9bf..000000000
--- a/src/ImageSharp46/Colors/ComponentOrder.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="ComponentOrder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerates the various component orders.
-    /// </summary>
-    public enum ComponentOrder
-    {
-        /// <summary>
-        /// Z-> Y-> X order. Equivalent to B-> G-> R in <see cref="Color"/>
-        /// </summary>
-        ZYX,
-
-        /// <summary>
-        /// Z-> Y-> X-> W order. Equivalent to B-> G-> R-> A in <see cref="Color"/>
-        /// </summary>
-        ZYXW,
-
-        /// <summary>
-        /// X-> Y-> Z order. Equivalent to R-> G-> B in <see cref="Color"/>
-        /// </summary>
-        XYZ,
-
-        /// <summary>
-        /// X-> Y-> Z-> W order. Equivalent to R-> G-> B-> A in <see cref="Color"/>
-        /// </summary>
-        XYZW,
-    }
-}
diff --git a/src/ImageSharp46/Colors/PackedPixel/IPackedBytes.cs b/src/ImageSharp46/Colors/PackedPixel/IPackedBytes.cs
deleted file mode 100644
index 5793ea1ba..000000000
--- a/src/ImageSharp46/Colors/PackedPixel/IPackedBytes.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="IPackedBytes.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// An interface that converts packed vector types to and from <see cref="T:byte[]"/> values,
-    /// allowing multiple encodings to be manipulated in a generic manner.
-    /// </summary>
-    public interface IPackedBytes
-    {
-        /// <summary>
-        /// Gets the packed representation from the gives bytes.
-        /// </summary>
-        /// <param name="x">The x-component.</param>
-        /// <param name="y">The y-component.</param>
-        /// <param name="z">The z-component.</param>
-        /// <param name="w">The w-component.</param>
-        void PackFromBytes(byte x, byte y, byte z, byte w);
-
-        /// <summary>
-        /// Sets the packed representation into the gives bytes.
-        /// </summary>
-        /// <param name="bytes">The bytes to set the color in.</param>
-        /// <param name="startIndex">The starting index of the <paramref name="bytes"/>.</param>
-        /// <param name="componentOrder">The order of the components.</param>
-        void ToBytes(byte[] bytes, int startIndex, ComponentOrder componentOrder);
-    }
-}
diff --git a/src/ImageSharp46/Colors/PackedPixel/IPackedPixel.cs b/src/ImageSharp46/Colors/PackedPixel/IPackedPixel.cs
deleted file mode 100644
index 54602380f..000000000
--- a/src/ImageSharp46/Colors/PackedPixel/IPackedPixel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// <copyright file="IPackedPixel.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// An interface that represents a packed pixel type.
-    /// </summary>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IPackedPixel<TPacked> : IPackedVector<TPacked>, IPackedBytes
-        where TPacked : struct
-    {
-    }
-}
diff --git a/src/ImageSharp46/Colors/PackedPixel/IPackedVector.cs b/src/ImageSharp46/Colors/PackedPixel/IPackedVector.cs
deleted file mode 100644
index cdf250a01..000000000
--- a/src/ImageSharp46/Colors/PackedPixel/IPackedVector.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <copyright file="IPackedVector.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// An interface that converts packed vector types to and from <see cref="Vector4"/> values,
-    /// allowing multiple encodings to be manipulated in a generic manner.
-    /// </summary>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IPackedVector<TPacked> : IPackedVector
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Gets or sets the packed representation of the value.
-        /// </summary>
-        TPacked PackedValue { get; set; }
-    }
-
-    /// <summary>
-    /// An interface that converts packed vector types to and from <see cref="Vector4"/> values.
-    /// </summary>
-    public interface IPackedVector
-    {
-        /// <summary>
-        /// Sets the packed representation from a <see cref="Vector4"/>.
-        /// </summary>
-        /// <param name="vector">The vector to create the packed representation from.</param>
-        void PackFromVector4(Vector4 vector);
-
-        /// <summary>
-        /// Expands the packed representation into a <see cref="Vector4"/>.
-        /// The vector components are typically expanded in least to greatest significance order.
-        /// </summary>
-        /// <returns>The <see cref="Vector4"/>.</returns>
-        Vector4 ToVector4();
-    }
-}
diff --git a/src/ImageSharp46/Colors/RgbaComponent.cs b/src/ImageSharp46/Colors/RgbaComponent.cs
deleted file mode 100644
index ed85fb86b..000000000
--- a/src/ImageSharp46/Colors/RgbaComponent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="RgbaComponent.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerates the RGBA (red, green, blue, alpha) color components.
-    /// </summary>
-    public enum RgbaComponent
-    {
-        /// <summary>
-        /// The red component.
-        /// </summary>
-        R = 0,
-
-        /// <summary>
-        /// The green component.
-        /// </summary>
-        G = 1,
-
-        /// <summary>
-        /// The blue component.
-        /// </summary>
-        B = 2,
-
-        /// <summary>
-        /// The alpha component.
-        /// </summary>
-        A = 3
-    }
-}
diff --git a/src/ImageSharp46/Common/Exceptions/ImageFormatException.cs b/src/ImageSharp46/Common/Exceptions/ImageFormatException.cs
deleted file mode 100644
index 70491ba22..000000000
--- a/src/ImageSharp46/Common/Exceptions/ImageFormatException.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// <copyright file="ImageFormatException.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// The exception that is thrown when the library tries to load
-    /// an image, which has an invalid format.
-    /// </summary>
-    public class ImageFormatException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFormatException"/> class.
-        /// </summary>
-        public ImageFormatException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFormatException"/> class with the name of the
-        /// parameter that causes this exception.
-        /// </summary>
-        /// <param name="errorMessage">The error message that explains the reason for this exception.</param>
-        public ImageFormatException(string errorMessage)
-            : base(errorMessage)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFormatException"/> class with a specified
-        /// error message and the exception that is the cause of this exception.
-        /// </summary>
-        /// <param name="errorMessage">The error message that explains the reason for this exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic)
-        /// if no inner exception is specified.</param>
-        public ImageFormatException(string errorMessage, Exception innerException)
-            : base(errorMessage, innerException)
-        {
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Exceptions/ImageProcessingException.cs b/src/ImageSharp46/Common/Exceptions/ImageProcessingException.cs
deleted file mode 100644
index a59be9ca8..000000000
--- a/src/ImageSharp46/Common/Exceptions/ImageProcessingException.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// <copyright file="ImageProcessingException.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// The exception that is thrown when an error occurs when applying a process to an image.
-    /// </summary>
-    public class ImageProcessingException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageProcessingException"/> class.
-        /// </summary>
-        public ImageProcessingException()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageProcessingException"/> class with the name of the
-        /// parameter that causes this exception.
-        /// </summary>
-        /// <param name="errorMessage">The error message that explains the reason for this exception.</param>
-        public ImageProcessingException(string errorMessage)
-            : base(errorMessage)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageProcessingException"/> class with a specified
-        /// error message and the exception that is the cause of this exception.
-        /// </summary>
-        /// <param name="errorMessage">The error message that explains the reason for this exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic)
-        /// if no inner exception is specified.</param>
-        public ImageProcessingException(string errorMessage, Exception innerException)
-            : base(errorMessage, innerException)
-        {
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Extensions/ByteExtensions.cs b/src/ImageSharp46/Common/Extensions/ByteExtensions.cs
deleted file mode 100644
index 89cfe6974..000000000
--- a/src/ImageSharp46/Common/Extensions/ByteExtensions.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// <copyright file="ByteExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// Extension methods for the <see cref="byte"/> struct.
-    /// </summary>
-    internal static class ByteExtensions
-    {
-        /// <summary>
-        /// Converts a byte array to a new array where each value in the original array is represented
-        /// by a the specified number of bits.
-        /// </summary>
-        /// <param name="source">The bytes to convert from. Cannot be null.</param>
-        /// <param name="bits">The number of bits per value.</param>
-        /// <returns>The resulting <see cref="T:byte[]"/> array. Is never null.</returns>
-        /// <exception cref="System.ArgumentNullException"><paramref name="source"/> is null.</exception>
-        /// <exception cref="System.ArgumentException"><paramref name="bits"/> is less than or equals than zero.</exception>
-        public static byte[] ToArrayByBitsLength(this byte[] source, int bits)
-        {
-            Guard.NotNull(source, nameof(source));
-            Guard.MustBeGreaterThan(bits, 0, "bits");
-
-            byte[] result;
-
-            if (bits < 8)
-            {
-                result = new byte[source.Length * 8 / bits];
-                int mask = 0xFF >> (8 - bits);
-                int resultOffset = 0;
-
-                // ReSharper disable once ForCanBeConvertedToForeach
-                for (int i = 0; i < source.Length; i++)
-                {
-                    byte b = source[i];
-                    for (int shift = 0; shift < 8; shift += bits)
-                    {
-                        int colorIndex = (b >> (8 - bits - shift)) & mask;
-
-                        result[resultOffset] = (byte)colorIndex;
-
-                        resultOffset++;
-                    }
-                }
-            }
-            else
-            {
-                result = source;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Optimized <see cref="T:byte[]"/> reversal algorithm.
-        /// </summary>
-        /// <param name="source">The byte array.</param>
-        public static void ReverseBytes(this byte[] source)
-        {
-            ReverseBytes(source, 0, source.Length);
-        }
-
-        /// <summary>
-        /// Optimized <see cref="T:byte[]"/> reversal algorithm.
-        /// </summary>
-        /// <param name="source">The byte array.</param>
-        /// <param name="index">The index.</param>
-        /// <param name="length">The length.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="source"/> is null.</exception>
-        public static void ReverseBytes(this byte[] source, int index, int length)
-        {
-            Guard.NotNull(source, nameof(source));
-
-            int i = index;
-            int j = index + length - 1;
-            while (i < j)
-            {
-                byte temp = source[i];
-                source[i] = source[j];
-                source[j] = temp;
-                i++;
-                j--;
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Extensions/ComparableExtensions.cs b/src/ImageSharp46/Common/Extensions/ComparableExtensions.cs
deleted file mode 100644
index 6cc2eb588..000000000
--- a/src/ImageSharp46/Common/Extensions/ComparableExtensions.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// <copyright file="ComparableExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Runtime.CompilerServices;
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// Extension methods for classes that implement <see cref="IComparable{T}"/>.
-    /// </summary>
-    internal static class ComparableExtensions
-    {
-        /// <summary>
-        /// Restricts a <see cref="byte"/> to be within a specified range.
-        /// </summary>
-        /// <param name="value">The The value to clamp.</param>
-        /// <param name="min">The minimum value. If value is less than min, min will be returned.</param>
-        /// <param name="max">The maximum value. If value is greater than max, max will be returned.</param>
-        /// <returns>
-        /// The <see cref="byte"/> representing the clamped value.
-        /// </returns>
-        public static byte Clamp(this byte value, byte min, byte max)
-        {
-            // Order is important here as someone might set min to higher than max.
-            if (value > max)
-            {
-                return max;
-            }
-
-            if (value < min)
-            {
-                return min;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Restricts a <see cref="uint"/> to be within a specified range.
-        /// </summary>
-        /// <param name="value">The The value to clamp.</param>
-        /// <param name="min">The minimum value. If value is less than min, min will be returned.</param>
-        /// <param name="max">The maximum value. If value is greater than max, max will be returned.</param>
-        /// <returns>
-        /// The <see cref="int"/> representing the clamped value.
-        /// </returns>
-        public static uint Clamp(this uint value, uint min, uint max)
-        {
-            if (value > max)
-            {
-                return max;
-            }
-
-            if (value < min)
-            {
-                return min;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Restricts a <see cref="int"/> to be within a specified range.
-        /// </summary>
-        /// <param name="value">The The value to clamp.</param>
-        /// <param name="min">The minimum value. If value is less than min, min will be returned.</param>
-        /// <param name="max">The maximum value. If value is greater than max, max will be returned.</param>
-        /// <returns>
-        /// The <see cref="int"/> representing the clamped value.
-        /// </returns>
-        public static int Clamp(this int value, int min, int max)
-        {
-            if (value > max)
-            {
-                return max;
-            }
-
-            if (value < min)
-            {
-                return min;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Restricts a <see cref="float"/> to be within a specified range.
-        /// </summary>
-        /// <param name="value">The The value to clamp.</param>
-        /// <param name="min">The minimum value. If value is less than min, min will be returned.</param>
-        /// <param name="max">The maximum value. If value is greater than max, max will be returned.</param>
-        /// <returns>
-        /// The <see cref="float"/> representing the clamped value.
-        /// </returns>
-        /// 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static float Clamp(this float value, float min, float max)
-        {
-            if (value > max)
-            {
-                return max;
-            }
-
-            if (value < min)
-            {
-                return min;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Restricts a <see cref="double"/> to be within a specified range.
-        /// </summary>
-        /// <param name="value">The The value to clamp.</param>
-        /// <param name="min">The minimum value. If value is less than min, min will be returned.</param>
-        /// <param name="max">The maximum value. If value is greater than max, max will be returned.</param>
-        /// <returns>
-        /// The <see cref="double"/> representing the clamped value.
-        /// </returns>
-        public static double Clamp(this double value, double min, double max)
-        {
-            if (value > max)
-            {
-                return max;
-            }
-
-            if (value < min)
-            {
-                return min;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Converts an <see cref="int"/> to a <see cref="byte"/> first restricting the value between the
-        /// minimum and maximum allowable ranges.
-        /// </summary>
-        /// <param name="value">The <see cref="int"/> this method extends.</param>
-        /// <returns>The <see cref="byte"/></returns>
-        public static byte ToByte(this int value)
-        {
-            return (byte)value.Clamp(0, 255);
-        }
-
-        /// <summary>
-        /// Converts an <see cref="float"/> to a <see cref="byte"/> first restricting the value between the
-        /// minimum and maximum allowable ranges.
-        /// </summary>
-        /// <param name="value">The <see cref="float"/> this method extends.</param>
-        /// <returns>The <see cref="byte"/></returns>
-        public static byte ToByte(this float value)
-        {
-            return (byte)value.Clamp(0, 255);
-        }
-
-        /// <summary>
-        /// Converts an <see cref="double"/> to a <see cref="byte"/> first restricting the value between the
-        /// minimum and maximum allowable ranges.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> this method extends.</param>
-        /// <returns>The <see cref="byte"/></returns>
-        public static byte ToByte(this double value)
-        {
-            return (byte)value.Clamp(0, 255);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Extensions/EnumerableExtensions.cs b/src/ImageSharp46/Common/Extensions/EnumerableExtensions.cs
deleted file mode 100644
index af8e50c7b..000000000
--- a/src/ImageSharp46/Common/Extensions/EnumerableExtensions.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// <copyright file="EnumerableExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Encapsulates a series of time saving extension methods to the <see cref="T:System.Collections.IEnumerable"/> interface.
-    /// </summary>
-    public static class EnumerableExtensions
-    {
-        /// <summary>
-        /// Generates a sequence of integral numbers within a specified range.
-        /// </summary>
-        /// <param name="fromInclusive">
-        /// The start index, inclusive.
-        /// </param>
-        /// <param name="toExclusive">
-        /// The end index, exclusive.
-        /// </param>
-        /// <param name="step">
-        /// The incremental step.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable{Int32}"/> that contains a range of sequential integral numbers.
-        /// </returns>
-        public static IEnumerable<int> SteppedRange(int fromInclusive, int toExclusive, int step)
-        {
-            // Borrowed from Enumerable.Range
-            long num = (fromInclusive + toExclusive) - 1L;
-            if ((toExclusive < 0) || (num > 0x7fffffffL))
-            {
-                throw new ArgumentOutOfRangeException(nameof(toExclusive));
-            }
-
-            return RangeIterator(fromInclusive, i => i < toExclusive, step);
-        }
-
-        /// <summary>
-        /// Generates a sequence of integral numbers within a specified range.
-        /// </summary>
-        /// <param name="fromInclusive">
-        /// The start index, inclusive.
-        /// </param>
-        /// <param name="toDelegate">
-        /// A method that has one parameter and returns a <see cref="bool"/> calculating the end index
-        /// </param>
-        /// <param name="step">
-        /// The incremental step.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable{Int32}"/> that contains a range of sequential integral numbers.
-        /// </returns>
-        public static IEnumerable<int> SteppedRange(int fromInclusive, Func<int, bool> toDelegate, int step)
-        {
-            return RangeIterator(fromInclusive, toDelegate, step);
-        }
-
-        /// <summary>
-        /// Generates a sequence of integral numbers within a specified range.
-        /// </summary>
-        /// <param name="fromInclusive">
-        /// The start index, inclusive.
-        /// </param>
-        /// <param name="toDelegate">
-        /// A method that has one parameter and returns a <see cref="bool"/> calculating the end index
-        /// </param>
-        /// <param name="step">
-        /// The incremental step.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable{Int32}"/> that contains a range of sequential integral numbers.
-        /// </returns>
-        private static IEnumerable<int> RangeIterator(int fromInclusive, Func<int, bool> toDelegate, int step)
-        {
-            int i = fromInclusive;
-            while (toDelegate(i))
-            {
-                yield return i;
-                i += step;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Common/Extensions/StreamExtensions.cs b/src/ImageSharp46/Common/Extensions/StreamExtensions.cs
deleted file mode 100644
index 87d5a6c32..000000000
--- a/src/ImageSharp46/Common/Extensions/StreamExtensions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// <copyright file="StreamExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.IO;
-
-    internal static class StreamExtensions
-    {
-        public static void Skip(this Stream stream, int count)
-        {
-            if (count < 1)
-            {
-                return;
-            }
-
-            if (stream.CanSeek)
-            {
-                stream.Position += count;
-            }
-            else
-            {
-                byte[] foo = new byte[count];
-                stream.Read(foo, 0, count);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Extensions/Vector4Extensions.cs b/src/ImageSharp46/Common/Extensions/Vector4Extensions.cs
deleted file mode 100644
index 23fce0173..000000000
--- a/src/ImageSharp46/Common/Extensions/Vector4Extensions.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// <copyright file="Vector4Extensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Vector4"/> struct.
-    /// </summary>
-    public static class Vector4Extensions
-    {
-        /// <summary>
-        /// Compresses a linear color signal to its sRGB equivalent.
-        /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
-        /// <see href="http://entropymine.com/imageworsener/srgbformula/"/>
-        /// </summary>
-        /// <param name="linear">The <see cref="Vector4"/> whose signal to compress.</param>
-        /// <returns>The <see cref="Vector4"/>.</returns>
-        public static Vector4 Compress(this Vector4 linear)
-        {
-            // TODO: Is there a faster way to do this?
-            return new Vector4(Compress(linear.X), Compress(linear.Y), Compress(linear.Z), linear.W);
-        }
-
-        /// <summary>
-        /// Expands an sRGB color signal to its linear equivalent.
-        /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
-        /// <see href="http://entropymine.com/imageworsener/srgbformula/"/>
-        /// </summary>
-        /// <param name="gamma">The <see cref="Color"/> whose signal to expand.</param>
-        /// <returns>The <see cref="Vector4"/>.</returns>
-        public static Vector4 Expand(this Vector4 gamma)
-        {
-            // TODO: Is there a faster way to do this?
-            return new Vector4(Expand(gamma.X), Expand(gamma.Y), Expand(gamma.Z), gamma.W);
-        }
-
-        /// <summary>
-        /// Gets the compressed sRGB value from an linear signal.
-        /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
-        /// <see href="http://entropymine.com/imageworsener/srgbformula/"/>
-        /// </summary>
-        /// <param name="signal">The signal value to compress.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float Compress(float signal)
-        {
-            if (signal <= 0.0031308F)
-            {
-                return signal * 12.92F;
-            }
-
-            return (1.055F * (float)Math.Pow(signal, 0.41666666F)) - 0.055F;
-        }
-
-        /// <summary>
-        /// Gets the expanded linear value from an sRGB signal.
-        /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
-        /// <see href="http://entropymine.com/imageworsener/srgbformula/"/>
-        /// </summary>
-        /// <param name="signal">The signal value to expand.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static float Expand(float signal)
-        {
-            if (signal <= 0.04045F)
-            {
-                return signal / 12.92F;
-            }
-
-            return (float)Math.Pow((signal + 0.055F) / 1.055F, 2.4F);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Helpers/Guard.cs b/src/ImageSharp46/Common/Helpers/Guard.cs
deleted file mode 100644
index ecb497d3e..000000000
--- a/src/ImageSharp46/Common/Helpers/Guard.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-// <copyright file="Guard.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Diagnostics;
-
-    /// <summary>
-    /// Provides methods to protect against invalid parameters.
-    /// </summary>
-    [DebuggerStepThrough]
-    internal static class Guard
-    {
-        /// <summary>
-        /// Verifies, that the method parameter with specified object value is not null
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="target">The target object, which cannot be null.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <param name="message">The error message, if any to add to the exception.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="target"/> is null</exception>
-        public static void NotNull(object target, string parameterName, string message = "")
-        {
-            if (target == null)
-            {
-                if (!string.IsNullOrWhiteSpace(message))
-                {
-                    throw new ArgumentNullException(parameterName, message);
-                }
-
-                throw new ArgumentNullException(parameterName);
-            }
-        }
-
-        /// <summary>
-        /// Verifies, that the string method parameter with specified object value and message
-        /// is not null, not empty and does not contain only blanks and throws an exception
-        /// if the object is null.
-        /// </summary>
-        /// <param name="target">The target string, which should be checked against being null or empty.</param>
-        /// <param name="parameterName">Name of the parameter.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="target"/> is null.</exception>
-        /// <exception cref="ArgumentException"><paramref name="target"/> is empty or contains only blanks.</exception>
-        public static void NotNullOrEmpty(string target, string parameterName)
-        {
-            if (target == null)
-            {
-                throw new ArgumentNullException(parameterName);
-            }
-
-            if (string.IsNullOrWhiteSpace(target))
-            {
-                throw new ArgumentException("Value cannot be null or empty and cannot contain only blanks.", parameterName);
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is less than a maximum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is greater than the maximum value.
-        /// </exception>
-        public static void MustBeLessThan<TValue>(TValue value, TValue max, string parameterName)
-                    where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(max) >= 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is less than or equal to a maximum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is greater than the maximum value.
-        /// </exception>
-        public static void MustBeLessThanOrEqualTo<TValue>(TValue value, TValue max, string parameterName)
-                    where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(max) > 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than or equal to {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than a minimum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value.
-        /// </exception>
-        public static void MustBeGreaterThan<TValue>(TValue value, TValue min, string parameterName)
-            where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    parameterName,
-                    $"Value must be greater than {min}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than or equal to a minimum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value.
-        /// </exception>
-        public static void MustBeGreaterThanOrEqualTo<TValue>(TValue value, TValue min, string parameterName)
-            where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) < 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be greater than or equal to {min}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than or equal to a minimum value and less than
-        /// or equal to a maximum value and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value of greater than the maximum value.
-        /// </exception>
-        public static void MustBeBetweenOrEqualTo<TValue>(TValue value, TValue min, TValue max, string parameterName)
-            where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) < 0 || value.CompareTo(max) > 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be greater than or equal to {min} and less than or equal to {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies, that the method parameter with specified target value is true
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="target">
-        /// The target value, which cannot be false.
-        /// </param>
-        /// <param name="parameterName">
-        /// The name of the parameter that is to be checked.
-        /// </param>
-        /// <param name="message">
-        /// The error message, if any to add to the exception.
-        /// </param>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="target"/> is false
-        /// </exception>
-        public static void IsTrue(bool target, string parameterName, string message)
-        {
-            if (!target)
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-
-        /// <summary>
-        /// Verifies, that the method parameter with specified target value is false
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="target">The target value, which cannot be true.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <param name="message">The error message, if any to add to the exception.</param>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="target"/> is true
-        /// </exception>
-        public static void IsFalse(bool target, string parameterName, string message)
-        {
-            if (target)
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Common/Helpers/ImageMaths.cs b/src/ImageSharp46/Common/Helpers/ImageMaths.cs
deleted file mode 100644
index 9b3c62382..000000000
--- a/src/ImageSharp46/Common/Helpers/ImageMaths.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// <copyright file="ImageMaths.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Linq;
-    using System.Numerics;
-
-    /// <summary>
-    /// Provides common mathematical methods.
-    /// </summary>
-    internal static class ImageMaths
-    {
-        /// <summary>
-        /// Returns how many bits are required to store the specified number of colors.
-        /// Performs a Log2() on the value.
-        /// </summary>
-        /// <param name="colors">The number of colors.</param>
-        /// <returns>
-        /// The <see cref="int"/>
-        /// </returns>
-        public static int GetBitsNeededForColorDepth(int colors)
-        {
-            return (int)Math.Ceiling(Math.Log(colors, 2));
-        }
-
-        /// <summary>
-        /// Implementation of 1D Gaussian G(x) function
-        /// </summary>
-        /// <param name="x">The x provided to G(x).</param>
-        /// <param name="sigma">The spread of the blur.</param>
-        /// <returns>The Gaussian G(x)</returns>
-        public static float Gaussian(float x, float sigma)
-        {
-            const float Numerator = 1.0f;
-            float denominator = (float)(Math.Sqrt(2 * Math.PI) * sigma);
-
-            float exponentNumerator = -x * x;
-            float exponentDenominator = (float)(2 * Math.Pow(sigma, 2));
-
-            float left = Numerator / denominator;
-            float right = (float)Math.Exp(exponentNumerator / exponentDenominator);
-
-            return left * right;
-        }
-
-        /// <summary>
-        /// Returns the result of a B-C filter against the given value.
-        /// <see href="http://www.imagemagick.org/Usage/filter/#cubic_bc"/>
-        /// </summary>
-        /// <param name="x">The value to process.</param>
-        /// <param name="b">The B-Spline curve variable.</param>
-        /// <param name="c">The Cardinal curve variable.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        public static float GetBcValue(float x, float b, float c)
-        {
-            float temp;
-
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            temp = x * x;
-            if (x < 1F)
-            {
-                x = ((12 - (9 * b) - (6 * c)) * (x * temp)) + ((-18 + (12 * b) + (6 * c)) * temp) + (6 - (2 * b));
-                return x / 6F;
-            }
-
-            if (x < 2F)
-            {
-                x = ((-b - (6 * c)) * (x * temp)) + (((6 * b) + (30 * c)) * temp) + (((-12 * b) - (48 * c)) * x) + ((8 * b) + (24 * c));
-                return x / 6F;
-            }
-
-            return 0F;
-        }
-
-        /// <summary>
-        /// Gets the result of a sine cardinal function for the given value.
-        /// </summary>
-        /// <param name="x">The value to calculate the result for.</param>
-        /// <returns>
-        /// The <see cref="float"/>.
-        /// </returns>
-        public static float SinC(float x)
-        {
-            const float Epsilon = .00001F;
-
-            if (Math.Abs(x) > Epsilon)
-            {
-                x *= (float)Math.PI;
-                return Clean((float)Math.Sin(x) / x);
-            }
-
-            return 1.0f;
-        }
-
-        /// <summary>
-        /// Returns the given degrees converted to radians.
-        /// </summary>
-        /// <param name="degrees">The angle in degrees.</param>
-        /// <returns>
-        /// The <see cref="float"/> representing the degree as radians.
-        /// </returns>
-        public static float DegreesToRadians(float degrees)
-        {
-            return degrees * (float)(Math.PI / 180);
-        }
-
-        /// <summary>
-        /// Gets the bounding <see cref="Rectangle"/> from the given points.
-        /// </summary>
-        /// <param name="topLeft">
-        /// The <see cref="Point"/> designating the top left position.
-        /// </param>
-        /// <param name="bottomRight">
-        /// The <see cref="Point"/> designating the bottom right position.
-        /// </param>
-        /// <returns>
-        /// The bounding <see cref="Rectangle"/>.
-        /// </returns>
-        public static Rectangle GetBoundingRectangle(Point topLeft, Point bottomRight)
-        {
-            return new Rectangle(topLeft.X, topLeft.Y, bottomRight.X - topLeft.X, bottomRight.Y - topLeft.Y);
-        }
-
-        /// <summary>
-        /// Gets the bounding <see cref="Rectangle"/> from the given matrix.
-        /// </summary>
-        /// <param name="rectangle">The source rectangle.</param>
-        /// <param name="matrix">The transformation matrix.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        public static Rectangle GetBoundingRectangle(Rectangle rectangle, Matrix3x2 matrix)
-        {
-            Vector2 leftTop = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Top), matrix);
-            Vector2 rightTop = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Top), matrix);
-            Vector2 leftBottom = Vector2.Transform(new Vector2(rectangle.Left, rectangle.Bottom), matrix);
-            Vector2 rightBottom = Vector2.Transform(new Vector2(rectangle.Right, rectangle.Bottom), matrix);
-
-            Vector2[] allCorners = { leftTop, rightTop, leftBottom, rightBottom };
-            float extentX = allCorners.Select(v => v.X).Max() - allCorners.Select(v => v.X).Min();
-            float extentY = allCorners.Select(v => v.Y).Max() - allCorners.Select(v => v.Y).Min();
-            return new Rectangle(0, 0, (int)extentX, (int)extentY);
-        }
-
-        /// <summary>
-        /// Finds the bounding rectangle based on the first instance of any color component other
-        /// than the given one.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="bitmap">The <see cref="Image"/> to search within.</param>
-        /// <param name="componentValue">The color component value to remove.</param>
-        /// <param name="channel">The <see cref="RgbaComponent"/> channel to test against.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        public static Rectangle GetFilteredBoundingRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> bitmap, float componentValue, RgbaComponent channel = RgbaComponent.B)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            const float Epsilon = .00001f;
-            int width = bitmap.Width;
-            int height = bitmap.Height;
-            Point topLeft = default(Point);
-            Point bottomRight = default(Point);
-
-            Func<PixelAccessor<TColor, TPacked>, int, int, float, bool> delegateFunc;
-
-            // Determine which channel to check against
-            switch (channel)
-            {
-                case RgbaComponent.R:
-                    delegateFunc = (pixels, x, y, b) => Math.Abs(pixels[x, y].ToVector4().X - b) > Epsilon;
-                    break;
-
-                case RgbaComponent.G:
-                    delegateFunc = (pixels, x, y, b) => Math.Abs(pixels[x, y].ToVector4().Y - b) > Epsilon;
-                    break;
-
-                case RgbaComponent.B:
-                    delegateFunc = (pixels, x, y, b) => Math.Abs(pixels[x, y].ToVector4().Z - b) > Epsilon;
-                    break;
-
-                default:
-                    delegateFunc = (pixels, x, y, b) => Math.Abs(pixels[x, y].ToVector4().W - b) > Epsilon;
-                    break;
-            }
-
-            Func<PixelAccessor<TColor, TPacked>, int> getMinY = pixels =>
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    for (int x = 0; x < width; x++)
-                    {
-                        if (delegateFunc(pixels, x, y, componentValue))
-                        {
-                            return y;
-                        }
-                    }
-                }
-
-                return 0;
-            };
-
-            Func<PixelAccessor<TColor, TPacked>, int> getMaxY = pixels =>
-            {
-                for (int y = height - 1; y > -1; y--)
-                {
-                    for (int x = 0; x < width; x++)
-                    {
-                        if (delegateFunc(pixels, x, y, componentValue))
-                        {
-                            return y;
-                        }
-                    }
-                }
-
-                return height;
-            };
-
-            Func<PixelAccessor<TColor, TPacked>, int> getMinX = pixels =>
-            {
-                for (int x = 0; x < width; x++)
-                {
-                    for (int y = 0; y < height; y++)
-                    {
-                        if (delegateFunc(pixels, x, y, componentValue))
-                        {
-                            return x;
-                        }
-                    }
-                }
-
-                return 0;
-            };
-
-            Func<PixelAccessor<TColor, TPacked>, int> getMaxX = pixels =>
-            {
-                for (int x = width - 1; x > -1; x--)
-                {
-                    for (int y = 0; y < height; y++)
-                    {
-                        if (delegateFunc(pixels, x, y, componentValue))
-                        {
-                            return x;
-                        }
-                    }
-                }
-
-                return height;
-            };
-
-            using (PixelAccessor<TColor, TPacked> bitmapPixels = bitmap.Lock())
-            {
-                topLeft.Y = getMinY(bitmapPixels);
-                topLeft.X = getMinX(bitmapPixels);
-                bottomRight.Y = (getMaxY(bitmapPixels) + 1).Clamp(0, height);
-                bottomRight.X = (getMaxX(bitmapPixels) + 1).Clamp(0, width);
-            }
-
-            return GetBoundingRectangle(topLeft, bottomRight);
-        }
-
-        /// <summary>
-        /// Ensures that any passed double is correctly rounded to zero
-        /// </summary>
-        /// <param name="x">The value to clean.</param>
-        /// <returns>
-        /// The <see cref="float"/>
-        /// </returns>.
-        private static float Clean(float x)
-        {
-            const float Epsilon = .00001F;
-
-            if (Math.Abs(x) < Epsilon)
-            {
-                return 0F;
-            }
-
-            return x;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Alpha.cs b/src/ImageSharp46/Filters/Alpha.cs
deleted file mode 100644
index a985165ad..000000000
--- a/src/ImageSharp46/Filters/Alpha.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="Alpha.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the alpha component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="percent">The new opacity of the image. Must be between 0 and 100.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Alpha<TColor, TPacked>(this Image<TColor, TPacked> source, int percent)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Alpha(source, percent, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the alpha component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="percent">The new opacity of the image. Must be between 0 and 100.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor, TPacked> Alpha<TColor, TPacked>(this Image<TColor, TPacked> source, int percent, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new AlphaProcessor<TColor, TPacked>(percent));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/BackgroundColor.cs b/src/ImageSharp46/Filters/BackgroundColor.cs
deleted file mode 100644
index 47cbee4fb..000000000
--- a/src/ImageSharp46/Filters/BackgroundColor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// <copyright file="BackgroundColor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Replaces the background color of image with the given one.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color to set as the background.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BackgroundColor<TColor, TPacked>(this Image<TColor, TPacked> source, TColor color)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(source.Bounds, new BackgroundColorProcessor<TColor, TPacked>(color));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/BinaryThreshold.cs b/src/ImageSharp46/Filters/BinaryThreshold.cs
deleted file mode 100644
index d97441fe2..000000000
--- a/src/ImageSharp46/Filters/BinaryThreshold.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="BinaryThreshold.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies binerization to the image splitting the pixels at the given threshold.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="threshold">The threshold to apply binerization of the image. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BinaryThreshold<TColor, TPacked>(this Image<TColor, TPacked> source, float threshold)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return BinaryThreshold(source, threshold, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies binerization to the image splitting the pixels at the given threshold.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="threshold">The threshold to apply binerization of the image. Must be between 0 and 1.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BinaryThreshold<TColor, TPacked>(this Image<TColor, TPacked> source, float threshold, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new BinaryThresholdProcessor<TColor, TPacked>(threshold));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/BlackWhite.cs b/src/ImageSharp46/Filters/BlackWhite.cs
deleted file mode 100644
index 7e6c6601e..000000000
--- a/src/ImageSharp46/Filters/BlackWhite.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="BlackWhite.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies black and white toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BlackWhite<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return BlackWhite(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies black and white toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BlackWhite<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new BlackWhiteProcessor<TColor, TPacked>());
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Blend.cs b/src/ImageSharp46/Filters/Blend.cs
deleted file mode 100644
index 448fb7aa0..000000000
--- a/src/ImageSharp46/Filters/Blend.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// <copyright file="Blend.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Combines the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <param name="percent">The opacity of the image image to blend. Must be between 0 and 100.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Blend<TColor, TPacked>(this Image<TColor, TPacked> source, ImageBase<TColor, TPacked> image, int percent = 50)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Blend(source, image, percent, source.Bounds);
-        }
-
-        /// <summary>
-        /// Combines the given image together with the current one by blending their pixels.
-        /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="percent">The opacity of the image image to blend. Must be between 0 and 100.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Blend<TColor, TPacked>(this Image<TColor, TPacked> source, ImageBase<TColor, TPacked> image, int percent, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new BlendProcessor<TColor, TPacked>(image, percent));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Brightness.cs b/src/ImageSharp46/Filters/Brightness.cs
deleted file mode 100644
index 2e167c54f..000000000
--- a/src/ImageSharp46/Filters/Brightness.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="Brightness.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the brightness component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new brightness of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Brightness<TColor, TPacked>(this Image<TColor, TPacked> source, int amount)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Brightness(source, amount, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the brightness component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new brightness of the image. Must be between -100 and 100.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Brightness<TColor, TPacked>(this Image<TColor, TPacked> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new BrightnessProcessor<TColor, TPacked>(amount));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/ColorBlindness.cs b/src/ImageSharp46/Filters/ColorBlindness.cs
deleted file mode 100644
index e1a14e0f0..000000000
--- a/src/ImageSharp46/Filters/ColorBlindness.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// <copyright file="ColorBlindness.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies the given colorblindness simulator to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="colorBlindness">The type of color blindness simulator to apply.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> ColorBlindness<TColor, TPacked>(this Image<TColor, TPacked> source, ColorBlindness colorBlindness)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return ColorBlindness(source, colorBlindness, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies the given colorblindness simulator to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="colorBlindness">The type of color blindness simulator to apply.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> ColorBlindness<TColor, TPacked>(this Image<TColor, TPacked> source, ColorBlindness colorBlindness, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            IImageFilter<TColor, TPacked> processor;
-
-            switch (colorBlindness)
-            {
-                case ImageSharp.ColorBlindness.Achromatomaly:
-                    processor = new AchromatomalyProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Achromatopsia:
-                    processor = new AchromatopsiaProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Deuteranomaly:
-                    processor = new DeuteranomalyProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Deuteranopia:
-                    processor = new DeuteranopiaProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Protanomaly:
-                    processor = new ProtanomalyProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Protanopia:
-                    processor = new ProtanopiaProcessor<TColor, TPacked>();
-                    break;
-
-                case ImageSharp.ColorBlindness.Tritanomaly:
-                    processor = new TritanomalyProcessor<TColor, TPacked>();
-                    break;
-
-                default:
-                    processor = new TritanopiaProcessor<TColor, TPacked>();
-                    break;
-            }
-
-            return source.Process(rectangle, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Contrast.cs b/src/ImageSharp46/Filters/Contrast.cs
deleted file mode 100644
index 6f9c45cc6..000000000
--- a/src/ImageSharp46/Filters/Contrast.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="Contrast.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the contrast component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new contrast of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Contrast<TColor, TPacked>(this Image<TColor, TPacked> source, int amount)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Contrast(source, amount, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the contrast component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new contrast of the image. Must be between -100 and 100.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Contrast<TColor, TPacked>(this Image<TColor, TPacked> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new ContrastProcessor<TColor, TPacked>(amount));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Glow.cs b/src/ImageSharp46/Filters/Glow.cs
deleted file mode 100644
index 1b829850d..000000000
--- a/src/ImageSharp46/Filters/Glow.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// <copyright file="Glow.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies a radial glow effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Glow<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Glow(source, default(TColor), source.Bounds.Width * .5F, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial glow effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color to set as the glow.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Glow<TColor, TPacked>(this Image<TColor, TPacked> source, TColor color)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Glow(source, color, source.Bounds.Width * .5F, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial glow effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="radius">The the radius.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Glow<TColor, TPacked>(this Image<TColor, TPacked> source, float radius)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Glow(source, default(TColor), radius, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial glow effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Glow<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Glow(source, default(TColor), 0, rectangle);
-        }
-
-        /// <summary>
-        /// Applies a radial glow effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color to set as the glow.</param>
-        /// <param name="radius">The the radius.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Glow<TColor, TPacked>(this Image<TColor, TPacked> source, TColor color, float radius, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            GlowProcessor<TColor, TPacked> processor = new GlowProcessor<TColor, TPacked> { Radius = radius, };
-
-            if (!color.Equals(default(TColor)))
-            {
-                processor.GlowColor = color;
-            }
-
-            return source.Process(rectangle, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Grayscale.cs b/src/ImageSharp46/Filters/Grayscale.cs
deleted file mode 100644
index ce827e54c..000000000
--- a/src/ImageSharp46/Filters/Grayscale.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// <copyright file="Grayscale.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies Grayscale toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="mode">The formula to apply to perform the operation.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Grayscale<TColor, TPacked>(this Image<TColor, TPacked> source, GrayscaleMode mode = GrayscaleMode.Bt709)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Grayscale(source, source.Bounds, mode);
-        }
-
-        /// <summary>
-        /// Applies Grayscale toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <param name="mode">The formula to apply to perform the operation.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Grayscale<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle, GrayscaleMode mode = GrayscaleMode.Bt709)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            IImageFilter<TColor, TPacked> processor = mode == GrayscaleMode.Bt709
-                ? (IImageFilter<TColor, TPacked>)new GrayscaleBt709Processor<TColor, TPacked>()
-                : new GrayscaleBt601Processor<TColor, TPacked>();
-
-            return source.Process(rectangle, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Hue.cs b/src/ImageSharp46/Filters/Hue.cs
deleted file mode 100644
index c146667a0..000000000
--- a/src/ImageSharp46/Filters/Hue.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="Hue.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the hue component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="degrees">The angle in degrees to adjust the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Hue<TColor, TPacked>(this Image<TColor, TPacked> source, float degrees)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Hue(source, degrees, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the hue component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="degrees">The angle in degrees to adjust the image.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Hue<TColor, TPacked>(this Image<TColor, TPacked> source, float degrees, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new HueProcessor<TColor, TPacked>(degrees));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Invert.cs b/src/ImageSharp46/Filters/Invert.cs
deleted file mode 100644
index a948c511d..000000000
--- a/src/ImageSharp46/Filters/Invert.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="Invert.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Inverts the colors of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor, TPacked> Invert<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Invert(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Inverts the colors of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor, TPacked> Invert<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new InvertProcessor<TColor, TPacked>());
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Kodachrome.cs b/src/ImageSharp46/Filters/Kodachrome.cs
deleted file mode 100644
index f47bfa5c3..000000000
--- a/src/ImageSharp46/Filters/Kodachrome.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="Kodachrome.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the colors of the image recreating an old Kodachrome camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Kodachrome<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Kodachrome(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the colors of the image recreating an old Kodachrome camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Kodachrome<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new KodachromeProcessor<TColor, TPacked>());
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Lomograph.cs b/src/ImageSharp46/Filters/Lomograph.cs
deleted file mode 100644
index 84fccd374..000000000
--- a/src/ImageSharp46/Filters/Lomograph.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="Lomograph.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the colors of the image recreating an old Lomograph camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Lomograph<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Lomograph(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the colors of the image recreating an old Lomograph camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Lomograph<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new LomographProcessor<TColor, TPacked>());
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Options/ColorBlindness.cs b/src/ImageSharp46/Filters/Options/ColorBlindness.cs
deleted file mode 100644
index 1e0bc596b..000000000
--- a/src/ImageSharp46/Filters/Options/ColorBlindness.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// <copyright file="ColorBlindness.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerates the various types of defined color blindness filters.
-    /// </summary>
-    public enum ColorBlindness
-    {
-        /// <summary>
-        /// Partial color desensitivity.
-        /// </summary>
-        Achromatomaly,
-
-        /// <summary>
-        /// Complete color desensitivity (Monochrome)
-        /// </summary>
-        Achromatopsia,
-
-        /// <summary>
-        /// Green weak
-        /// </summary>
-        Deuteranomaly,
-
-        /// <summary>
-        /// Green blind
-        /// </summary>
-        Deuteranopia,
-
-        /// <summary>
-        /// Red weak
-        /// </summary>
-        Protanomaly,
-
-        /// <summary>
-        /// Red blind
-        /// </summary>
-        Protanopia,
-
-        /// <summary>
-        /// Blue weak
-        /// </summary>
-        Tritanomaly,
-
-        /// <summary>
-        /// Blue blind
-        /// </summary>
-        Tritanopia
-    }
-}
diff --git a/src/ImageSharp46/Filters/Options/EdgeDetection.cs b/src/ImageSharp46/Filters/Options/EdgeDetection.cs
deleted file mode 100644
index 67fad0de4..000000000
--- a/src/ImageSharp46/Filters/Options/EdgeDetection.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// <copyright file="EdgeDetection.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerates the various types of defined edge detection filters.
-    /// </summary>
-    public enum EdgeDetection
-    {
-        /// <summary>
-        /// The Kayyali operator filter.
-        /// </summary>
-        Kayyali,
-
-        /// <summary>
-        /// The Kirsch operator filter.
-        /// </summary>
-        Kirsch,
-
-        /// <summary>
-        /// The Lapacian3X3 operator filter.
-        /// </summary>
-        Lapacian3X3,
-
-        /// <summary>
-        /// The Lapacian5X5 operator filter.
-        /// </summary>
-        Lapacian5X5,
-
-        /// <summary>
-        /// The LaplacianOfGaussian operator filter.
-        /// </summary>
-        LaplacianOfGaussian,
-
-        /// <summary>
-        /// The Prewitt operator filter.
-        /// </summary>
-        Prewitt,
-
-        /// <summary>
-        /// The RobertsCross operator filter.
-        /// </summary>
-        RobertsCross,
-
-        /// <summary>
-        /// The Robinson operator filter.
-        /// </summary>
-        Robinson,
-
-        /// <summary>
-        /// The Scharr operator filter.
-        /// </summary>
-        Scharr,
-
-        /// <summary>
-        /// The Sobel operator filter.
-        /// </summary>
-        Sobel
-    }
-}
diff --git a/src/ImageSharp46/Filters/Options/GrayscaleMode.cs b/src/ImageSharp46/Filters/Options/GrayscaleMode.cs
deleted file mode 100644
index 6ecd5bb36..000000000
--- a/src/ImageSharp46/Filters/Options/GrayscaleMode.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="GrayscaleMode.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerates the various types of defined Grayscale filters.
-    /// </summary>
-    public enum GrayscaleMode
-    {
-        /// <summary>
-        /// ITU-R Recommendation BT.709
-        /// </summary>
-        Bt709,
-
-        /// <summary>
-        /// ITU-R Recommendation BT.601
-        /// </summary>
-        Bt601
-    }
-}
diff --git a/src/ImageSharp46/Filters/Polaroid.cs b/src/ImageSharp46/Filters/Polaroid.cs
deleted file mode 100644
index f77c95a4b..000000000
--- a/src/ImageSharp46/Filters/Polaroid.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="Polaroid.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the colors of the image recreating an old Polaroid camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Polaroid<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Polaroid(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the colors of the image recreating an old Polaroid camera effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Polaroid<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new PolaroidProcessor<TColor, TPacked>());
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/AlphaProcessor.cs b/src/ImageSharp46/Filters/Processors/AlphaProcessor.cs
deleted file mode 100644
index 08c05acdd..000000000
--- a/src/ImageSharp46/Filters/Processors/AlphaProcessor.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// <copyright file="AlphaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor, TPacked}"/> to change the alpha component of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class AlphaProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AlphaProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="percent">The percentage to adjust the opacity of the image. Must be between 0 and 100.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="percent"/> is less than 0 or is greater than 100.
-        /// </exception>
-        public AlphaProcessor(int percent)
-        {
-            Guard.MustBeBetweenOrEqualTo(percent, 0, 100, nameof(percent));
-            this.Value = percent;
-        }
-
-        /// <summary>
-        /// Gets the alpha value.
-        /// </summary>
-        public int Value { get; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float alpha = this.Value / 100F;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            Vector4 alphaVector = new Vector4(1, 1, 1, alpha);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        int offsetY = y - startY;
-                        for (int x = minX; x < maxX; x++)
-                        {
-                            int offsetX = x - startX;
-                            TColor packed = default(TColor);
-                            packed.PackFromVector4(sourcePixels[offsetX, offsetY].ToVector4() * alphaVector);
-                            sourcePixels[offsetX, offsetY] = packed;
-                        }
-                    });
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/BackgroundColorProcessor.cs b/src/ImageSharp46/Filters/Processors/BackgroundColorProcessor.cs
deleted file mode 100644
index 37dd580fa..000000000
--- a/src/ImageSharp46/Filters/Processors/BackgroundColorProcessor.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// <copyright file="BackgroundColorProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Sets the background color of the image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BackgroundColorProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001f;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BackgroundColorProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="color">The <typeparamref name="TColor"/> to set the background color to.</param>
-        public BackgroundColorProcessor(TColor color)
-        {
-            this.Value = color;
-        }
-
-        /// <summary>
-        /// Gets the background color value.
-        /// </summary>
-        public TColor Value { get; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            Vector4 backgroundColor = this.Value.ToVector4();
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        int offsetY = y - startY;
-                        for (int x = minX; x < maxX; x++)
-                        {
-                            int offsetX = x - startX;
-                            Vector4 color = sourcePixels[offsetX, offsetY].ToVector4();
-                            float a = color.W;
-
-                            if (a < 1 && a > 0)
-                            {
-                                color = Vector4.Lerp(color, backgroundColor, .5F);
-                            }
-
-                            if (Math.Abs(a) < Epsilon)
-                            {
-                                color = backgroundColor;
-                            }
-
-                            TColor packed = default(TColor);
-                            packed.PackFromVector4(color);
-                            sourcePixels[offsetX, offsetY] = packed;
-                        }
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/Binarization/BinaryThresholdProcessor.cs b/src/ImageSharp46/Filters/Processors/Binarization/BinaryThresholdProcessor.cs
deleted file mode 100644
index 09c6a96f3..000000000
--- a/src/ImageSharp46/Filters/Processors/Binarization/BinaryThresholdProcessor.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// <copyright file="BinaryThresholdProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> to perform binary threshold filtering against an
-    /// <see cref="Image"/>. The image will be converted to grayscale before thresholding occurs.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BinaryThresholdProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BinaryThresholdProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="threshold">The threshold to split the image. Must be between 0 and 1.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="threshold"/> is less than 0 or is greater than 1.
-        /// </exception>
-        public BinaryThresholdProcessor(float threshold)
-        {
-            // TODO: Check limit.
-            Guard.MustBeBetweenOrEqualTo(threshold, 0, 1, nameof(threshold));
-            this.Value = threshold;
-
-            TColor upper = default(TColor);
-            upper.PackFromVector4(Color.White.ToVector4());
-            this.UpperColor = upper;
-
-            TColor lower = default(TColor);
-            lower.PackFromVector4(Color.Black.ToVector4());
-            this.LowerColor = lower;
-        }
-
-        /// <summary>
-        /// Gets the threshold value.
-        /// </summary>
-        public float Value { get; }
-
-        /// <summary>
-        /// Gets or sets the color to use for pixels that are above the threshold.
-        /// </summary>
-        public TColor UpperColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the color to use for pixels that fall below the threshold.
-        /// </summary>
-        public TColor LowerColor { get; set; }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-            new GrayscaleBt709Processor<TColor, TPacked>().Apply(source, sourceRectangle);
-        }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float threshold = this.Value;
-            TColor upper = this.UpperColor;
-            TColor lower = this.LowerColor;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        int offsetY = y - startY;
-                        for (int x = minX; x < maxX; x++)
-                        {
-                            int offsetX = x - startX;
-                            TColor color = sourcePixels[offsetX, offsetY];
-
-                            // Any channel will do since it's Grayscale.
-                            sourcePixels[offsetX, offsetY] = color.ToVector4().X >= threshold ? upper : lower;
-                        }
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/BlendProcessor.cs b/src/ImageSharp46/Filters/Processors/BlendProcessor.cs
deleted file mode 100644
index 4f326361f..000000000
--- a/src/ImageSharp46/Filters/Processors/BlendProcessor.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// <copyright file="BlendProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Combines two images together by blending the pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BlendProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The image to blend.
-        /// </summary>
-        private readonly ImageBase<TColor, TPacked> blend;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlendProcessor{T,TP}"/> class.
-        /// </summary>
-        /// <param name="image">
-        /// The image to blend with the currently processing image.
-        /// Disposal of this image is the responsibility of the developer.
-        /// </param>
-        /// <param name="alpha">The opacity of the image to blend. Between 0 and 100.</param>
-        public BlendProcessor(ImageBase<TColor, TPacked> image, int alpha = 100)
-        {
-            Guard.MustBeBetweenOrEqualTo(alpha, 0, 100, nameof(alpha));
-            this.blend = image;
-            this.Value = alpha;
-        }
-
-        /// <summary>
-        /// Gets the alpha percentage value.
-        /// </summary>
-        public int Value { get; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            Rectangle bounds = this.blend.Bounds;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            float alpha = this.Value / 100F;
-
-            using (PixelAccessor<TColor, TPacked> toBlendPixels = this.blend.Lock())
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-                                Vector4 color = sourcePixels[offsetX, offsetY].ToVector4();
-
-                                if (bounds.Contains(offsetX, offsetY))
-                                {
-                                    Vector4 blendedColor = toBlendPixels[offsetX, offsetY].ToVector4();
-
-                                    if (blendedColor.W > 0)
-                                    {
-                                        // Lerping colors is dependent on the alpha of the blended color
-                                        color = Vector4.Lerp(color, blendedColor, alpha > 0 ? alpha : blendedColor.W);
-                                    }
-                                }
-
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(color);
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp46/Filters/Processors/BrightnessProcessor.cs
deleted file mode 100644
index b74759b6b..000000000
--- a/src/ImageSharp46/Filters/Processors/BrightnessProcessor.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <copyright file="BrightnessProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> to change the brightness of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BrightnessProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BrightnessProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="brightness">The new brightness of the image. Must be between -100 and 100.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="brightness"/> is less than -100 or is greater than 100.
-        /// </exception>
-        public BrightnessProcessor(int brightness)
-        {
-            Guard.MustBeBetweenOrEqualTo(brightness, -100, 100, nameof(brightness));
-            this.Value = brightness;
-        }
-
-        /// <summary>
-        /// Gets the brightness value.
-        /// </summary>
-        public int Value { get; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float brightness = this.Value / 100F;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-
-                                // TODO: Check this with other formats.
-                                Vector4 vector = sourcePixels[offsetX, offsetY].ToVector4().Expand();
-                                Vector3 transformed = new Vector3(vector.X, vector.Y, vector.Z) + new Vector3(brightness);
-                                vector = new Vector4(transformed, vector.W);
-
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(vector.Compress());
-
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs
deleted file mode 100644
index cbb351aaf..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/BlackWhiteProcessor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="BlackWhiteProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image to their black and white equivalent.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BlackWhiteProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 1.5f,
-            M12 = 1.5f,
-            M13 = 1.5f,
-            M21 = 1.5f,
-            M22 = 1.5f,
-            M23 = 1.5f,
-            M31 = 1.5f,
-            M32 = 1.5f,
-            M33 = 1.5f,
-            M41 = -1f,
-            M42 = -1f,
-            M43 = -1f,
-        };
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs
deleted file mode 100644
index 012954c2f..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="AchromatomalyProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Achromatomaly (Color desensitivity) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class AchromatomalyProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = .618f,
-            M12 = .163f,
-            M13 = .163f,
-            M21 = .320f,
-            M22 = .775f,
-            M23 = .320f,
-            M31 = .062f,
-            M32 = .062f,
-            M33 = .516f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs
deleted file mode 100644
index 6ce50ba43..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="AchromatopsiaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Achromatopsia (Monochrome) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class AchromatopsiaProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = .299f,
-            M12 = .299f,
-            M13 = .299f,
-            M21 = .587f,
-            M22 = .587f,
-            M23 = .587f,
-            M31 = .114f,
-            M32 = .114f,
-            M33 = .114f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs
deleted file mode 100644
index e1fbac60a..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="DeuteranomalyProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Deuteranomaly (Green-Weak) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class DeuteranomalyProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.8f,
-            M12 = 0.258f,
-            M21 = 0.2f,
-            M22 = 0.742f,
-            M23 = 0.142f,
-            M33 = 0.858f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs
deleted file mode 100644
index 35e76b235..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="DeuteranopiaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Deuteranopia (Green-Blind) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class DeuteranopiaProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.625f,
-            M12 = 0.7f,
-            M21 = 0.375f,
-            M22 = 0.3f,
-            M23 = 0.3f,
-            M33 = 0.7f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs
deleted file mode 100644
index 38199b956..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="ProtanomalyProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Protanopia (Red-Weak) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class ProtanomalyProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.817f,
-            M12 = 0.333f,
-            M21 = 0.183f,
-            M22 = 0.667f,
-            M23 = 0.125f,
-            M33 = 0.875f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs
deleted file mode 100644
index 19936a849..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="ProtanopiaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Protanopia (Red-Blind) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class ProtanopiaProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.567f,
-            M12 = 0.558f,
-            M21 = 0.433f,
-            M22 = 0.442f,
-            M23 = 0.242f,
-            M33 = 0.758f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/README.md b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/README.md
deleted file mode 100644
index 209f3b67b..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Color blindness matrices adapted from and tested against:
-
-http://web.archive.org/web/20090413045433/http://nofunc.org/Color_Matrix_Library
-http://www.color-blindness.com/coblis-color-blindness-simulator/
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs
deleted file mode 100644
index 84d22c78a..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="TritanomalyProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Tritanomaly (Blue-Weak) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class TritanomalyProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.967f,
-            M21 = 0.33f,
-            M22 = 0.733f,
-            M23 = 0.183f,
-            M32 = 0.267f,
-            M33 = 0.817f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs
deleted file mode 100644
index 82d7415b7..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="TritanopiaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating Tritanopia (Blue-Blind) color blindness.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class TritanopiaProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.95f,
-            M21 = 0.05f,
-            M22 = 0.433f,
-            M23 = 0.475f,
-            M32 = 0.567f,
-            M33 = 0.525f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs
deleted file mode 100644
index be6f277e0..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/ColorMatrixFilter.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// <copyright file="ColorMatrixFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// The color matrix filter. Inherit from this class to perform operation involving color matrices.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class ColorMatrixFilter<TColor, TPacked> : ImageFilter<TColor, TPacked>, IColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public abstract Matrix4x4 Matrix { get; }
-
-        /// <inheritdoc/>
-        public override bool Compand { get; set; } = true;
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            Matrix4x4 matrix = this.Matrix;
-            bool compand = this.Compand;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-                                sourcePixels[offsetX, offsetY] = this.ApplyMatrix(sourcePixels[offsetX, offsetY], matrix, compand);
-                            }
-                        });
-            }
-        }
-
-        /// <summary>
-        /// Applies the color matrix against the given color.
-        /// </summary>
-        /// <param name="color">The source color.</param>
-        /// <param name="matrix">The matrix.</param>
-        /// <param name="compand">Whether to compand the color during processing.</param>
-        /// <returns>
-        /// The <see cref="Color"/>.
-        /// </returns>
-        private TColor ApplyMatrix(TColor color, Matrix4x4 matrix, bool compand)
-        {
-            Vector4 vector = color.ToVector4();
-
-            if (compand)
-            {
-                vector = vector.Expand();
-            }
-
-            Vector3 transformed = Vector3.Transform(new Vector3(vector.X, vector.Y, vector.Z), matrix);
-            vector = new Vector4(transformed, vector.W);
-            TColor packed = default(TColor);
-            packed.PackFromVector4(compand ? vector.Compress() : vector);
-            return packed;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs
deleted file mode 100644
index d6c1762e8..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt601Processor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="GrayscaleBt601Processor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image to Grayscale applying the formula as specified by
-    /// ITU-R Recommendation BT.601 <see href="https://en.wikipedia.org/wiki/Luma_%28video%29#Rec._601_luma_versus_Rec._709_luma_coefficients"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class GrayscaleBt601Processor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = .299f,
-            M12 = .299f,
-            M13 = .299f,
-            M21 = .587f,
-            M22 = .587f,
-            M23 = .587f,
-            M31 = .114f,
-            M32 = .114f,
-            M33 = .114f
-        };
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs
deleted file mode 100644
index 6fbde6418..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/GrayscaleBt709Processor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// <copyright file="GrayscaleBt709Processor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image to Grayscale applying the formula as specified by
-    /// ITU-R Recommendation BT.709 <see href="https://en.wikipedia.org/wiki/Rec._709#Luma_coefficients"/>.
-    /// </summary>
-    public class GrayscaleBt709Processor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = .2126f,
-            M12 = .2126f,
-            M13 = .2126f,
-            M21 = .7152f,
-            M22 = .7152f,
-            M23 = .7152f,
-            M31 = .0722f,
-            M32 = .0722f,
-            M33 = .0722f
-        };
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/HueProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/HueProcessor.cs
deleted file mode 100644
index a829331c9..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/HueProcessor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// <copyright file="HueProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-
-    /// <summary>
-    /// An <see cref="ImageProcessor{TColor, TPacked}"/> to change the hue of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class HueProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HueProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="angle">The new brightness of the image. Must be between -100 and 100.</param>
-        public HueProcessor(float angle)
-        {
-            // Wrap the angle round at 360.
-            angle = angle % 360;
-
-            // Make sure it's not negative.
-            while (angle < 0)
-            {
-                angle += 360;
-            }
-
-            this.Angle = angle;
-
-            float radians = ImageMaths.DegreesToRadians(angle);
-            double cosradians = Math.Cos(radians);
-            double sinradians = Math.Sin(radians);
-
-            float lumR = .213f;
-            float lumG = .715f;
-            float lumB = .072f;
-
-            float oneMinusLumR = 1 - lumR;
-            float oneMinusLumG = 1 - lumG;
-            float oneMinusLumB = 1 - lumB;
-
-            // The matrix is set up to preserve the luminance of the image.
-            // See http://graficaobscura.com/matrix/index.html
-            // Number are taken from https://msdn.microsoft.com/en-us/library/jj192162(v=vs.85).aspx
-            Matrix4x4 matrix4X4 = new Matrix4x4()
-            {
-                M11 = (float)(lumR + (cosradians * oneMinusLumR) - (sinradians * lumR)),
-                M12 = (float)(lumR - (cosradians * lumR) - (sinradians * 0.143)),
-                M13 = (float)(lumR - (cosradians * lumR) - (sinradians * oneMinusLumR)),
-                M21 = (float)(lumG - (cosradians * lumG) - (sinradians * lumG)),
-                M22 = (float)(lumG + (cosradians * oneMinusLumG) + (sinradians * 0.140)),
-                M23 = (float)(lumG - (cosradians * lumG) + (sinradians * lumG)),
-                M31 = (float)(lumB - (cosradians * lumB) + (sinradians * oneMinusLumB)),
-                M32 = (float)(lumB - (cosradians * lumB) - (sinradians * 0.283)),
-                M33 = (float)(lumB + (cosradians * oneMinusLumB) + (sinradians * lumB))
-            };
-
-            this.Matrix = matrix4X4;
-        }
-
-        /// <summary>
-        /// Gets the rotation value.
-        /// </summary>
-        public float Angle { get; }
-
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix { get; }
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs
deleted file mode 100644
index ede66fd71..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/IColorMatrixFilter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// <copyright file="IColorMatrixFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Encapsulates properties and methods for creating processors that utilize a matrix to
-    /// alter the image pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IColorMatrixFilter<TColor, TPacked> : IImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Gets the <see cref="Matrix4x4"/> used to alter the image.
-        /// </summary>
-        Matrix4x4 Matrix { get; }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/KodachromeProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/KodachromeProcessor.cs
deleted file mode 100644
index a4f58cc41..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/KodachromeProcessor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// <copyright file="KodachromeProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating an old Kodachrome camera effect.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class KodachromeProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 0.6997023f,
-            M22 = 0.4609577f,
-            M33 = 0.397218f,
-            M41 = 0.005f,
-            M42 = -0.005f,
-            M43 = 0.005f
-        };
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/LomographProcessor.cs
deleted file mode 100644
index 628c13087..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/LomographProcessor.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <copyright file="LomographProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating an old Lomograph effect.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class LomographProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 1.5f,
-            M22 = 1.45f,
-            M33 = 1.11f,
-            M41 = -.1f,
-            M42 = .0f,
-            M43 = -.08f
-        };
-
-        /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-            TColor packed = default(TColor);
-            packed.PackFromVector4(new Color(0, 10, 0).ToVector4()); // Very dark (mostly black) lime green.
-            new VignetteProcessor<TColor, TPacked> { VignetteColor = packed }.Apply(source, sourceRectangle);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/PolaroidProcessor.cs
deleted file mode 100644
index 72fc0a98d..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/PolaroidProcessor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="PolaroidProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image recreating an old Polaroid effect.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class PolaroidProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = 1.538f,
-            M12 = -0.062f,
-            M13 = -0.262f,
-            M21 = -0.022f,
-            M22 = 1.578f,
-            M23 = -0.022f,
-            M31 = .216f,
-            M32 = -.16f,
-            M33 = 1.5831f,
-            M41 = 0.02f,
-            M42 = -0.05f,
-            M43 = -0.05f
-        };
-
-        /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-            TColor packedV = default(TColor);
-            packedV.PackFromVector4(new Color(102, 34, 0).ToVector4()); // Very dark orange [Brown tone]
-            new VignetteProcessor<TColor, TPacked> { VignetteColor = packedV }.Apply(source, sourceRectangle);
-
-            TColor packedG = default(TColor);
-            packedG.PackFromVector4(new Color(255, 153, 102, 178).ToVector4()); // Light orange
-            new GlowProcessor<TColor, TPacked> { GlowColor = packedG, Radius = source.Width / 4F }.Apply(source, sourceRectangle);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/SaturationProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/SaturationProcessor.cs
deleted file mode 100644
index 60f7c7815..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/SaturationProcessor.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// <copyright file="SaturationProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// An <see cref="ImageProcessor{TColor, TPacked}"/> to change the saturation of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class SaturationProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SaturationProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="saturation">The new saturation of the image. Must be between -100 and 100.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="saturation"/> is less than -100 or is greater than 100.
-        /// </exception>
-        public SaturationProcessor(int saturation)
-        {
-            Guard.MustBeBetweenOrEqualTo(saturation, -100, 100, nameof(saturation));
-            float saturationFactor = saturation / 100f;
-
-            // Stop at -1 to prevent inversion.
-            saturationFactor++;
-
-            // The matrix is set up to "shear" the colour space using the following set of values.
-            // Note that each colour component has an effective luminance which contributes to the
-            // overall brightness of the pixel.
-            // See http://graficaobscura.com/matrix/index.html
-            float saturationComplement = 1.0f - saturationFactor;
-            float saturationComplementR = 0.3086f * saturationComplement;
-            float saturationComplementG = 0.6094f * saturationComplement;
-            float saturationComplementB = 0.0820f * saturationComplement;
-
-            Matrix4x4 matrix4X4 = new Matrix4x4()
-            {
-                M11 = saturationComplementR + saturationFactor,
-                M12 = saturationComplementR,
-                M13 = saturationComplementR,
-                M21 = saturationComplementG,
-                M22 = saturationComplementG + saturationFactor,
-                M23 = saturationComplementG,
-                M31 = saturationComplementB,
-                M32 = saturationComplementB,
-                M33 = saturationComplementB + saturationFactor,
-            };
-
-            this.Matrix = matrix4X4;
-        }
-
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix { get; }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ColorMatrix/SepiaProcessor.cs b/src/ImageSharp46/Filters/Processors/ColorMatrix/SepiaProcessor.cs
deleted file mode 100644
index 80be3bf4c..000000000
--- a/src/ImageSharp46/Filters/Processors/ColorMatrix/SepiaProcessor.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <copyright file="SepiaProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Converts the colors of the image to their sepia equivalent.
-    /// The formula used matches the svg specification. <see href="http://www.w3.org/TR/filter-effects/#sepiaEquivalent"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class SepiaProcessor<TColor, TPacked> : ColorMatrixFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override Matrix4x4 Matrix => new Matrix4x4()
-        {
-            M11 = .393f,
-            M12 = .349f,
-            M13 = .272f,
-            M21 = .769f,
-            M22 = .686f,
-            M23 = .534f,
-            M31 = .189f,
-            M32 = .168f,
-            M33 = .131f
-        };
-
-        /// <inheritdoc/>
-        public override bool Compand => false;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp46/Filters/Processors/ContrastProcessor.cs
deleted file mode 100644
index fbcaaa1cd..000000000
--- a/src/ImageSharp46/Filters/Processors/ContrastProcessor.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <copyright file="ContrastProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> to change the contrast of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-    public class ContrastProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContrastProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="contrast">The new contrast of the image. Must be between -100 and 100.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="contrast"/> is less than -100 or is greater than 100.
-        /// </exception>
-        public ContrastProcessor(int contrast)
-        {
-            Guard.MustBeBetweenOrEqualTo(contrast, -100, 100, nameof(contrast));
-            this.Value = contrast;
-        }
-
-        /// <summary>
-        /// Gets the contrast value.
-        /// </summary>
-        public int Value { get; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float contrast = (100F + this.Value) / 100F;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            Vector4 contrastVector = new Vector4(contrast, contrast, contrast, 1);
-            Vector4 shiftVector = new Vector4(.5F, .5F, .5F, 1);
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-
-                                Vector4 vector = sourcePixels[offsetX, offsetY].ToVector4().Expand();
-                                vector -= shiftVector;
-                                vector *= contrastVector;
-                                vector += shiftVector;
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(vector.Compress());
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/GlowProcessor.cs b/src/ImageSharp46/Filters/Processors/GlowProcessor.cs
deleted file mode 100644
index d671d1d6f..000000000
--- a/src/ImageSharp46/Filters/Processors/GlowProcessor.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// <copyright file="GlowProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> that applies a radial glow effect an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class GlowProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GlowProcessor{T,TP}"/> class.
-        /// </summary>
-        public GlowProcessor()
-        {
-            TColor color = default(TColor);
-            color.PackFromVector4(Color.Black.ToVector4());
-            this.GlowColor = color;
-        }
-
-        /// <summary>
-        /// Gets or sets the glow color to apply.
-        /// </summary>
-        public TColor GlowColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the the radius.
-        /// </summary>
-        public float Radius { get; set; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            TColor glowColor = this.GlowColor;
-            Vector2 centre = Rectangle.Center(sourceRectangle).ToVector2();
-            float maxDistance = this.Radius > 0 ? Math.Min(this.Radius, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
-            Ellipse ellipse = new Ellipse(new Point(centre), maxDistance, maxDistance);
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-                                if (ellipse.Contains(offsetX, offsetY))
-                                {
-                                    // TODO: Premultiply?
-                                    float distance = Vector2.Distance(centre, new Vector2(offsetX, offsetY));
-                                    Vector4 sourceColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                    TColor packed = default(TColor);
-                                    packed.PackFromVector4(Vector4.Lerp(glowColor.ToVector4(), sourceColor, distance / maxDistance));
-                                    sourcePixels[offsetX, offsetY] = packed;
-                                }
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/IImageFilter.cs b/src/ImageSharp46/Filters/Processors/IImageFilter.cs
deleted file mode 100644
index fc0a7625b..000000000
--- a/src/ImageSharp46/Filters/Processors/IImageFilter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="IImageFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Encapsulates methods to alter the pixels of an image. The processor operates on the original source pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IImageFilter<TColor, TPacked> : IImageProcessor
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{T, TP}"/>.
-        /// </summary>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <remarks>
-        /// The method keeps the source image unchanged and returns the
-        /// the result of image processing filter as new image.
-        /// </remarks>
-        /// <exception cref="System.ArgumentNullException">
-        /// <paramref name="source"/> is null.
-        /// </exception>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="sourceRectangle"/> doesnt fit the dimension of the image.
-        /// </exception>
-        void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle);
-    }
-}
diff --git a/src/ImageSharp46/Filters/Processors/ImageFilter.cs b/src/ImageSharp46/Filters/Processors/ImageFilter.cs
deleted file mode 100644
index 34bfdb1fb..000000000
--- a/src/ImageSharp46/Filters/Processors/ImageFilter.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// <copyright file="ImageFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-
-    /// <summary>
-    /// Encapsulates methods to alter the pixels of an image. The processor operates on the original source pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class ImageFilter<TColor, TPacked> : ImageProcessor<TColor, TPacked>, IImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-            try
-            {
-                this.OnApply(source, sourceRectangle);
-
-                this.Apply(source, sourceRectangle, sourceRectangle.Y, sourceRectangle.Bottom);
-
-                this.AfterApply(source, sourceRectangle);
-            }
-            catch (Exception ex)
-            {
-                throw new ImageProcessingException($"An error occured when processing the image using {this.GetType().Name}. See the inner exception for more detail.", ex);
-            }
-        }
-
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor, TPacked}"/> at the specified location
-        /// and with the specified size.
-        /// </summary>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="startY">The index of the row within the source image to start processing.</param>
-        /// <param name="endY">The index of the row within the source image to end processing.</param>
-        protected abstract void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY);
-
-        /// <summary>
-        /// This method is called before the process is applied to prepare the processor.
-        /// </summary>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        protected virtual void OnApply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-        }
-
-        /// <summary>
-        /// This method is called after the process is applied to prepare the processor.
-        /// </summary>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        protected virtual void AfterApply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/InvertProcessor.cs b/src/ImageSharp46/Filters/Processors/InvertProcessor.cs
deleted file mode 100644
index d010eaf36..000000000
--- a/src/ImageSharp46/Filters/Processors/InvertProcessor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// <copyright file="InvertProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> to invert the colors of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class InvertProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            Vector3 inverseVector = Vector3.One;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-                                Vector4 color = sourcePixels[offsetX, offsetY].ToVector4();
-                                Vector3 vector = inverseVector - new Vector3(color.X, color.Y, color.Z);
-
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(new Vector4(vector, color.W));
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Processors/VignetteProcessor.cs b/src/ImageSharp46/Filters/Processors/VignetteProcessor.cs
deleted file mode 100644
index b60e49647..000000000
--- a/src/ImageSharp46/Filters/Processors/VignetteProcessor.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// <copyright file="VignetteProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageFilter{TColor,TPacked}"/> that applies a radial vignette effect to an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class VignetteProcessor<TColor, TPacked> : ImageFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VignetteProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        public VignetteProcessor()
-        {
-            TColor color = default(TColor);
-            color.PackFromVector4(Color.Black.ToVector4());
-            this.VignetteColor = color;
-        }
-
-        /// <summary>
-        /// Gets or sets the vignette color to apply.
-        /// </summary>
-        public TColor VignetteColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the the x-radius.
-        /// </summary>
-        public float RadiusX { get; set; }
-
-        /// <summary>
-        /// Gets or sets the the y-radius.
-        /// </summary>
-        public float RadiusY { get; set; }
-
-        /// <inheritdoc/>
-        protected override void Apply(ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            TColor vignetteColor = this.VignetteColor;
-            Vector2 centre = Rectangle.Center(sourceRectangle).ToVector2();
-            float rX = this.RadiusX > 0 ? Math.Min(this.RadiusX, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
-            float rY = this.RadiusY > 0 ? Math.Min(this.RadiusY, sourceRectangle.Height * .5F) : sourceRectangle.Height * .5F;
-            float maxDistance = (float)Math.Sqrt((rX * rX) + (rY * rY));
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - startX;
-                                float distance = Vector2.Distance(centre, new Vector2(offsetX, offsetY));
-                                Vector4 sourceColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(Vector4.Lerp(vignetteColor.ToVector4(), sourceColor, 1 - (.9F * (distance / maxDistance))));
-                                sourcePixels[offsetX, offsetY] = packed;
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Saturation.cs b/src/ImageSharp46/Filters/Saturation.cs
deleted file mode 100644
index 6fb0a463c..000000000
--- a/src/ImageSharp46/Filters/Saturation.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="Saturation.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the saturation component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new saturation of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Saturation<TColor, TPacked>(this Image<TColor, TPacked> source, int amount)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Saturation(source, amount, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the saturation component of the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="amount">The new saturation of the image. Must be between -100 and 100.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Saturation<TColor, TPacked>(this Image<TColor, TPacked> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new SaturationProcessor<TColor, TPacked>(amount));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Filters/Sepia.cs b/src/ImageSharp46/Filters/Sepia.cs
deleted file mode 100644
index 6bd070cc8..000000000
--- a/src/ImageSharp46/Filters/Sepia.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="Sepia.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies sepia toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor, TPacked> Sepia<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Sepia(source, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies sepia toning to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor, TPacked> Sepia<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new SepiaProcessor<TColor, TPacked>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Filters/Vignette.cs b/src/ImageSharp46/Filters/Vignette.cs
deleted file mode 100644
index b8f10b27a..000000000
--- a/src/ImageSharp46/Filters/Vignette.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// <copyright file="Vignette.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies a radial vignette effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Vignette<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Vignette(source, default(TColor), source.Bounds.Width * .5F, source.Bounds.Height * .5F, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial vignette effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color to set as the vignette.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Vignette<TColor, TPacked>(this Image<TColor, TPacked> source, TColor color)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Vignette(source, color, source.Bounds.Width * .5F, source.Bounds.Height * .5F, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial vignette effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="radiusX">The the x-radius.</param>
-        /// <param name="radiusY">The the y-radius.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Vignette<TColor, TPacked>(this Image<TColor, TPacked> source, float radiusX, float radiusY)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Vignette(source, default(TColor), radiusX, radiusY, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a radial vignette effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Vignette<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Vignette(source, default(TColor), 0, 0, rectangle);
-        }
-
-        /// <summary>
-        /// Applies a radial vignette effect to an image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color to set as the vignette.</param>
-        /// <param name="radiusX">The the x-radius.</param>
-        /// <param name="radiusY">The the y-radius.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Vignette<TColor, TPacked>(this Image<TColor, TPacked> source, TColor color, float radiusX, float radiusY, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            VignetteProcessor<TColor, TPacked> processor = new VignetteProcessor<TColor, TPacked> { RadiusX = radiusX, RadiusY = radiusY };
-
-            if (!color.Equals(default(TColor)))
-            {
-                processor.VignetteColor = color;
-            }
-
-            return source.Process(rectangle, processor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Bmp/BmpBitsPerPixel.cs b/src/ImageSharp46/Formats/Bmp/BmpBitsPerPixel.cs
deleted file mode 100644
index 330326acf..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpBitsPerPixel.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="BmpBitsPerPixel.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Enumerates the available bits per pixel for bitmap.
-    /// </summary>
-    public enum BmpBitsPerPixel
-    {
-        /// <summary>
-        /// 24 bits per pixel. Each pixel consists of 3 bytes.
-        /// </summary>
-        Pixel24 = 3,
-
-        /// <summary>
-        /// 32 bits per pixel. Each pixel consists of 4 bytes.
-        /// </summary>
-        Pixel32 = 4,
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpCompression.cs b/src/ImageSharp46/Formats/Bmp/BmpCompression.cs
deleted file mode 100644
index a9246d449..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpCompression.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// <copyright file="BmpCompression.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Defines how the compression type of the image data
-    /// in the bitmap file.
-    /// </summary>
-    internal enum BmpCompression
-    {
-        /// <summary>
-        /// Each image row has a multiple of four elements. If the
-        /// row has less elements, zeros will be added at the right side.
-        /// The format depends on the number of bits, stored in the info header.
-        /// If the number of bits are one, four or eight each pixel data is
-        /// a index to the palette. If the number of bits are sixteen,
-        /// twenty-four or thirty-two each pixel contains a color.
-        /// </summary>
-        RGB = 0,
-
-        /// <summary>
-        /// Two bytes are one data record. If the first byte is not zero, the
-        /// next two half bytes will be repeated as much as the value of the first byte.
-        /// If the first byte is zero, the record has different meanings, depending
-        /// on the second byte. If the second byte is zero, it is the end of the row,
-        /// if it is one, it is the end of the image.
-        /// Not supported at the moment.
-        /// </summary>
-        RLE8 = 1,
-
-        /// <summary>
-        /// Two bytes are one data record. If the first byte is not zero, the
-        /// next byte will be repeated as much as the value of the first byte.
-        /// If the first byte is zero, the record has different meanings, depending
-        /// on the second byte. If the second byte is zero, it is the end of the row,
-        /// if it is one, it is the end of the image.
-        /// Not supported at the moment.
-        /// </summary>
-        RLE4 = 2,
-
-        /// <summary>
-        /// Each image row has a multiple of four elements. If the
-        /// row has less elements, zeros will be added at the right side.
-        /// Not supported at the moment.
-        /// </summary>
-        BitFields = 3,
-
-        /// <summary>
-        /// The bitmap contains a JPG image.
-        /// Not supported at the moment.
-        /// </summary>
-        JPEG = 4,
-
-        /// <summary>
-        /// The bitmap contains a PNG image.
-        /// Not supported at the moment.
-        /// </summary>
-        PNG = 5
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpDecoder.cs b/src/ImageSharp46/Formats/Bmp/BmpDecoder.cs
deleted file mode 100644
index b99a96462..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpDecoder.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// <copyright file="BmpDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Image decoder for generating an image out of a Windows bitmap stream.
-    /// </summary>
-    /// <remarks>
-    /// Does not support the following formats at the moment:
-    /// <list type="bullet">
-    ///    <item>JPG</item>
-    ///    <item>PNG</item>
-    ///    <item>RLE4</item>
-    ///    <item>RLE8</item>
-    ///    <item>BitFields</item>
-    /// </list>
-    /// Formats will be supported in a later releases. We advise always
-    /// to use only 24 Bit Windows bitmaps.
-    /// </remarks>
-    public class BmpDecoder : IImageDecoder
-    {
-        /// <summary>
-        /// Gets the size of the header for this image type.
-        /// </summary>
-        /// <value>The size of the header.</value>
-        public int HeaderSize => 2;
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="extension">The <see cref="string"/> containing the file extension.</param>
-        /// <returns>
-        /// True if the decoder supports the file extension; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, "extension");
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-
-            return extension.Equals("BMP", StringComparison.OrdinalIgnoreCase)
-                || extension.Equals("DIP", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="header">The <see cref="T:byte[]"/> containing the file header.</param>
-        /// <returns>
-        /// True if the decoder supports the file header; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileFormat(byte[] header)
-        {
-            bool isBmp = false;
-            if (header.Length >= 2)
-            {
-                isBmp = header[0] == 0x42 && // B
-                        header[1] == 0x4D;   // M
-            }
-
-            return isBmp;
-        }
-
-        /// <inheritdoc/>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-        {
-            Guard.NotNull(image, "image");
-            Guard.NotNull(stream, "stream");
-
-            new BmpDecoderCore().Decode(image, stream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp46/Formats/Bmp/BmpDecoderCore.cs
deleted file mode 100644
index 7c3e842aa..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpDecoderCore.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-// <copyright file="BmpDecoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Performs the bmp decoding operation.
-    /// </summary>
-    internal sealed class BmpDecoderCore
-    {
-        /// <summary>
-        /// The mask for the red part of the color for 16 bit rgb bitmaps.
-        /// </summary>
-        private const int Rgb16RMask = 0x00007C00;
-
-        /// <summary>
-        /// The mask for the green part of the color for 16 bit rgb bitmaps.
-        /// </summary>
-        private const int Rgb16GMask = 0x000003E0;
-
-        /// <summary>
-        /// The mask for the blue part of the color for 16 bit rgb bitmaps.
-        /// </summary>
-        private const int Rgb16BMask = 0x0000001F;
-
-        /// <summary>
-        /// The stream to decode from.
-        /// </summary>
-        private Stream currentStream;
-
-        /// <summary>
-        /// The file header containing general information.
-        /// TODO: Why is this not used? We advance the stream but do not use the values parsed.
-        /// </summary>
-        private BmpFileHeader fileHeader;
-
-        /// <summary>
-        /// The info header containing detailed information about the bitmap.
-        /// </summary>
-        private BmpInfoHeader infoHeader;
-
-        /// <summary>
-        /// Decodes the image from the specified this._stream and sets
-        /// the data to image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image, where the data should be set to.
-        /// Cannot be null (Nothing in Visual Basic).</param>
-        /// <param name="stream">The stream, where the image should be
-        /// decoded from. Cannot be null (Nothing in Visual Basic).</param>
-        /// <exception cref="System.ArgumentNullException">
-        ///    <para><paramref name="image"/> is null.</para>
-        ///    <para>- or -</para>
-        ///    <para><paramref name="stream"/> is null.</para>
-        /// </exception>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            this.currentStream = stream;
-
-            try
-            {
-                this.ReadFileHeader();
-                this.ReadInfoHeader();
-
-                // see http://www.drdobbs.com/architecture-and-design/the-bmp-file-format-part-1/184409517
-                // If the height is negative, then this is a Windows bitmap whose origin
-                // is the upper-left corner and not the lower-left.The inverted flag
-                // indicates a lower-left origin.Our code will be outputting an
-                // upper-left origin pixel array.
-                bool inverted = false;
-                if (this.infoHeader.Height < 0)
-                {
-                    inverted = true;
-                    this.infoHeader.Height = -this.infoHeader.Height;
-                }
-
-                int colorMapSize = -1;
-
-                if (this.infoHeader.ClrUsed == 0)
-                {
-                    if (this.infoHeader.BitsPerPixel == 1 ||
-                        this.infoHeader.BitsPerPixel == 4 ||
-                        this.infoHeader.BitsPerPixel == 8)
-                    {
-                        colorMapSize = (int)Math.Pow(2, this.infoHeader.BitsPerPixel) * 4;
-                    }
-                }
-                else
-                {
-                    colorMapSize = this.infoHeader.ClrUsed * 4;
-                }
-
-                byte[] palette = null;
-
-                if (colorMapSize > 0)
-                {
-                    // 256 * 4
-                    if (colorMapSize > 1024)
-                    {
-                        throw new ImageFormatException($"Invalid bmp colormap size '{colorMapSize}'");
-                    }
-
-                    palette = new byte[colorMapSize];
-
-                    this.currentStream.Read(palette, 0, colorMapSize);
-                }
-
-                if (this.infoHeader.Width > image.MaxWidth || this.infoHeader.Height > image.MaxHeight)
-                {
-                    throw new ArgumentOutOfRangeException(
-                        $"The input bitmap '{this.infoHeader.Width}x{this.infoHeader.Height}' is "
-                        + $"bigger then the max allowed size '{image.MaxWidth}x{image.MaxHeight}'");
-                }
-
-                image.InitPixels(this.infoHeader.Width, this.infoHeader.Height);
-
-                using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-                {
-                    switch (this.infoHeader.Compression)
-                    {
-                        case BmpCompression.RGB:
-                            if (this.infoHeader.HeaderSize != 40)
-                            {
-                                throw new ImageFormatException($"Header Size value '{this.infoHeader.HeaderSize}' is not valid.");
-                            }
-
-                            if (this.infoHeader.BitsPerPixel == 32)
-                            {
-                                this.ReadRgb32(pixels, this.infoHeader.Width, this.infoHeader.Height, inverted);
-                            }
-                            else if (this.infoHeader.BitsPerPixel == 24)
-                            {
-                                this.ReadRgb24(pixels, this.infoHeader.Width, this.infoHeader.Height, inverted);
-                            }
-                            else if (this.infoHeader.BitsPerPixel == 16)
-                            {
-                                this.ReadRgb16(pixels, this.infoHeader.Width, this.infoHeader.Height, inverted);
-                            }
-                            else if (this.infoHeader.BitsPerPixel <= 8)
-                            {
-                                this.ReadRgbPalette(pixels, palette, this.infoHeader.Width, this.infoHeader.Height, this.infoHeader.BitsPerPixel, inverted);
-                            }
-
-                            break;
-                        default:
-                            throw new NotSupportedException("Does not support this kind of bitmap files.");
-                    }
-                }
-            }
-            catch (IndexOutOfRangeException e)
-            {
-                throw new ImageFormatException("Bitmap does not have a valid format.", e);
-            }
-        }
-
-        /// <summary>
-        /// Returns the y- value based on the given height.
-        /// </summary>
-        /// <param name="y">The y- value representing the current row.</param>
-        /// <param name="height">The height of the bitmap.</param>
-        /// <param name="inverted">Whether the bitmap is inverted.</param>
-        /// <returns>The <see cref="int"/> representing the inverted value.</returns>
-        private static int Invert(int y, int height, bool inverted)
-        {
-            int row;
-
-            if (!inverted)
-            {
-                row = height - y - 1;
-            }
-            else
-            {
-                row = y;
-            }
-
-            return row;
-        }
-
-        /// <summary>
-        /// Calculates the amount of bytes to pad a row.
-        /// </summary>
-        /// <param name="width">The image width.</param>
-        /// <param name="componentCount">The pixel component count.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        private static int CalculatePadding(int width, int componentCount)
-        {
-            int padding = (width * componentCount) % 4;
-
-            if (padding != 0)
-            {
-                padding = 4 - padding;
-            }
-
-            return padding;
-        }
-
-        /// <summary>
-        /// Reads the color palette from the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor, TPacked}"/> to assign the palette to.</param>
-        /// <param name="colors">The <see cref="T:byte[]"/> containing the colors.</param>
-        /// <param name="width">The width of the bitmap.</param>
-        /// <param name="height">The height of the bitmap.</param>
-        /// <param name="bits">The number of bits per pixel.</param>
-        /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgbPalette<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels, byte[] colors, int width, int height, int bits, bool inverted)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Pixels per byte (bits per pixel)
-            int ppb = 8 / bits;
-
-            int arrayWidth = (width + ppb - 1) / ppb;
-
-            // Bit mask
-            int mask = 0xFF >> (8 - bits);
-
-            // Rows are aligned on 4 byte boundaries
-            int padding = arrayWidth % 4;
-            if (padding != 0)
-            {
-                padding = 4 - padding;
-            }
-
-            byte[] row = new byte[arrayWidth + padding];
-            TColor color = default(TColor);
-
-            for (int y = 0; y < height; y++)
-            {
-                int newY = Invert(y, height, inverted);
-
-                this.currentStream.Read(row, 0, row.Length);
-
-                int offset = 0;
-                for (int x = 0; x < arrayWidth; x++)
-                {
-                    int colOffset = x * ppb;
-
-                    for (int shift = 0; shift < ppb && (x + shift) < width; shift++)
-                    {
-                        int colorIndex = ((row[offset] >> (8 - bits - (shift * bits))) & mask) * 4;
-                        int newX = colOffset + shift;
-
-                        // Stored in b-> g-> r order.
-                        color.PackFromBytes(colors[colorIndex + 2], colors[colorIndex + 1], colors[colorIndex], 255);
-                        pixels[newX, newY] = color;
-                    }
-
-                    offset++;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads the 16 bit color palette from the stream
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor, TPacked}"/> to assign the palette to.</param>
-        /// <param name="width">The width of the bitmap.</param>
-        /// <param name="height">The height of the bitmap.</param>
-        /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb16<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // We divide here as we will store the colors in our floating point format.
-            const int ScaleR = 8; // 256/32
-            const int ScaleG = 4; // 256/64
-            const int ComponentCount = 2;
-
-            TColor color = default(TColor);
-            using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(width, ComponentOrder.XYZ))
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    row.Read(this.currentStream);
-
-                    int newY = Invert(y, height, inverted);
-
-                    int offset = 0;
-                    for (int x = 0; x < width; x++)
-                    {
-                        short temp = BitConverter.ToInt16(row.Bytes, offset);
-
-                        byte r = (byte)(((temp & Rgb16RMask) >> 11) * ScaleR);
-                        byte g = (byte)(((temp & Rgb16GMask) >> 5) * ScaleG);
-                        byte b = (byte)((temp & Rgb16BMask) * ScaleR);
-
-                        color.PackFromBytes(r, g, b, 255);
-                        pixels[x, newY] = color;
-                        offset += ComponentCount;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads the 24 bit color palette from the stream
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor, TPacked}"/> to assign the palette to.</param>
-        /// <param name="width">The width of the bitmap.</param>
-        /// <param name="height">The height of the bitmap.</param>
-        /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb24<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int padding = CalculatePadding(width, 3);
-            using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(width, ComponentOrder.ZYX, padding))
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    row.Read(this.currentStream);
-
-                    int newY = Invert(y, height, inverted);
-                    pixels.CopyFrom(row, newY);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads the 32 bit color palette from the stream
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor, TPacked}"/> to assign the palette to.</param>
-        /// <param name="width">The width of the bitmap.</param>
-        /// <param name="height">The height of the bitmap.</param>
-        /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb32<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int padding = CalculatePadding(width, 4);
-            using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(width, ComponentOrder.ZYXW, padding))
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    row.Read(this.currentStream);
-
-                    int newY = Invert(y, height, inverted);
-                    pixels.CopyFrom(row, newY);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads the <see cref="BmpInfoHeader"/> from the stream.
-        /// </summary>
-        private void ReadInfoHeader()
-        {
-            byte[] data = new byte[BmpInfoHeader.Size];
-
-            this.currentStream.Read(data, 0, BmpInfoHeader.Size);
-
-            this.infoHeader = new BmpInfoHeader
-            {
-                HeaderSize = BitConverter.ToInt32(data, 0),
-                Width = BitConverter.ToInt32(data, 4),
-                Height = BitConverter.ToInt32(data, 8),
-                Planes = BitConverter.ToInt16(data, 12),
-                BitsPerPixel = BitConverter.ToInt16(data, 14),
-                ImageSize = BitConverter.ToInt32(data, 20),
-                XPelsPerMeter = BitConverter.ToInt32(data, 24),
-                YPelsPerMeter = BitConverter.ToInt32(data, 28),
-                ClrUsed = BitConverter.ToInt32(data, 32),
-                ClrImportant = BitConverter.ToInt32(data, 36),
-                Compression = (BmpCompression)BitConverter.ToInt32(data, 16)
-            };
-        }
-
-        /// <summary>
-        /// Reads the <see cref="BmpFileHeader"/> from the stream.
-        /// </summary>
-        private void ReadFileHeader()
-        {
-            byte[] data = new byte[BmpFileHeader.Size];
-
-            this.currentStream.Read(data, 0, BmpFileHeader.Size);
-
-            this.fileHeader = new BmpFileHeader
-            {
-                Type = BitConverter.ToInt16(data, 0),
-                FileSize = BitConverter.ToInt32(data, 2),
-                Reserved = BitConverter.ToInt32(data, 6),
-                Offset = BitConverter.ToInt32(data, 10)
-            };
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpEncoder.cs b/src/ImageSharp46/Formats/Bmp/BmpEncoder.cs
deleted file mode 100644
index 7205840b7..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpEncoder.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// <copyright file="BmpEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Image encoder for writing an image to a stream as a Windows bitmap.
-    /// </summary>
-    /// <remarks>The encoder can currently only write 24-bit rgb images to streams.</remarks>
-    public class BmpEncoder : IImageEncoder
-    {
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        /// <remarks>Bitmap is a lossless format so this is not used in this encoder.</remarks>
-        public int Quality { get; set; }
-
-        /// <inheritdoc/>
-        public string MimeType => "image/bmp";
-
-        /// <inheritdoc/>
-        public string Extension => "bmp";
-
-        /// <summary>
-        /// Gets or sets the number of bits per pixel.
-        /// </summary>
-        public BmpBitsPerPixel BitsPerPixel { get; set; } = BmpBitsPerPixel.Pixel24;
-
-        /// <inheritdoc/>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, nameof(extension));
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-
-            return extension.Equals(this.Extension, StringComparison.OrdinalIgnoreCase)
-                || extension.Equals("dip", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <inheritdoc/>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            BmpEncoderCore encoder = new BmpEncoderCore();
-            encoder.Encode(image, stream, this.BitsPerPixel);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp46/Formats/Bmp/BmpEncoderCore.cs
deleted file mode 100644
index 7c3d18b93..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpEncoderCore.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// <copyright file="BmpEncoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System.IO;
-
-    using IO;
-
-    /// <summary>
-    /// Image encoder for writing an image to a stream as a Windows bitmap.
-    /// </summary>
-    internal sealed class BmpEncoderCore
-    {
-        /// <summary>
-        /// The number of bits per pixel.
-        /// </summary>
-        private BmpBitsPerPixel bmpBitsPerPixel;
-
-        /// <summary>
-        /// The amount to pad each row by.
-        /// </summary>
-        private int padding;
-
-        /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="ImageBase{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to encode from.</param>
-        /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        /// <param name="bitsPerPixel">The <see cref="BmpBitsPerPixel"/></param>
-        public void Encode<TColor, TPacked>(ImageBase<TColor, TPacked> image, Stream stream, BmpBitsPerPixel bitsPerPixel)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.NotNull(image, nameof(image));
-            Guard.NotNull(stream, nameof(stream));
-
-            this.bmpBitsPerPixel = bitsPerPixel;
-
-            // Cast to int will get the bytes per pixel
-            short bpp = (short)(8 * (int)bitsPerPixel);
-            int bytesPerLine = 4 * (((image.Width * bpp) + 31) / 32);
-            this.padding = bytesPerLine - (image.Width * (int)bitsPerPixel);
-
-            // Do not use IDisposable pattern here as we want to preserve the stream.
-            EndianBinaryWriter writer = new EndianBinaryWriter(EndianBitConverter.Little, stream);
-
-            BmpInfoHeader infoHeader = new BmpInfoHeader
-            {
-                HeaderSize = BmpInfoHeader.Size,
-                Height = image.Height,
-                Width = image.Width,
-                BitsPerPixel = bpp,
-                Planes = 1,
-                ImageSize = image.Height * bytesPerLine,
-                ClrUsed = 0,
-                ClrImportant = 0
-            };
-
-            BmpFileHeader fileHeader = new BmpFileHeader
-            {
-                Type = 19778, // BM
-                Offset = 54,
-                FileSize = 54 + infoHeader.ImageSize
-            };
-
-            WriteHeader(writer, fileHeader);
-            this.WriteInfo(writer, infoHeader);
-            this.WriteImage(writer, image);
-
-            writer.Flush();
-        }
-
-        /// <summary>
-        /// Writes the bitmap header data to the binary stream.
-        /// </summary>
-        /// <param name="writer">
-        /// The <see cref="EndianBinaryWriter"/> containing the stream to write to.
-        /// </param>
-        /// <param name="fileHeader">
-        /// The <see cref="BmpFileHeader"/> containing the header data.
-        /// </param>
-        private static void WriteHeader(EndianBinaryWriter writer, BmpFileHeader fileHeader)
-        {
-            writer.Write(fileHeader.Type);
-            writer.Write(fileHeader.FileSize);
-            writer.Write(fileHeader.Reserved);
-            writer.Write(fileHeader.Offset);
-        }
-
-        /// <summary>
-        /// Writes the bitmap information to the binary stream.
-        /// </summary>
-        /// <param name="writer">
-        /// The <see cref="EndianBinaryWriter"/> containing the stream to write to.
-        /// </param>
-        /// <param name="infoHeader">
-        /// The <see cref="BmpFileHeader"/> containing the detailed information about the image.
-        /// </param>
-        private void WriteInfo(EndianBinaryWriter writer, BmpInfoHeader infoHeader)
-        {
-            writer.Write(infoHeader.HeaderSize);
-            writer.Write(infoHeader.Width);
-            writer.Write(infoHeader.Height);
-            writer.Write(infoHeader.Planes);
-            writer.Write(infoHeader.BitsPerPixel);
-            writer.Write((int)infoHeader.Compression);
-            writer.Write(infoHeader.ImageSize);
-            writer.Write(infoHeader.XPelsPerMeter);
-            writer.Write(infoHeader.YPelsPerMeter);
-            writer.Write(infoHeader.ClrUsed);
-            writer.Write(infoHeader.ClrImportant);
-        }
-
-        /// <summary>
-        /// Writes the pixel data to the binary stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
-        /// <param name="image">
-        /// The <see cref="ImageBase{TColor, TPacked}"/> containing pixel data.
-        /// </param>
-        private void WriteImage<TColor, TPacked>(EndianBinaryWriter writer, ImageBase<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                switch (this.bmpBitsPerPixel)
-                {
-                    case BmpBitsPerPixel.Pixel32:
-                        this.Write32Bit<TColor, TPacked>(writer, pixels);
-                        break;
-
-                    case BmpBitsPerPixel.Pixel24:
-                        this.Write24Bit<TColor, TPacked>(writer, pixels);
-                        break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the 32bit color palette to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor,TPacked}"/> containing pixel data.</param>
-        private void Write32Bit<TColor, TPacked>(EndianBinaryWriter writer, PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(pixels.Width, ComponentOrder.ZYXW, this.padding))
-            {
-                for (int y = pixels.Height - 1; y >= 0; y--)
-                {
-                    pixels.CopyTo(row, y);
-                    writer.Write(row.Bytes);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the 24bit color palette to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor,TPacked}"/> containing pixel data.</param>
-        private void Write24Bit<TColor, TPacked>(EndianBinaryWriter writer, PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(pixels.Width, ComponentOrder.ZYX, this.padding))
-            {
-                for (int y = pixels.Height - 1; y >= 0; y--)
-                {
-                    pixels.CopyTo(row, y);
-                    writer.Write(row.Bytes);
-                }
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpFileHeader.cs b/src/ImageSharp46/Formats/Bmp/BmpFileHeader.cs
deleted file mode 100644
index 4be602f4b..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpFileHeader.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <copyright file="BmpFileHeader.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Stores general information about the Bitmap file.
-    /// <see href="https://en.wikipedia.org/wiki/BMP_file_format" />
-    /// </summary>
-    /// <remarks>
-    /// The first two bytes of the Bitmap file format
-    /// (thus the Bitmap header) are stored in big-endian order.
-    /// All of the other integer values are stored in little-endian format
-    /// (i.e. least-significant byte first).
-    /// </remarks>
-    internal class BmpFileHeader
-    {
-        /// <summary>
-        /// Defines of the data structure in the bitmap file.
-        /// </summary>
-        public const int Size = 14;
-
-        /// <summary>
-        /// Gets or sets the Bitmap identifier.
-        /// The field used to identify the bitmap file: 0x42 0x4D
-        /// (Hex code points for B and M)
-        /// </summary>
-        public short Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the size of the bitmap file in bytes.
-        /// </summary>
-        public int FileSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets any reserved data; actual value depends on the application
-        /// that creates the image.
-        /// </summary>
-        public int Reserved { get; set; }
-
-        /// <summary>
-        /// Gets or sets the offset, i.e. starting address, of the byte where
-        /// the bitmap data can be found.
-        /// </summary>
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpFormat.cs b/src/ImageSharp46/Formats/Bmp/BmpFormat.cs
deleted file mode 100644
index b01f3ab32..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpFormat.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// <copyright file="BmpFormat.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Encapsulates the means to encode and decode bitmap images.
-    /// </summary>
-    public class BmpFormat : IImageFormat
-    {
-        /// <inheritdoc/>
-        public IImageDecoder Decoder => new BmpDecoder();
-
-        /// <inheritdoc/>
-        public IImageEncoder Encoder => new BmpEncoder();
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/BmpInfoHeader.cs b/src/ImageSharp46/Formats/Bmp/BmpInfoHeader.cs
deleted file mode 100644
index e652cb504..000000000
--- a/src/ImageSharp46/Formats/Bmp/BmpInfoHeader.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// <copyright file="BmpInfoHeader.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// This block of bytes tells the application detailed information
-    /// about the image, which will be used to display the image on
-    /// the screen.
-    /// <see href="https://en.wikipedia.org/wiki/BMP_file_format"/>
-    /// </summary>
-    internal class BmpInfoHeader
-    {
-        /// <summary>
-        /// Defines of the data structure in the bitmap file.
-        /// </summary>
-        public const int Size = 40;
-
-        /// <summary>
-        /// Gets or sets the size of this header (40 bytes)
-        /// </summary>
-        public int HeaderSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the bitmap width in pixels (signed integer).
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the bitmap height in pixels (signed integer).
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of color planes being used. Must be set to 1.
-        /// </summary>
-        public short Planes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of bits per pixel, which is the color depth of the image.
-        /// Typical values are 1, 4, 8, 16, 24 and 32.
-        /// </summary>
-        public short BitsPerPixel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the compression method being used.
-        /// See the next table for a list of possible values.
-        /// </summary>
-        public BmpCompression Compression { get; set; }
-
-        /// <summary>
-        /// Gets or sets the image size. This is the size of the raw bitmap data (see below),
-        /// and should not be confused with the file size.
-        /// </summary>
-        public int ImageSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the horizontal resolution of the image.
-        /// (pixel per meter, signed integer)
-        /// </summary>
-        public int XPelsPerMeter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vertical resolution of the image.
-        /// (pixel per meter, signed integer)
-        /// </summary>
-        public int YPelsPerMeter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of colors in the color palette,
-        /// or 0 to default to 2^n.
-        /// </summary>
-        public int ClrUsed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of important colors used,
-        /// or 0 when every color is important{ get; set; } generally ignored.
-        /// </summary>
-        public int ClrImportant { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Bmp/README.md b/src/ImageSharp46/Formats/Bmp/README.md
deleted file mode 100644
index d07283843..000000000
--- a/src/ImageSharp46/Formats/Bmp/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Encoder/Decoder adapted from:
-
-https://github.com/yufeih/Nine.Imaging/
-https://imagetools.codeplex.com/
-
-TODO:
-
-- Add support for all bitmap formats.
diff --git a/src/ImageSharp46/Formats/Gif/DisposalMethod.cs b/src/ImageSharp46/Formats/Gif/DisposalMethod.cs
deleted file mode 100644
index 80b5f3c6e..000000000
--- a/src/ImageSharp46/Formats/Gif/DisposalMethod.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <copyright file="DisposalMethod.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Provides enumeration for instructing the decoder what to do with the last image
-    /// in an animation sequence.
-    /// <see href="http://www.w3.org/Graphics/GIF/spec-gif89a.txt"/> section 23
-    /// </summary>
-    public enum DisposalMethod
-    {
-        /// <summary>
-        /// No disposal specified. The decoder is not required to take any action.
-        /// </summary>
-        Unspecified = 0,
-
-        /// <summary>
-        /// Do not dispose. The graphic is to be left in place.
-        /// </summary>
-        NotDispose = 1,
-
-        /// <summary>
-        /// Restore to background color. The area used by the graphic must be restored to
-        /// the background color.
-        /// </summary>
-        RestoreToBackground = 2,
-
-        /// <summary>
-        /// Restore to previous. The decoder is required to restore the area overwritten by the
-        /// graphic with what was there prior to rendering the graphic.
-        /// </summary>
-        RestoreToPrevious = 3
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifConstants.cs b/src/ImageSharp46/Formats/Gif/GifConstants.cs
deleted file mode 100644
index 5334bcba3..000000000
--- a/src/ImageSharp46/Formats/Gif/GifConstants.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// <copyright file="GifConstants.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Constants that define specific points within a gif.
-    /// </summary>
-    internal sealed class GifConstants
-    {
-        /// <summary>
-        /// The file type.
-        /// </summary>
-        public const string FileType = "GIF";
-
-        /// <summary>
-        /// The file version.
-        /// </summary>
-        public const string FileVersion = "89a";
-
-        /// <summary>
-        /// The extension block introducer <value>!</value>.
-        /// </summary>
-        public const byte ExtensionIntroducer = 0x21;
-
-        /// <summary>
-        /// The graphic control label.
-        /// </summary>
-        public const byte GraphicControlLabel = 0xF9;
-
-        /// <summary>
-        /// The application extension label.
-        /// </summary>
-        public const byte ApplicationExtensionLabel = 0xFF;
-
-        /// <summary>
-        /// The application identification.
-        /// </summary>
-        public const string ApplicationIdentification = "NETSCAPE2.0";
-
-        /// <summary>
-        /// The application block size.
-        /// </summary>
-        public const byte ApplicationBlockSize = 0x0b;
-
-        /// <summary>
-        /// The comment label.
-        /// </summary>
-        public const byte CommentLabel = 0xFE;
-
-        /// <summary>
-        /// The maximum comment length.
-        /// </summary>
-        public const int MaxCommentLength = 1024 * 8;
-
-        /// <summary>
-        /// The image descriptor label <value>,</value>.
-        /// </summary>
-        public const byte ImageDescriptorLabel = 0x2C;
-
-        /// <summary>
-        /// The plain text label.
-        /// </summary>
-        public const byte PlainTextLabel = 0x01;
-
-        /// <summary>
-        /// The image label introducer <value>,</value>.
-        /// </summary>
-        public const byte ImageLabel = 0x2C;
-
-        /// <summary>
-        /// The terminator.
-        /// </summary>
-        public const byte Terminator = 0;
-
-        /// <summary>
-        /// The end introducer trailer <value>;</value>.
-        /// </summary>
-        public const byte EndIntroducer = 0x3B;
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifDecoder.cs b/src/ImageSharp46/Formats/Gif/GifDecoder.cs
deleted file mode 100644
index 4afc1cfdb..000000000
--- a/src/ImageSharp46/Formats/Gif/GifDecoder.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <copyright file="GifDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Decoder for generating an image out of a gif encoded stream.
-    /// </summary>
-    public class GifDecoder : IImageDecoder
-    {
-        /// <summary>
-        /// Gets the size of the header for this image type.
-        /// </summary>
-        /// <value>The size of the header.</value>
-        public int HeaderSize => 6;
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="extension">The <see cref="string"/> containing the file extension.</param>
-        /// <returns>
-        /// True if the decoder supports the file extension; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, nameof(extension));
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-            return extension.Equals("GIF", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="header">The <see cref="T:byte[]"/> containing the file header.</param>
-        /// <returns>
-        /// True if the decoder supports the file header; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileFormat(byte[] header)
-        {
-            return header.Length >= 6 &&
-                   header[0] == 0x47 && // G
-                   header[1] == 0x49 && // I
-                   header[2] == 0x46 && // F
-                   header[3] == 0x38 && // 8
-                  (header[4] == 0x39 || header[4] == 0x37) && // 9 or 7
-                   header[5] == 0x61;   // a
-        }
-
-        /// <inheritdoc/>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            new GifDecoderCore<TColor, TPacked>().Decode(image, stream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp46/Formats/Gif/GifDecoderCore.cs
deleted file mode 100644
index 44bb5553b..000000000
--- a/src/ImageSharp46/Formats/Gif/GifDecoderCore.cs
+++ /dev/null
@@ -1,425 +0,0 @@
-// <copyright file="GifDecoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Performs the gif decoding operation.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    internal class GifDecoderCore<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The image to decode the information to.
-        /// </summary>
-        private Image<TColor, TPacked> decodedImage;
-
-        /// <summary>
-        /// The currently loaded stream.
-        /// </summary>
-        private Stream currentStream;
-
-        /// <summary>
-        /// The global color table.
-        /// </summary>
-        private byte[] globalColorTable;
-
-        /// <summary>
-        /// The current frame.
-        /// </summary>
-        private TColor[] currentFrame;
-
-        /// <summary>
-        /// The logical screen descriptor.
-        /// </summary>
-        private GifLogicalScreenDescriptor logicalScreenDescriptor;
-
-        /// <summary>
-        /// The graphics control extension.
-        /// </summary>
-        private GifGraphicsControlExtension graphicsControlExtension;
-
-        /// <summary>
-        /// Decodes the stream to the image.
-        /// </summary>
-        /// <param name="image">The image to decode to.</param>
-        /// <param name="stream">The stream containing image data. </param>
-        public void Decode(Image<TColor, TPacked> image, Stream stream)
-        {
-            this.decodedImage = image;
-
-            this.currentStream = stream;
-
-            // Skip the identifier
-            this.currentStream.Skip(6);
-            this.ReadLogicalScreenDescriptor();
-
-            if (this.logicalScreenDescriptor.GlobalColorTableFlag)
-            {
-                this.globalColorTable = new byte[this.logicalScreenDescriptor.GlobalColorTableSize * 3];
-
-                // Read the global color table from the stream
-                stream.Read(this.globalColorTable, 0, this.globalColorTable.Length);
-            }
-
-            // Loop though the respective gif parts and read the data.
-            int nextFlag = stream.ReadByte();
-            while (nextFlag != GifConstants.Terminator)
-            {
-                if (nextFlag == GifConstants.ImageLabel)
-                {
-                    this.ReadFrame();
-                }
-                else if (nextFlag == GifConstants.ExtensionIntroducer)
-                {
-                    int label = stream.ReadByte();
-                    switch (label)
-                    {
-                        case GifConstants.GraphicControlLabel:
-                            this.ReadGraphicalControlExtension();
-                            break;
-                        case GifConstants.CommentLabel:
-                            this.ReadComments();
-                            break;
-                        case GifConstants.ApplicationExtensionLabel:
-                            this.Skip(12); // No need to read.
-                            break;
-                        case GifConstants.PlainTextLabel:
-                            this.Skip(13); // Not supported by any known decoder.
-                            break;
-                    }
-                }
-                else if (nextFlag == GifConstants.EndIntroducer)
-                {
-                    break;
-                }
-
-                nextFlag = stream.ReadByte();
-            }
-        }
-
-        /// <summary>
-        /// Reads the graphic control extension.
-        /// </summary>
-        private void ReadGraphicalControlExtension()
-        {
-            byte[] buffer = new byte[6];
-
-            this.currentStream.Read(buffer, 0, buffer.Length);
-
-            byte packed = buffer[1];
-
-            this.graphicsControlExtension = new GifGraphicsControlExtension
-            {
-                DelayTime = BitConverter.ToInt16(buffer, 2),
-                TransparencyIndex = buffer[4],
-                TransparencyFlag = (packed & 0x01) == 1,
-                DisposalMethod = (DisposalMethod)((packed & 0x1C) >> 2)
-            };
-        }
-
-        /// <summary>
-        /// Reads the image descriptor
-        /// </summary>
-        /// <returns><see cref="GifImageDescriptor"/></returns>
-        private GifImageDescriptor ReadImageDescriptor()
-        {
-            byte[] buffer = new byte[9];
-
-            this.currentStream.Read(buffer, 0, buffer.Length);
-
-            byte packed = buffer[8];
-
-            GifImageDescriptor imageDescriptor = new GifImageDescriptor
-            {
-                Left = BitConverter.ToInt16(buffer, 0),
-                Top = BitConverter.ToInt16(buffer, 2),
-                Width = BitConverter.ToInt16(buffer, 4),
-                Height = BitConverter.ToInt16(buffer, 6),
-                LocalColorTableFlag = ((packed & 0x80) >> 7) == 1,
-                LocalColorTableSize = 2 << (packed & 0x07),
-                InterlaceFlag = ((packed & 0x40) >> 6) == 1
-            };
-
-            return imageDescriptor;
-        }
-
-        /// <summary>
-        /// Reads the logical screen descriptor.
-        /// </summary>
-        private void ReadLogicalScreenDescriptor()
-        {
-            byte[] buffer = new byte[7];
-
-            this.currentStream.Read(buffer, 0, buffer.Length);
-
-            byte packed = buffer[4];
-
-            this.logicalScreenDescriptor = new GifLogicalScreenDescriptor
-            {
-                Width = BitConverter.ToInt16(buffer, 0),
-                Height = BitConverter.ToInt16(buffer, 2),
-                BackgroundColorIndex = buffer[5],
-                PixelAspectRatio = buffer[6],
-                GlobalColorTableFlag = ((packed & 0x80) >> 7) == 1,
-                GlobalColorTableSize = 2 << (packed & 0x07)
-            };
-
-            if (this.logicalScreenDescriptor.GlobalColorTableSize > 255 * 4)
-            {
-                throw new ImageFormatException(
-                    $"Invalid gif colormap size '{this.logicalScreenDescriptor.GlobalColorTableSize}'");
-            }
-
-            if (this.logicalScreenDescriptor.Width > this.decodedImage.MaxWidth || this.logicalScreenDescriptor.Height > this.decodedImage.MaxHeight)
-            {
-                throw new ArgumentOutOfRangeException(
-                    $"The input gif '{this.logicalScreenDescriptor.Width}x{this.logicalScreenDescriptor.Height}' is bigger then the max allowed size '{this.decodedImage.MaxWidth}x{this.decodedImage.MaxHeight}'");
-            }
-        }
-
-        /// <summary>
-        /// Skips the designated number of bytes in the stream.
-        /// </summary>
-        /// <param name="length">The number of bytes to skip.</param>
-        private void Skip(int length)
-        {
-            this.currentStream.Skip(length);
-
-            int flag;
-
-            while ((flag = this.currentStream.ReadByte()) != 0)
-            {
-                this.currentStream.Skip(flag);
-            }
-        }
-
-        /// <summary>
-        /// Reads the gif comments.
-        /// </summary>
-        private void ReadComments()
-        {
-            int flag;
-
-            while ((flag = this.currentStream.ReadByte()) != 0)
-            {
-                if (flag > GifConstants.MaxCommentLength)
-                {
-                    throw new ImageFormatException($"Gif comment length '{flag}' exceeds max '{GifConstants.MaxCommentLength}'");
-                }
-
-                byte[] buffer = new byte[flag];
-
-                this.currentStream.Read(buffer, 0, flag);
-
-                this.decodedImage.Properties.Add(new ImageProperty("Comments", BitConverter.ToString(buffer)));
-            }
-        }
-
-        /// <summary>
-        /// Reads an individual gif frame.
-        /// </summary>
-        private void ReadFrame()
-        {
-            GifImageDescriptor imageDescriptor = this.ReadImageDescriptor();
-
-            byte[] localColorTable = this.ReadFrameLocalColorTable(imageDescriptor);
-
-            byte[] indices = this.ReadFrameIndices(imageDescriptor);
-
-            // Determine the color table for this frame. If there is a local one, use it
-            // otherwise use the global color table.
-            byte[] colorTable = localColorTable ?? this.globalColorTable;
-
-            this.ReadFrameColors(indices, colorTable, imageDescriptor);
-
-            // Skip any remaining blocks
-            this.Skip(0);
-        }
-
-        /// <summary>
-        /// Reads the frame indices marking the color to use for each pixel.
-        /// </summary>
-        /// <param name="imageDescriptor">The <see cref="GifImageDescriptor"/>.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        private byte[] ReadFrameIndices(GifImageDescriptor imageDescriptor)
-        {
-            int dataSize = this.currentStream.ReadByte();
-            LzwDecoder lzwDecoder = new LzwDecoder(this.currentStream);
-
-            byte[] indices = lzwDecoder.DecodePixels(imageDescriptor.Width, imageDescriptor.Height, dataSize);
-
-            return indices;
-        }
-
-        /// <summary>
-        /// Reads the local color table from the current frame.
-        /// </summary>
-        /// <param name="imageDescriptor">The <see cref="GifImageDescriptor"/>.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        private byte[] ReadFrameLocalColorTable(GifImageDescriptor imageDescriptor)
-        {
-            byte[] localColorTable = null;
-
-            if (imageDescriptor.LocalColorTableFlag)
-            {
-                localColorTable = new byte[imageDescriptor.LocalColorTableSize * 3];
-
-                this.currentStream.Read(localColorTable, 0, localColorTable.Length);
-            }
-
-            return localColorTable;
-        }
-
-        /// <summary>
-        /// Reads the frames colors, mapping indices to colors.
-        /// </summary>
-        /// <param name="indices">The indexed pixels.</param>
-        /// <param name="colorTable">The color table containing the available colors.</param>
-        /// <param name="descriptor">The <see cref="GifImageDescriptor"/></param>
-        private void ReadFrameColors(byte[] indices, byte[] colorTable, GifImageDescriptor descriptor)
-        {
-            int imageWidth = this.logicalScreenDescriptor.Width;
-            int imageHeight = this.logicalScreenDescriptor.Height;
-
-            if (this.currentFrame == null)
-            {
-                this.currentFrame = new TColor[imageWidth * imageHeight];
-            }
-
-            TColor[] lastFrame = null;
-
-            if (this.graphicsControlExtension != null &&
-                this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToPrevious)
-            {
-                lastFrame = new TColor[imageWidth * imageHeight];
-
-                Array.Copy(this.currentFrame, lastFrame, lastFrame.Length);
-            }
-
-            int offset, i = 0;
-            int interlacePass = 0; // The interlace pass
-            int interlaceIncrement = 8; // The interlacing line increment
-            int interlaceY = 0; // The current interlaced line
-
-            for (int y = descriptor.Top; y < descriptor.Top + descriptor.Height; y++)
-            {
-                // Check if this image is interlaced.
-                int writeY; // the target y offset to write to
-                if (descriptor.InterlaceFlag)
-                {
-                    // If so then we read lines at predetermined offsets.
-                    // When an entire image height worth of offset lines has been read we consider this a pass.
-                    // With each pass the number of offset lines changes and the starting line changes.
-                    if (interlaceY >= descriptor.Height)
-                    {
-                        interlacePass++;
-                        switch (interlacePass)
-                        {
-                            case 1:
-                                interlaceY = 4;
-                                break;
-                            case 2:
-                                interlaceY = 2;
-                                interlaceIncrement = 4;
-                                break;
-                            case 3:
-                                interlaceY = 1;
-                                interlaceIncrement = 2;
-                                break;
-                        }
-                    }
-
-                    writeY = interlaceY + descriptor.Top;
-
-                    interlaceY += interlaceIncrement;
-                }
-                else
-                {
-                    writeY = y;
-                }
-
-                for (int x = descriptor.Left; x < descriptor.Left + descriptor.Width; x++)
-                {
-                    offset = (writeY * imageWidth) + x;
-                    int index = indices[i];
-
-                    if (this.graphicsControlExtension == null ||
-                        this.graphicsControlExtension.TransparencyFlag == false ||
-                        this.graphicsControlExtension.TransparencyIndex != index)
-                    {
-                        // Stored in r-> g-> b-> a order.
-                        int indexOffset = index * 3;
-                        TColor pixel = default(TColor);
-                        pixel.PackFromVector4(new Color(colorTable[indexOffset], colorTable[indexOffset + 1], colorTable[indexOffset + 2]).ToVector4());
-                        this.currentFrame[offset] = pixel;
-                    }
-
-                    i++;
-                }
-            }
-
-            TColor[] pixels = new TColor[imageWidth * imageHeight];
-
-            Array.Copy(this.currentFrame, pixels, pixels.Length);
-
-            ImageBase<TColor, TPacked> currentImage;
-
-            if (this.decodedImage.Pixels == null)
-            {
-                currentImage = this.decodedImage;
-                currentImage.SetPixels(imageWidth, imageHeight, pixels);
-                currentImage.Quality = colorTable.Length / 3;
-
-                if (this.graphicsControlExtension != null && this.graphicsControlExtension.DelayTime > 0)
-                {
-                    this.decodedImage.FrameDelay = this.graphicsControlExtension.DelayTime;
-                }
-            }
-            else
-            {
-                ImageFrame<TColor, TPacked> frame = new ImageFrame<TColor, TPacked>();
-
-                currentImage = frame;
-                currentImage.SetPixels(imageWidth, imageHeight, pixels);
-                currentImage.Quality = colorTable.Length / 3;
-
-                if (this.graphicsControlExtension != null && this.graphicsControlExtension.DelayTime > 0)
-                {
-                    currentImage.FrameDelay = this.graphicsControlExtension.DelayTime;
-                }
-
-                this.decodedImage.Frames.Add(frame);
-            }
-
-            if (this.graphicsControlExtension != null)
-            {
-                if (this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToBackground)
-                {
-                    for (int y = descriptor.Top; y < descriptor.Top + descriptor.Height; y++)
-                    {
-                        for (int x = descriptor.Left; x < descriptor.Left + descriptor.Width; x++)
-                        {
-                            offset = (y * imageWidth) + x;
-
-                            // Stored in r-> g-> b-> a order.
-                            this.currentFrame[offset] = default(TColor);
-                        }
-                    }
-                }
-                else if (this.graphicsControlExtension.DisposalMethod == DisposalMethod.RestoreToPrevious)
-                {
-                    this.currentFrame = lastFrame;
-                }
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifEncoder.cs b/src/ImageSharp46/Formats/Gif/GifEncoder.cs
deleted file mode 100644
index 57db04301..000000000
--- a/src/ImageSharp46/Formats/Gif/GifEncoder.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// <copyright file="GifEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    using ImageSharp.Quantizers;
-
-    /// <summary>
-    /// Image encoder for writing image data to a stream in gif format.
-    /// </summary>
-    public class GifEncoder : IImageEncoder
-    {
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        /// <remarks>For gifs the value ranges from 1 to 256.</remarks>
-        public int Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transparency threshold.
-        /// </summary>
-        public byte Threshold { get; set; } = 128;
-
-        /// <summary>
-        /// Gets or sets the quantizer for reducing the color count.
-        /// </summary>
-        public IQuantizer Quantizer { get; set; }
-
-        /// <inheritdoc/>
-        public string Extension => "gif";
-
-        /// <inheritdoc/>
-        public string MimeType => "image/gif";
-
-        /// <inheritdoc/>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, nameof(extension));
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-            return extension.Equals(this.Extension, StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <inheritdoc/>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-        {
-            GifEncoderCore encoder = new GifEncoderCore
-            {
-                Quality = this.Quality,
-                Quantizer = this.Quantizer,
-                Threshold = this.Threshold
-            };
-
-            encoder.Encode(image, stream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp46/Formats/Gif/GifEncoderCore.cs
deleted file mode 100644
index 746e27ff7..000000000
--- a/src/ImageSharp46/Formats/Gif/GifEncoderCore.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-// <copyright file="GifEncoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Threading.Tasks;
-
-    using IO;
-    using Quantizers;
-
-    /// <summary>
-    /// Performs the gif encoding operation.
-    /// </summary>
-    internal sealed class GifEncoderCore
-    {
-        /// <summary>
-        /// The number of bits requires to store the image palette.
-        /// </summary>
-        private int bitDepth;
-
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        /// <remarks>For gifs the value ranges from 1 to 256.</remarks>
-        public int Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transparency threshold.
-        /// </summary>
-        public byte Threshold { get; set; } = 128;
-
-        /// <summary>
-        /// Gets or sets the quantizer for reducing the color count.
-        /// </summary>
-        public IQuantizer Quantizer { get; set; }
-
-        /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="Image{TColor, TPacked}"/> to encode from.</param>
-        /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.NotNull(image, nameof(image));
-            Guard.NotNull(stream, nameof(stream));
-
-            if (this.Quantizer == null)
-            {
-                this.Quantizer = new OctreeQuantizer<TColor, TPacked>();
-            }
-
-            // Do not use IDisposable pattern here as we want to preserve the stream.
-            EndianBinaryWriter writer = new EndianBinaryWriter(EndianBitConverter.Little, stream);
-
-            // Ensure that quality can be set but has a fallback.
-            int quality = this.Quality > 0 ? this.Quality : image.Quality;
-            this.Quality = quality > 0 ? quality.Clamp(1, 256) : 256;
-
-            // Get the number of bits.
-            this.bitDepth = ImageMaths.GetBitsNeededForColorDepth(this.Quality);
-
-            // Quantize the image returning a palette.
-            QuantizedImage<TColor, TPacked> quantized = ((IQuantizer<TColor, TPacked>)this.Quantizer).Quantize(image, this.Quality);
-
-            int index = GetTransparentIndex(quantized);
-
-            // Write the header.
-            this.WriteHeader(writer);
-
-            // Write the LSD. We'll use local color tables for now.
-            this.WriteLogicalScreenDescriptor(image, writer, index);
-
-            // Write the first frame.
-            this.WriteGraphicalControlExtension(image, writer, index);
-            this.WriteImageDescriptor(image, writer);
-            this.WriteColorTable(quantized, writer);
-            this.WriteImageData(quantized, writer);
-
-            // Write additional frames.
-            if (image.Frames.Any())
-            {
-                this.WriteApplicationExtension(writer, image.RepeatCount, image.Frames.Count);
-                foreach (ImageFrame<TColor, TPacked> frame in image.Frames)
-                {
-                    QuantizedImage<TColor, TPacked> quantizedFrame = ((IQuantizer<TColor, TPacked>)this.Quantizer).Quantize(frame, this.Quality);
-
-                    this.WriteGraphicalControlExtension(frame, writer, GetTransparentIndex(quantizedFrame));
-                    this.WriteImageDescriptor(frame, writer);
-                    this.WriteColorTable(quantizedFrame, writer);
-                    this.WriteImageData(quantizedFrame, writer);
-                }
-            }
-
-            // TODO: Write Comments extension etc
-            writer.Write(GifConstants.EndIntroducer);
-        }
-
-        /// <summary>
-        /// Returns the index of the most transparent color in the palette.
-        /// </summary>
-        /// <param name="quantized">
-        /// The quantized.
-        /// </param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        private static int GetTransparentIndex<TColor, TPacked>(QuantizedImage<TColor, TPacked> quantized)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Find the lowest alpha value and make it the transparent index.
-            int index = 255;
-            float alpha = 1;
-            for (int i = 0; i < quantized.Palette.Length; i++)
-            {
-                float a = quantized.Palette[i].ToVector4().W;
-                if (a < alpha)
-                {
-                    alpha = a;
-                    index = i;
-                }
-            }
-
-            return index;
-        }
-
-        /// <summary>
-        /// Writes the file header signature and version to the stream.
-        /// </summary>
-        /// <param name="writer">The writer to write to the stream with.</param>
-        private void WriteHeader(EndianBinaryWriter writer)
-        {
-            writer.Write((GifConstants.FileType + GifConstants.FileVersion).ToCharArray());
-        }
-
-        /// <summary>
-        /// Writes the logical screen descriptor to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="writer">The writer to write to the stream with.</param>
-        /// <param name="tranparencyIndex">The transparency index to set the default background index to.</param>
-        private void WriteLogicalScreenDescriptor<TColor, TPacked>(Image<TColor, TPacked> image, EndianBinaryWriter writer, int tranparencyIndex)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            GifLogicalScreenDescriptor descriptor = new GifLogicalScreenDescriptor
-            {
-                Width = (short)image.Width,
-                Height = (short)image.Height,
-                GlobalColorTableFlag = false, // Always false for now.
-                GlobalColorTableSize = this.bitDepth - 1,
-                BackgroundColorIndex = (byte)(tranparencyIndex > -1 ? tranparencyIndex : 255)
-            };
-
-            writer.Write((ushort)descriptor.Width);
-            writer.Write((ushort)descriptor.Height);
-
-            PackedField field = default(PackedField);
-            field.SetBit(0, descriptor.GlobalColorTableFlag); // 1   : Global color table flag = 1 || 0 (GCT used/ not used)
-            field.SetBits(1, 3, descriptor.GlobalColorTableSize); // 2-4 : color resolution
-            field.SetBit(4, false); // 5   : GCT sort flag = 0
-            field.SetBits(5, 3, descriptor.GlobalColorTableSize); // 6-8 : GCT size. 2^(N+1)
-
-            // Reduce the number of writes
-            byte[] arr =
-            {
-                field.Byte,
-                descriptor.BackgroundColorIndex, // Background Color Index
-                descriptor.PixelAspectRatio // Pixel aspect ratio. Assume 1:1
-            };
-
-            writer.Write(arr);
-        }
-
-        /// <summary>
-        /// Writes the application extension to the stream.
-        /// </summary>
-        /// <param name="writer">The writer to write to the stream with.</param>
-        /// <param name="repeatCount">The animated image repeat count.</param>
-        /// <param name="frames">The number of image frames.</param>
-        private void WriteApplicationExtension(EndianBinaryWriter writer, ushort repeatCount, int frames)
-        {
-            // Application Extension Header
-            if (repeatCount != 1 && frames > 0)
-            {
-                byte[] ext =
-                {
-                    GifConstants.ExtensionIntroducer,
-                    GifConstants.ApplicationExtensionLabel,
-                    GifConstants.ApplicationBlockSize
-                };
-
-                writer.Write(ext);
-
-                writer.Write(GifConstants.ApplicationIdentification.ToCharArray()); // NETSCAPE2.0
-                writer.Write((byte)3); // Application block length
-                writer.Write((byte)1); // Data sub-block index (always 1)
-
-                // 0 means loop indefinitely. Count is set as play n + 1 times.
-                repeatCount = (ushort)(Math.Max((ushort)0, repeatCount) - 1);
-
-                writer.Write(repeatCount); // Repeat count for images.
-
-                writer.Write(GifConstants.Terminator); // Terminator
-            }
-        }
-
-        /// <summary>
-        /// Writes the graphics control extension to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to encode.</param>
-        /// <param name="writer">The stream to write to.</param>
-        /// <param name="transparencyIndex">The index of the color in the color palette to make transparent.</param>
-        private void WriteGraphicalControlExtension<TColor, TPacked>(ImageBase<TColor, TPacked> image, EndianBinaryWriter writer, int transparencyIndex)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // TODO: Check transparency logic.
-            bool hasTransparent = transparencyIndex > -1;
-            DisposalMethod disposalMethod = hasTransparent
-                ? DisposalMethod.RestoreToBackground
-                : DisposalMethod.Unspecified;
-
-            GifGraphicsControlExtension extension = new GifGraphicsControlExtension()
-            {
-                DisposalMethod = disposalMethod,
-                TransparencyFlag = hasTransparent,
-                TransparencyIndex = transparencyIndex,
-                DelayTime = image.FrameDelay
-            };
-
-            // Reduce the number of writes.
-            byte[] intro =
-                {
-                GifConstants.ExtensionIntroducer,
-                GifConstants.GraphicControlLabel,
-                4 // Size
-            };
-
-            writer.Write(intro);
-
-            PackedField field = default(PackedField);
-            field.SetBits(3, 3, (int)extension.DisposalMethod); // 1-3 : Reserved, 4-6 : Disposal
-
-            // TODO: Allow this as an option.
-            field.SetBit(6, false); // 7 : User input - 0 = none
-            field.SetBit(7, extension.TransparencyFlag); // 8: Has transparent.
-
-            writer.Write(field.Byte);
-            writer.Write((ushort)extension.DelayTime);
-            writer.Write((byte)(extension.TransparencyIndex == -1 ? 255 : extension.TransparencyIndex));
-            writer.Write(GifConstants.Terminator);
-        }
-
-        /// <summary>
-        /// Writes the image descriptor to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to be encoded.</param>
-        /// <param name="writer">The stream to write to.</param>
-        private void WriteImageDescriptor<TColor, TPacked>(ImageBase<TColor, TPacked> image, EndianBinaryWriter writer)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            writer.Write(GifConstants.ImageDescriptorLabel); // 2c
-            // TODO: Can we capture this?
-            writer.Write((ushort)0); // Left position
-            writer.Write((ushort)0); // Top position
-            writer.Write((ushort)image.Width);
-            writer.Write((ushort)image.Height);
-
-            PackedField field = default(PackedField);
-            field.SetBit(0, true); // 1: Local color table flag = 1 (LCT used)
-            field.SetBit(1, false); // 2: Interlace flag 0
-            field.SetBit(2, false); // 3: Sort flag 0
-            field.SetBits(5, 3, this.bitDepth - 1); // 4-5: Reserved, 6-8 : LCT size. 2^(N+1)
-
-            writer.Write(field.Byte);
-        }
-
-        /// <summary>
-        /// Writes the color table to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to encode.</param>
-        /// <param name="writer">The writer to write to the stream with.</param>
-        private void WriteColorTable<TColor, TPacked>(QuantizedImage<TColor, TPacked> image, EndianBinaryWriter writer)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Grab the palette and write it to the stream.
-            TColor[] palette = image.Palette;
-            int pixelCount = palette.Length;
-
-            // Get max colors for bit depth.
-            int colorTableLength = (int)Math.Pow(2, this.bitDepth) * 3;
-            byte[] colorTable = new byte[colorTableLength];
-
-            Parallel.For(
-                0,
-                pixelCount,
-                i =>
-                    {
-                    int offset = i * 3;
-                    Color color = new Color(palette[i].ToVector4());
-
-                    colorTable[offset] = color.R;
-                    colorTable[offset + 1] = color.G;
-                    colorTable[offset + 2] = color.B;
-                });
-
-            writer.Write(colorTable, 0, colorTableLength);
-        }
-
-        /// <summary>
-        /// Writes the image pixel data to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="QuantizedImage{TColor, TPacked}"/> containing indexed pixels.</param>
-        /// <param name="writer">The stream to write to.</param>
-        private void WriteImageData<TColor, TPacked>(QuantizedImage<TColor, TPacked> image, EndianBinaryWriter writer)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            byte[] indexedPixels = image.Pixels;
-
-            LzwEncoder encoder = new LzwEncoder(indexedPixels, (byte)this.bitDepth);
-            encoder.Encode(writer.BaseStream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/GifFormat.cs b/src/ImageSharp46/Formats/Gif/GifFormat.cs
deleted file mode 100644
index 4c584c7ba..000000000
--- a/src/ImageSharp46/Formats/Gif/GifFormat.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// <copyright file="GifFormat.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Encapsulates the means to encode and decode gif images.
-    /// </summary>
-    public class GifFormat : IImageFormat
-    {
-        /// <inheritdoc/>
-        public IImageDecoder Decoder => new GifDecoder();
-
-        /// <inheritdoc/>
-        public IImageEncoder Encoder => new GifEncoder();
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/LzwDecoder.cs b/src/ImageSharp46/Formats/Gif/LzwDecoder.cs
deleted file mode 100644
index b77d01739..000000000
--- a/src/ImageSharp46/Formats/Gif/LzwDecoder.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// <copyright file="LzwDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System.IO;
-
-    /// <summary>
-    /// Decompresses and decodes data using the dynamic LZW algorithms.
-    /// </summary>
-    internal sealed class LzwDecoder
-    {
-        /// <summary>
-        /// The max decoder pixel stack size.
-        /// </summary>
-        private const int MaxStackSize = 4096;
-
-        /// <summary>
-        /// The null code.
-        /// </summary>
-        private const int NullCode = -1;
-
-        /// <summary>
-        /// The stream to decode.
-        /// </summary>
-        private readonly Stream stream;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LzwDecoder"/> class
-        /// and sets the stream, where the compressed data should be read from.
-        /// </summary>
-        /// <param name="stream">The stream to read from.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="stream"/> is null.</exception>
-        public LzwDecoder(Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-
-            this.stream = stream;
-        }
-
-        /// <summary>
-        /// Decodes and decompresses all pixel indices from the stream.
-        /// </summary>
-        /// <param name="width">The width of the pixel index array.</param>
-        /// <param name="height">The height of the pixel index array.</param>
-        /// <param name="dataSize">Size of the data.</param>
-        /// <returns>The decoded and uncompressed array.</returns>
-        public byte[] DecodePixels(int width, int height, int dataSize)
-        {
-            Guard.MustBeLessThan(dataSize, int.MaxValue, nameof(dataSize));
-
-            // The resulting index table.
-            byte[] pixels = new byte[width * height];
-
-            // Calculate the clear code. The value of the clear code is 2 ^ dataSize
-            int clearCode = 1 << dataSize;
-
-            int codeSize = dataSize + 1;
-
-            // Calculate the end code
-            int endCode = clearCode + 1;
-
-            // Calculate the available code.
-            int availableCode = clearCode + 2;
-
-            // Jillzhangs Code see: http://giflib.codeplex.com/
-            // Adapted from John Cristy's ImageMagick.
-            int code;
-            int oldCode = NullCode;
-            int codeMask = (1 << codeSize) - 1;
-            int bits = 0;
-
-            int[] prefix = new int[MaxStackSize];
-            int[] suffix = new int[MaxStackSize];
-            int[] pixelStatck = new int[MaxStackSize + 1];
-
-            int top = 0;
-            int count = 0;
-            int bi = 0;
-            int xyz = 0;
-
-            int data = 0;
-            int first = 0;
-
-            for (code = 0; code < clearCode; code++)
-            {
-                prefix[code] = 0;
-                suffix[code] = (byte)code;
-            }
-
-            byte[] buffer = null;
-            while (xyz < pixels.Length)
-            {
-                if (top == 0)
-                {
-                    if (bits < codeSize)
-                    {
-                        // Load bytes until there are enough bits for a code.
-                        if (count == 0)
-                        {
-                            // Read a new data block.
-                            buffer = this.ReadBlock();
-                            count = buffer.Length;
-                            if (count == 0)
-                            {
-                                break;
-                            }
-
-                            bi = 0;
-                        }
-
-                        if (buffer != null)
-                        {
-                            data += buffer[bi] << bits;
-                        }
-
-                        bits += 8;
-                        bi++;
-                        count--;
-                        continue;
-                    }
-
-                    // Get the next code
-                    code = data & codeMask;
-                    data >>= codeSize;
-                    bits -= codeSize;
-
-                    // Interpret the code
-                    if (code > availableCode || code == endCode)
-                    {
-                        break;
-                    }
-
-                    if (code == clearCode)
-                    {
-                        // Reset the decoder
-                        codeSize = dataSize + 1;
-                        codeMask = (1 << codeSize) - 1;
-                        availableCode = clearCode + 2;
-                        oldCode = NullCode;
-                        continue;
-                    }
-
-                    if (oldCode == NullCode)
-                    {
-                        pixelStatck[top++] = suffix[code];
-                        oldCode = code;
-                        first = code;
-                        continue;
-                    }
-
-                    int inCode = code;
-                    if (code == availableCode)
-                    {
-                        pixelStatck[top++] = (byte)first;
-
-                        code = oldCode;
-                    }
-
-                    while (code > clearCode)
-                    {
-                        pixelStatck[top++] = suffix[code];
-                        code = prefix[code];
-                    }
-
-                    first = suffix[code];
-
-                    pixelStatck[top++] = suffix[code];
-
-                    // Fix for Gifs that have "deferred clear code" as per here :
-                    // https://bugzilla.mozilla.org/show_bug.cgi?id=55918
-                    if (availableCode < MaxStackSize)
-                    {
-                        prefix[availableCode] = oldCode;
-                        suffix[availableCode] = first;
-                        availableCode++;
-                        if (availableCode == codeMask + 1 && availableCode < MaxStackSize)
-                        {
-                            codeSize++;
-                            codeMask = (1 << codeSize) - 1;
-                        }
-                    }
-
-                    oldCode = inCode;
-                }
-
-                // Pop a pixel off the pixel stack.
-                top--;
-
-                // Clear missing pixels
-                pixels[xyz++] = (byte)pixelStatck[top];
-            }
-
-            return pixels;
-        }
-
-        /// <summary>
-        /// Reads the next data block from the stream. A data block begins with a byte,
-        /// which defines the size of the block, followed by the block itself.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>.
-        /// </returns>
-        private byte[] ReadBlock()
-        {
-            int blockSize = this.stream.ReadByte();
-            return this.ReadBytes(blockSize);
-        }
-
-        /// <summary>
-        /// Reads the specified number of bytes from the data stream.
-        /// </summary>
-        /// <param name="length">
-        /// The number of bytes to read.
-        /// </param>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>.
-        /// </returns>
-        private byte[] ReadBytes(int length)
-        {
-            byte[] buffer = new byte[length];
-            this.stream.Read(buffer, 0, length);
-            return buffer;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/LzwEncoder.cs b/src/ImageSharp46/Formats/Gif/LzwEncoder.cs
deleted file mode 100644
index 003cfa834..000000000
--- a/src/ImageSharp46/Formats/Gif/LzwEncoder.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-// <copyright file="LzwEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Encodes and compresses the image data using dynamic Lempel-Ziv compression.
-    /// </summary>
-    /// <remarks>
-    /// Adapted from Jef Poskanzer's Java port by way of J. M. G. Elliott. K Weiner 12/00
-    /// <para>
-    /// GIFCOMPR.C       - GIF Image compression routines
-    /// </para>
-    /// <para>
-    /// Lempel-Ziv compression based on 'compress'.  GIF modifications by
-    /// David Rowley (mgardi@watdcsu.waterloo.edu)
-    /// </para>
-    /// GIF Image compression - modified 'compress'
-    /// <para>
-    /// Based on: compress.c - File compression ala IEEE Computer, June 1984.
-    /// By Authors:  Spencer W. Thomas      (decvax!harpo!utah-cs!utah-gr!thomas)
-    ///              Jim McKie              (decvax!mcvax!jim)
-    ///              Steve Davies           (decvax!vax135!petsd!peora!srd)
-    ///              Ken Turkowski          (decvax!decwrl!turtlevax!ken)
-    ///              James A. Woods         (decvax!ihnp4!ames!jaw)
-    ///              Joe Orost              (decvax!vax135!petsd!joe)
-    /// </para>
-    /// </remarks>
-    internal sealed class LzwEncoder
-    {
-        private const int Eof = -1;
-
-        private const int Bits = 12;
-
-        private const int HashSize = 5003; // 80% occupancy
-
-        private readonly byte[] pixelArray;
-
-        private readonly int initialCodeSize;
-
-        private readonly int[] hashTable = new int[HashSize];
-
-        private readonly int[] codeTable = new int[HashSize];
-
-        private readonly int[] masks =
-        {
-            0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF,
-            0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF
-        };
-
-        /// <summary>
-        /// Define the storage for the packet accumulator.
-        /// </summary>
-        private readonly byte[] accumulators = new byte[256];
-
-        /// <summary>
-        /// The current pixel
-        /// </summary>
-        private int currentPixel;
-
-        /// <summary>
-        /// Number of bits/code
-        /// </summary>
-        private int bitCount;
-
-        /// <summary>
-        /// User settable max # bits/code
-        /// </summary>
-        private int maxbits = Bits;
-
-        /// <summary>
-        /// maximum code, given bitCount
-        /// </summary>
-        private int maxcode;
-
-        /// <summary>
-        /// should NEVER generate this code
-        /// </summary>
-        private int maxmaxcode = 1 << Bits;
-
-        /// <summary>
-        /// For dynamic table sizing
-        /// </summary>
-        private int hsize = HashSize;
-
-        /// <summary>
-        /// First unused entry
-        /// </summary>
-        private int freeEntry;
-
-        /// <summary>
-        /// Block compression parameters -- after all codes are used up,
-        /// and compression rate changes, start over.
-        /// </summary>
-        private bool clearFlag;
-
-        // Algorithm:  use open addressing double hashing (no chaining) on the
-        // prefix code / next character combination.  We do a variant of Knuth's
-        // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
-        // secondary probe.  Here, the modular division first probe is gives way
-        // to a faster exclusive-or manipulation.  Also do block compression with
-        // an adaptive reset, whereby the code table is cleared when the compression
-        // ratio decreases, but after the table fills.  The variable-length output
-        // codes are re-sized at this point, and a special CLEAR code is generated
-        // for the decompressor.  Late addition:  construct the table according to
-        // file size for noticeable speed improvement on small files.  Please direct
-        // questions about this implementation to ames!jaw.
-        private int globalInitialBits;
-
-        private int clearCode;
-
-        private int eofCode;
-
-        // output
-        //
-        // Output the given code.
-        // Inputs:
-        //      code:   A bitCount-bit integer.  If == -1, then EOF.  This assumes
-        //              that bitCount =< wordsize - 1.
-        // Outputs:
-        //      Outputs code to the file.
-        // Assumptions:
-        //      Chars are 8 bits long.
-        // Algorithm:
-        //      Maintain a BITS character long buffer (so that 8 codes will
-        // fit in it exactly).  Use the VAX insv instruction to insert each
-        // code in turn.  When the buffer fills up empty it and start over.
-        private int currentAccumulator;
-
-        private int currentBits;
-
-        /// <summary>
-        /// Number of characters so far in this 'packet'
-        /// </summary>
-        private int accumulatorCount;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LzwEncoder"/> class.
-        /// </summary>
-        /// <param name="indexedPixels">The array of indexed pixels.</param>
-        /// <param name="colorDepth">The color depth in bits.</param>
-        public LzwEncoder(byte[] indexedPixels, int colorDepth)
-        {
-            this.pixelArray = indexedPixels;
-            this.initialCodeSize = Math.Max(2, colorDepth);
-        }
-
-        /// <summary>
-        /// Encodes and compresses the indexed pixels to the stream.
-        /// </summary>
-        /// <param name="stream">The stream to write to.</param>
-        public void Encode(Stream stream)
-        {
-            // Write "initial code size" byte
-            stream.WriteByte((byte)this.initialCodeSize);
-
-            this.currentPixel = 0;
-
-            // Compress and write the pixel data
-            this.Compress(this.initialCodeSize + 1, stream);
-
-            // Write block terminator
-            stream.WriteByte(GifConstants.Terminator);
-        }
-
-        /// <summary>
-        /// Gets the maximum code value
-        /// </summary>
-        /// <param name="bitCount">The number of bits</param>
-        /// <returns>See <see cref="int"/></returns>
-        private static int GetMaxcode(int bitCount)
-        {
-            return (1 << bitCount) - 1;
-        }
-
-        /// <summary>
-        /// Add a character to the end of the current packet, and if it is 254 characters,
-        /// flush the packet to disk.
-        /// </summary>
-        /// <param name="c">The character to add.</param>
-        /// <param name="stream">The stream to write to.</param>
-        private void AddCharacter(byte c, Stream stream)
-        {
-            this.accumulators[this.accumulatorCount++] = c;
-            if (this.accumulatorCount >= 254)
-            {
-                this.FlushPacket(stream);
-            }
-        }
-
-        /// <summary>
-        ///  Table clear for block compress
-        /// </summary>
-        /// <param name="stream">The output stream.</param>
-        private void ClearBlock(Stream stream)
-        {
-            this.ResetCodeTable(this.hsize);
-            this.freeEntry = this.clearCode + 2;
-            this.clearFlag = true;
-
-            this.Output(this.clearCode, stream);
-        }
-
-        /// <summary>
-        /// Reset the code table.
-        /// </summary>
-        /// <param name="size">The hash size.</param>
-        private void ResetCodeTable(int size)
-        {
-            for (int i = 0; i < size; ++i)
-            {
-                this.hashTable[i] = -1;
-            }
-        }
-
-        /// <summary>
-        /// Compress the packets to the stream.
-        /// </summary>
-        /// <param name="intialBits">The initial bits.</param>
-        /// <param name="stream">The stream to write to.</param>
-        private void Compress(int intialBits, Stream stream)
-        {
-            int fcode;
-            int c;
-            int ent;
-            int hsizeReg;
-            int hshift;
-
-            // Set up the globals:  globalInitialBits - initial number of bits
-            this.globalInitialBits = intialBits;
-
-            // Set up the necessary values
-            this.clearFlag = false;
-            this.bitCount = this.globalInitialBits;
-            this.maxcode = GetMaxcode(this.bitCount);
-
-            this.clearCode = 1 << (intialBits - 1);
-            this.eofCode = this.clearCode + 1;
-            this.freeEntry = this.clearCode + 2;
-
-            this.accumulatorCount = 0; // clear packet
-
-            ent = this.NextPixel();
-
-            hshift = 0;
-            for (fcode = this.hsize; fcode < 65536; fcode *= 2)
-            {
-                ++hshift;
-            }
-
-            hshift = 8 - hshift; // set hash code range bound
-
-            hsizeReg = this.hsize;
-
-            this.ResetCodeTable(hsizeReg); // clear hash table
-
-            this.Output(this.clearCode, stream);
-
-            while ((c = this.NextPixel()) != Eof)
-            {
-                fcode = (c << this.maxbits) + ent;
-                int i = (c << hshift) ^ ent /* = 0 */;
-
-                if (this.hashTable[i] == fcode)
-                {
-                    ent = this.codeTable[i];
-                    continue;
-                }
-
-                // Non-empty slot
-                if (this.hashTable[i] >= 0)
-                {
-                    int disp = hsizeReg - i;
-                    if (i == 0)
-                    {
-                        disp = 1;
-                    }
-
-                    do
-                    {
-                        if ((i -= disp) < 0)
-                        {
-                            i += hsizeReg;
-                        }
-
-                        if (this.hashTable[i] == fcode)
-                        {
-                            ent = this.codeTable[i];
-                            break;
-                        }
-                    }
-                    while (this.hashTable[i] >= 0);
-
-                    if (this.hashTable[i] == fcode)
-                    {
-                        continue;
-                    }
-                }
-
-                this.Output(ent, stream);
-                ent = c;
-                if (this.freeEntry < this.maxmaxcode)
-                {
-                    this.codeTable[i] = this.freeEntry++; // code -> hashtable
-                    this.hashTable[i] = fcode;
-                }
-                else
-                {
-                    this.ClearBlock(stream);
-                }
-            }
-
-            // Put out the final code.
-            this.Output(ent, stream);
-
-            this.Output(this.eofCode, stream);
-        }
-
-        /// <summary>
-        /// Flush the packet to disk, and reset the accumulator.
-        /// </summary>
-        /// <param name="outStream">The output stream.</param>
-        private void FlushPacket(Stream outStream)
-        {
-            if (this.accumulatorCount > 0)
-            {
-                outStream.WriteByte((byte)this.accumulatorCount);
-                outStream.Write(this.accumulators, 0, this.accumulatorCount);
-                this.accumulatorCount = 0;
-            }
-        }
-
-        /// <summary>
-        /// Return the next pixel from the image
-        /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>
-        /// </returns>
-        private int NextPixel()
-        {
-            if (this.currentPixel == this.pixelArray.Length)
-            {
-                return Eof;
-            }
-
-            if (this.currentPixel == this.pixelArray.Length)
-            {
-                return Eof;
-            }
-
-            this.currentPixel++;
-            return this.pixelArray[this.currentPixel - 1] & 0xff;
-        }
-
-        /// <summary>
-        /// Output the current code to the stream.
-        /// </summary>
-        /// <param name="code">The code.</param>
-        /// <param name="outs">The stream to write to.</param>
-        private void Output(int code, Stream outs)
-        {
-            this.currentAccumulator &= this.masks[this.currentBits];
-
-            if (this.currentBits > 0)
-            {
-                this.currentAccumulator |= code << this.currentBits;
-            }
-            else
-            {
-                this.currentAccumulator = code;
-            }
-
-            this.currentBits += this.bitCount;
-
-            while (this.currentBits >= 8)
-            {
-                this.AddCharacter((byte)(this.currentAccumulator & 0xff), outs);
-                this.currentAccumulator >>= 8;
-                this.currentBits -= 8;
-            }
-
-            // If the next entry is going to be too big for the code size,
-            // then increase it, if possible.
-            if (this.freeEntry > this.maxcode || this.clearFlag)
-            {
-                if (this.clearFlag)
-                {
-                    this.maxcode = GetMaxcode(this.bitCount = this.globalInitialBits);
-                    this.clearFlag = false;
-                }
-                else
-                {
-                    ++this.bitCount;
-                    this.maxcode = this.bitCount == this.maxbits
-                        ? this.maxmaxcode
-                        : GetMaxcode(this.bitCount);
-                }
-            }
-
-            if (code == this.eofCode)
-            {
-                // At EOF, write the rest of the buffer.
-                while (this.currentBits > 0)
-                {
-                    this.AddCharacter((byte)(this.currentAccumulator & 0xff), outs);
-                    this.currentAccumulator >>= 8;
-                    this.currentBits -= 8;
-                }
-
-                this.FlushPacket(outs);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Gif/PackedField.cs b/src/ImageSharp46/Formats/Gif/PackedField.cs
deleted file mode 100644
index cabf4f5ab..000000000
--- a/src/ImageSharp46/Formats/Gif/PackedField.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// <copyright file="PackedField.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// Represents a byte of data in a GIF data stream which contains a number
-    /// of data items.
-    /// </summary>
-    internal struct PackedField : IEquatable<PackedField>
-    {
-        /// <summary>
-        /// The individual bits representing the packed byte.
-        /// </summary>
-        private static readonly bool[] Bits = new bool[8];
-
-        /// <summary>
-        /// Gets the byte which represents the data items held in this instance.
-        /// </summary>
-        public byte Byte
-        {
-            get
-            {
-                int returnValue = 0;
-                int bitShift = 7;
-                foreach (bool bit in Bits)
-                {
-                    int bitValue;
-                    if (bit)
-                    {
-                        bitValue = 1 << bitShift;
-                    }
-                    else
-                    {
-                        bitValue = 0;
-                    }
-
-                    returnValue |= bitValue;
-                    bitShift--;
-                }
-
-                return Convert.ToByte(returnValue & 0xFF);
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <see cref="PackedField"/>  with the bits in the packed fields to
-        /// the corresponding bits from the supplied byte.
-        /// </summary>
-        /// <param name="value">The value to pack.</param>
-        /// <returns>The <see cref="PackedField"/></returns>
-        public static PackedField FromInt(byte value)
-        {
-            PackedField packed = default(PackedField);
-            packed.SetBits(0, 8, value);
-            return packed;
-        }
-
-        /// <summary>
-        /// Sets the specified bit within the packed fields to the supplied
-        /// value.
-        /// </summary>
-        /// <param name="index">
-        /// The zero-based index within the packed fields of the bit to set.
-        /// </param>
-        /// <param name="valueToSet">
-        /// The value to set the bit to.
-        /// </param>
-        public void SetBit(int index, bool valueToSet)
-        {
-            if (index < 0 || index > 7)
-            {
-                string message
-                    = "Index must be between 0 and 7. Supplied index: "
-                    + index;
-                throw new ArgumentOutOfRangeException(nameof(index), message);
-            }
-
-            Bits[index] = valueToSet;
-        }
-
-        /// <summary>
-        /// Sets the specified bits within the packed fields to the supplied
-        /// value.
-        /// </summary>
-        /// <param name="startIndex">The zero-based index within the packed fields of the first bit to  set.</param>
-        /// <param name="length">The number of bits to set.</param>
-        /// <param name="valueToSet">The value to set the bits to.</param>
-        public void SetBits(int startIndex, int length, int valueToSet)
-        {
-            if (startIndex < 0 || startIndex > 7)
-            {
-                string message = $"Start index must be between 0 and 7. Supplied index: {startIndex}";
-                throw new ArgumentOutOfRangeException(nameof(startIndex), message);
-            }
-
-            if (length < 1 || startIndex + length > 8)
-            {
-                string message = "Length must be greater than zero and the sum of length and start index must be less than 8. "
-                                 + $"Supplied length: {length}. Supplied start index: {startIndex}";
-                throw new ArgumentOutOfRangeException(nameof(length), message);
-            }
-
-            int bitShift = length - 1;
-            for (int i = startIndex; i < startIndex + length; i++)
-            {
-                int bitValueIfSet = 1 << bitShift;
-                int bitValue = valueToSet & bitValueIfSet;
-                int bitIsSet = bitValue >> bitShift;
-                Bits[i] = bitIsSet == 1;
-                bitShift--;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the specified bit within the byte.
-        /// </summary>
-        /// <param name="index">The zero-based index of the bit to get.</param>
-        /// <returns>
-        /// The value of the specified bit within the byte.
-        /// </returns>
-        public bool GetBit(int index)
-        {
-            if (index < 0 || index > 7)
-            {
-                string message = $"Index must be between 0 and 7. Supplied index: {index}";
-                throw new ArgumentOutOfRangeException(nameof(index), message);
-            }
-
-            return Bits[index];
-        }
-
-        /// <summary>
-        /// Gets the value of the specified bits within the byte.
-        /// </summary>
-        /// <param name="startIndex">The zero-based index of the first bit to get.</param>
-        /// <param name="length">The number of bits to get.</param>
-        /// <returns>
-        /// The value of the specified bits within the byte.
-        /// </returns>
-        public int GetBits(int startIndex, int length)
-        {
-            if (startIndex < 0 || startIndex > 7)
-            {
-                string message = $"Start index must be between 0 and 7. Supplied index: {startIndex}";
-                throw new ArgumentOutOfRangeException(nameof(startIndex), message);
-            }
-
-            if (length < 1 || startIndex + length > 8)
-            {
-                string message = "Length must be greater than zero and the sum of length and start index must be less than 8. "
-                                 + $"Supplied length: {length}. Supplied start index: {startIndex}";
-
-                throw new ArgumentOutOfRangeException(nameof(length), message);
-            }
-
-            int returnValue = 0;
-            int bitShift = length - 1;
-            for (int i = startIndex; i < startIndex + length; i++)
-            {
-                int bitValue = (Bits[i] ? 1 : 0) << bitShift;
-                returnValue += bitValue;
-                bitShift--;
-            }
-
-            return returnValue;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            PackedField? field = obj as PackedField?;
-
-            return this.Byte == field?.Byte;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(PackedField other)
-        {
-            return this.Byte.Equals(other.Byte);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"PackedField [ Byte={this.Byte} ]";
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.Byte.GetHashCode();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Gif/README.md b/src/ImageSharp46/Formats/Gif/README.md
deleted file mode 100644
index d47a4c683..000000000
--- a/src/ImageSharp46/Formats/Gif/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Encoder/Decoder adapted and extended from:
-
-https://github.com/yufeih/Nine.Imaging/
-https://imagetools.codeplex.com/
diff --git a/src/ImageSharp46/Formats/Gif/Sections/GifGraphicsControlExtension.cs b/src/ImageSharp46/Formats/Gif/Sections/GifGraphicsControlExtension.cs
deleted file mode 100644
index 79d98f5fb..000000000
--- a/src/ImageSharp46/Formats/Gif/Sections/GifGraphicsControlExtension.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <copyright file="GifGraphicsControlExtension.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// The Graphic Control Extension contains parameters used when
-    /// processing a graphic rendering block.
-    /// </summary>
-    internal sealed class GifGraphicsControlExtension
-    {
-        /// <summary>
-        /// Gets or sets the disposal method which indicates the way in which the
-        /// graphic is to be treated after being displayed.
-        /// </summary>
-        public DisposalMethod DisposalMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether transparency flag is to be set.
-        /// This indicates whether a transparency index is given in the Transparent Index field.
-        /// (This field is the least significant bit of the byte.)
-        /// </summary>
-        public bool TransparencyFlag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transparency index.
-        /// The Transparency Index is such that when encountered, the corresponding pixel
-        /// of the display device is not modified and processing goes on to the next pixel.
-        /// </summary>
-        public int TransparencyIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the delay time.
-        /// If not 0, this field specifies the number of hundredths (1/100) of a second to
-        /// wait before continuing with the processing of the Data Stream.
-        /// The clock starts ticking immediately after the graphic is rendered.
-        /// </summary>
-        public int DelayTime { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/Sections/GifImageDescriptor.cs b/src/ImageSharp46/Formats/Gif/Sections/GifImageDescriptor.cs
deleted file mode 100644
index 12c13beaf..000000000
--- a/src/ImageSharp46/Formats/Gif/Sections/GifImageDescriptor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="GifImageDescriptor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Each image in the Data Stream is composed of an Image Descriptor,
-    /// an optional Local Color Table, and the image data.
-    /// Each image must fit within the boundaries of the
-    /// Logical Screen, as defined in the Logical Screen Descriptor.
-    /// </summary>
-    internal sealed class GifImageDescriptor
-    {
-        /// <summary>
-        /// Gets or sets the column number, in pixels, of the left edge of the image,
-        /// with respect to the left edge of the Logical Screen.
-        /// Leftmost column of the Logical Screen is 0.
-        /// </summary>
-        public short Left { get; set; }
-
-        /// <summary>
-        /// Gets or sets the row number, in pixels, of the top edge of the image with
-        /// respect to the top edge of the Logical Screen.
-        /// Top row of the Logical Screen is 0.
-        /// </summary>
-        public short Top { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width of the image in pixels.
-        /// </summary>
-        public short Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height of the image in pixels.
-        /// </summary>
-        public short Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the presence of a Local Color Table immediately
-        /// follows this Image Descriptor.
-        /// </summary>
-        public bool LocalColorTableFlag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the local color table size.
-        /// If the Local Color Table Flag is set to 1, the value in this field
-        /// is used to calculate the number of bytes contained in the Local Color Table.
-        /// </summary>
-        public int LocalColorTableSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the image is to be interlaced.
-        /// An image is interlaced in a four-pass interlace pattern.
-        /// </summary>
-        public bool InterlaceFlag { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs b/src/ImageSharp46/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs
deleted file mode 100644
index fc2cc974a..000000000
--- a/src/ImageSharp46/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// <copyright file="GifLogicalScreenDescriptor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// The Logical Screen Descriptor contains the parameters
-    /// necessary to define the area of the display device
-    /// within which the images will be rendered
-    /// </summary>
-    internal sealed class GifLogicalScreenDescriptor
-    {
-        /// <summary>
-        /// Gets or sets the width, in pixels, of the Logical Screen where the images will
-        /// be rendered in the displaying device.
-        /// </summary>
-        public short Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height, in pixels, of the Logical Screen where the images will be
-        /// rendered in the displaying device.
-        /// </summary>
-        public short Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index at the Global Color Table for the Background Color.
-        /// The Background Color is the color used for those
-        /// pixels on the screen that are not covered by an image.
-        /// </summary>
-        public byte BackgroundColorIndex { get; set; }
-
-        /// <summary>
-        /// Gets or sets the pixel aspect ratio. Default to 0.
-        /// </summary>
-        public byte PixelAspectRatio { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether a flag denoting the presence of a Global Color Table
-        /// should be set.
-        /// If the flag is set, the Global Color Table will immediately
-        /// follow the Logical Screen Descriptor.
-        /// </summary>
-        public bool GlobalColorTableFlag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the global color table size.
-        /// If the Global Color Table Flag is set to 1,
-        /// the value in this field is used to calculate the number of
-        /// bytes contained in the Global Color Table.
-        /// </summary>
-        public int GlobalColorTableSize { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/IImageDecoder.cs b/src/ImageSharp46/Formats/IImageDecoder.cs
deleted file mode 100644
index 36ef23398..000000000
--- a/src/ImageSharp46/Formats/IImageDecoder.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// <copyright file="IImageDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System.IO;
-
-    /// <summary>
-    /// Encapsulates properties and methods required for decoding an image from a stream.
-    /// </summary>
-    public interface IImageDecoder
-    {
-        /// <summary>
-        /// Gets the size of the header for this image type.
-        /// </summary>
-        /// <value>The size of the header.</value>
-        int HeaderSize { get; }
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="extension">The <see cref="string"/> containing the file extension.</param>
-        /// <returns>
-        /// True if the decoder supports the file extension; otherwise, false.
-        /// </returns>
-        bool IsSupportedFileExtension(string extension);
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="header">The <see cref="T:byte[]"/> containing the file header.</param>
-        /// <returns>
-        /// True if the decoder supports the file header; otherwise, false.
-        /// </returns>
-        bool IsSupportedFileFormat(byte[] header);
-
-        /// <summary>
-        /// Decodes the image from the specified stream to the <see cref="ImageBase{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to decode to.</param>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct;
-    }
-}
diff --git a/src/ImageSharp46/Formats/IImageEncoder.cs b/src/ImageSharp46/Formats/IImageEncoder.cs
deleted file mode 100644
index 6cb97420c..000000000
--- a/src/ImageSharp46/Formats/IImageEncoder.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// <copyright file="IImageEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System.IO;
-
-    /// <summary>
-    /// Encapsulates properties and methods required for encoding an image to a stream.
-    /// </summary>
-    public interface IImageEncoder
-    {
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        int Quality { get; set; }
-
-        /// <summary>
-        /// Gets the standard identifier used on the Internet to indicate the type of data that a file contains.
-        /// </summary>
-        string MimeType { get; }
-
-        /// <summary>
-        /// Gets the default file extension for this encoder.
-        /// </summary>
-        string Extension { get; }
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageEncoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="extension">The <see cref="string"/> containing the file extension.</param>
-        /// <returns>
-        /// <c>True</c> if the decoder supports the file extension; otherwise, <c>false</c>.
-        /// </returns>
-        bool IsSupportedFileExtension(string extension);
-
-        /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="Image{TColor, TPacked}"/> to encode from.</param>
-        /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct;
-    }
-}
diff --git a/src/ImageSharp46/Formats/IImageFormat.cs b/src/ImageSharp46/Formats/IImageFormat.cs
deleted file mode 100644
index cffc9861a..000000000
--- a/src/ImageSharp46/Formats/IImageFormat.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="IImageFormat.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Encapsulates a supported image format, providing means to encode and decode an image.
-    /// </summary>
-    public interface IImageFormat
-    {
-        /// <summary>
-        /// Gets the image encoder for encoding an image from a stream.
-        /// </summary>
-        IImageEncoder Encoder { get; }
-
-        /// <summary>
-        /// Gets the image decoder for decoding an image from a stream.
-        /// </summary>
-        IImageDecoder Decoder { get; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/Bits.cs b/src/ImageSharp46/Formats/Jpg/Components/Bits.cs
deleted file mode 100644
index 68278e69b..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/Bits.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="Bits.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Holds the unprocessed bits that have been taken from the byte-stream.
-    /// The n least significant bits of a form the unread bits, to be read in MSB to
-    /// LSB order.
-    /// </summary>
-    internal class Bits
-    {
-        /// <summary>
-        /// Gets or sets the accumulator.
-        /// </summary>
-        public uint Accumulator { get; set; }
-
-        /// <summary>
-        /// Gets or sets the mask.
-        /// <![CDATA[mask==1<<(unreadbits-1) when unreadbits>0, with mask==0 when unreadbits==0.]]>
-        /// </summary>
-        public uint Mask { get; set; }
-
-        /// <summary>
-        /// Gets or sets the  number of unread bits in the accumulator.
-        /// </summary>
-        public int UnreadBits { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Jpg/Components/Block.cs b/src/ImageSharp46/Formats/Jpg/Components/Block.cs
deleted file mode 100644
index f41e615b5..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/Block.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// <copyright file="Block.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System;
-using System.Buffers;
-using System.Runtime.CompilerServices;
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents an 8x8 block of coefficients to transform and encode.
-    /// </summary>
-    public struct Block : IDisposable
-    {
-        private static ArrayPool<int> IntArrayPool = ArrayPool<int>.Create(BlockSize, 50);
-
-        /// <summary>
-        /// Gets the size of the block.
-        /// </summary>
-        public const int BlockSize = 64;
-
-        /// <summary>
-        /// The array of block data.
-        /// </summary>
-        public int[] Data;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Block"/> class.
-        /// </summary>
-        //public Block()
-        //{
-        //    this.data = new int[BlockSize];
-        //}
-
-        public void Init()
-        {
-            //this.Data = new int[BlockSize];
-            this.Data = IntArrayPool.Rent(BlockSize);
-        }
-
-        public static Block Create()
-        {
-            var block = new Block();
-            block.Init();
-            return block;
-        }
-
-        public static Block[] CreateArray(int size)
-        {
-            Block[] result = new Block[size];
-            for (int i = 0; i < result.Length; i++)
-            {
-                result[i].Init();
-            }
-            return result;
-        }
-
-        public bool IsInitialized => this.Data != null;
-
-        /// <summary>
-        /// Gets the pixel data at the given block index.
-        /// </summary>
-        /// <param name="index">The index of the data to return.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public int this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get { return this.Data[index]; }
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            set { this.Data[index] = value; }
-        }
-
-        // TODO: Refactor Block.Dispose() callers to always use 'using' or 'finally' statement!
-        public void Dispose()
-        {
-            if (Data != null)
-            {
-                IntArrayPool.Return(Data, true);
-                Data = null;
-            }
-        }
-
-        public static void DisposeAll(Block[] blocks)
-        {
-            for (int i = 0; i < blocks.Length; i++)
-            {
-                blocks[i].Dispose();
-            }
-        }
-
-
-        public void Clear()
-        {
-            for (int i = 0; i < Data.Length; i++)
-            {
-                Data[i] = 0;
-            }
-        }
-
-        public Block Clone()
-        {
-            Block clone = Create();
-            Array.Copy(Data, clone.Data, BlockSize);
-            return clone;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/Bytes.cs b/src/ImageSharp46/Formats/Jpg/Components/Bytes.cs
deleted file mode 100644
index d4159e996..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/Bytes.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// <copyright file="Bytes.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Bytes is a byte buffer, similar to a stream, except that it
-    /// has to be able to unread more than 1 byte, due to byte stuffing.
-    /// Byte stuffing is specified in section F.1.2.3.
-    /// </summary>
-    internal class Bytes
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Bytes"/> class.
-        /// </summary>
-        public Bytes()
-        {
-            this.Buffer = new byte[4096];
-            this.I = 0;
-            this.J = 0;
-            this.UnreadableBytes = 0;
-        }
-
-        /// <summary>
-        /// Gets or sets the buffer.
-        /// buffer[i:j] are the buffered bytes read from the underlying
-        /// stream that haven't yet been passed further on.
-        /// </summary>
-        public byte[] Buffer { get; set; }
-
-        public int I { get; set; }
-
-        public int J { get; set; }
-
-        /// <summary>
-        /// Gets or sets the unreadable bytes. The number of bytes to back up i after
-        /// overshooting. It can be 0, 1 or 2.
-        /// </summary>
-        public int UnreadableBytes { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/Component.cs b/src/ImageSharp46/Formats/Jpg/Components/Component.cs
deleted file mode 100644
index f70dbff3f..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/Component.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="Component.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents a single color component
-    /// </summary>
-    internal struct Component
-    {
-        /// <summary>
-        /// Gets or sets the horizontal sampling factor.
-        /// </summary>
-        public int HorizontalFactor;
-
-        /// <summary>
-        /// Gets or sets the vertical sampling factor.
-        /// </summary>
-        public int VerticalFactor;
-
-        /// <summary>
-        /// Gets or sets the identifier
-        /// </summary>
-        public byte Identifier;
-
-        /// <summary>
-        /// Gets or sets the quantization table destination selector.
-        /// </summary>
-        public byte Selector;
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/FDCT.cs b/src/ImageSharp46/Formats/Jpg/Components/FDCT.cs
deleted file mode 100644
index 13ce80f55..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/FDCT.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// <copyright file="FDCT.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Performs a fast, forward discrete cosine transform against the given block
-    /// decomposing it into 64 orthogonal basis signals.
-    /// </summary>
-    internal class FDCT
-    {
-        // Trigonometric constants in 13-bit fixed point format.
-        // TODO: Rename and describe these.
-        private const int fix_0_298631336 = 2446;
-        private const int fix_0_390180644 = 3196;
-        private const int fix_0_541196100 = 4433;
-        private const int fix_0_765366865 = 6270;
-        private const int fix_0_899976223 = 7373;
-        private const int fix_1_175875602 = 9633;
-        private const int fix_1_501321110 = 12299;
-        private const int fix_1_847759065 = 15137;
-        private const int fix_1_961570560 = 16069;
-        private const int fix_2_053119869 = 16819;
-        private const int fix_2_562915447 = 20995;
-        private const int fix_3_072711026 = 25172;
-
-        /// <summary>
-        /// The number of bits
-        /// </summary>
-        private const int Bits = 13;
-
-        /// <summary>
-        /// The number of bits to shift by on the first pass.
-        /// </summary>
-        private const int Pass1Bits = 2;
-
-        /// <summary>
-        /// The value to shift by
-        /// </summary>
-        private const int CenterJSample = 128;
-
-        /// <summary>
-        /// Performs a forward DCT on an 8x8 block of coefficients, including a level shift.
-        /// </summary>
-        /// <param name="block">The block of coefficients.</param>
-        public static void Transform(ref Block block)
-        {
-            // Pass 1: process rows.
-            for (int y = 0; y < 8; y++)
-            {
-                int y8 = y * 8;
-
-                int x0 = block[y8];
-                int x1 = block[y8 + 1];
-                int x2 = block[y8 + 2];
-                int x3 = block[y8 + 3];
-                int x4 = block[y8 + 4];
-                int x5 = block[y8 + 5];
-                int x6 = block[y8 + 6];
-                int x7 = block[y8 + 7];
-
-                int tmp0 = x0 + x7;
-                int tmp1 = x1 + x6;
-                int tmp2 = x2 + x5;
-                int tmp3 = x3 + x4;
-
-                int tmp10 = tmp0 + tmp3;
-                int tmp12 = tmp0 - tmp3;
-                int tmp11 = tmp1 + tmp2;
-                int tmp13 = tmp1 - tmp2;
-
-                tmp0 = x0 - x7;
-                tmp1 = x1 - x6;
-                tmp2 = x2 - x5;
-                tmp3 = x3 - x4;
-
-                block[y8] = (tmp10 + tmp11 - (8 * CenterJSample)) << Pass1Bits;
-                block[y8 + 4] = (tmp10 - tmp11) << Pass1Bits;
-                int z1 = (tmp12 + tmp13) * fix_0_541196100;
-                z1 += 1 << (Bits - Pass1Bits - 1);
-                block[y8 + 2] = (z1 + (tmp12 * fix_0_765366865)) >> (Bits - Pass1Bits);
-                block[y8 + 6] = (z1 - (tmp13 * fix_1_847759065)) >> (Bits - Pass1Bits);
-
-                tmp10 = tmp0 + tmp3;
-                tmp11 = tmp1 + tmp2;
-                tmp12 = tmp0 + tmp2;
-                tmp13 = tmp1 + tmp3;
-                z1 = (tmp12 + tmp13) * fix_1_175875602;
-                z1 += 1 << (Bits - Pass1Bits - 1);
-                tmp0 = tmp0 * fix_1_501321110;
-                tmp1 = tmp1 * fix_3_072711026;
-                tmp2 = tmp2 * fix_2_053119869;
-                tmp3 = tmp3 * fix_0_298631336;
-                tmp10 = tmp10 * -fix_0_899976223;
-                tmp11 = tmp11 * -fix_2_562915447;
-                tmp12 = tmp12 * -fix_0_390180644;
-                tmp13 = tmp13 * -fix_1_961570560;
-
-                tmp12 += z1;
-                tmp13 += z1;
-                block[y8 + 1] = (tmp0 + tmp10 + tmp12) >> (Bits - Pass1Bits);
-                block[y8 + 3] = (tmp1 + tmp11 + tmp13) >> (Bits - Pass1Bits);
-                block[y8 + 5] = (tmp2 + tmp11 + tmp12) >> (Bits - Pass1Bits);
-                block[y8 + 7] = (tmp3 + tmp10 + tmp13) >> (Bits - Pass1Bits);
-            }
-
-            // Pass 2: process columns.
-            // We remove pass1Bits scaling, but leave results scaled up by an overall factor of 8.
-            for (int x = 0; x < 8; x++)
-            {
-                int tmp0 = block[x] + block[56 + x];
-                int tmp1 = block[8 + x] + block[48 + x];
-                int tmp2 = block[16 + x] + block[40 + x];
-                int tmp3 = block[24 + x] + block[32 + x];
-
-                int tmp10 = tmp0 + tmp3 + (1 << (Pass1Bits - 1));
-                int tmp12 = tmp0 - tmp3;
-                int tmp11 = tmp1 + tmp2;
-                int tmp13 = tmp1 - tmp2;
-
-                tmp0 = block[x] - block[56 + x];
-                tmp1 = block[8 + x] - block[48 + x];
-                tmp2 = block[16 + x] - block[40 + x];
-                tmp3 = block[24 + x] - block[32 + x];
-
-                block[x] = (tmp10 + tmp11) >> Pass1Bits;
-                block[32 + x] = (tmp10 - tmp11) >> Pass1Bits;
-
-                int z1 = (tmp12 + tmp13) * fix_0_541196100;
-                z1 += 1 << (Bits + Pass1Bits - 1);
-                block[16 + x] = (z1 + (tmp12 * fix_0_765366865)) >> (Bits + Pass1Bits);
-                block[48 + x] = (z1 - (tmp13 * fix_1_847759065)) >> (Bits + Pass1Bits);
-
-                tmp10 = tmp0 + tmp3;
-                tmp11 = tmp1 + tmp2;
-                tmp12 = tmp0 + tmp2;
-                tmp13 = tmp1 + tmp3;
-                z1 = (tmp12 + tmp13) * fix_1_175875602;
-                z1 += 1 << (Bits + Pass1Bits - 1);
-                tmp0 = tmp0 * fix_1_501321110;
-                tmp1 = tmp1 * fix_3_072711026;
-                tmp2 = tmp2 * fix_2_053119869;
-                tmp3 = tmp3 * fix_0_298631336;
-                tmp10 = tmp10 * -fix_0_899976223;
-                tmp11 = tmp11 * -fix_2_562915447;
-                tmp12 = tmp12 * -fix_0_390180644;
-                tmp13 = tmp13 * -fix_1_961570560;
-
-                tmp12 += z1;
-                tmp13 += z1;
-                block[8 + x] = (tmp0 + tmp10 + tmp12) >> (Bits + Pass1Bits);
-                block[24 + x] = (tmp1 + tmp11 + tmp13) >> (Bits + Pass1Bits);
-                block[40 + x] = (tmp2 + tmp11 + tmp12) >> (Bits + Pass1Bits);
-                block[56 + x] = (tmp3 + tmp10 + tmp13) >> (Bits + Pass1Bits);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/FloatIDCT.cs b/src/ImageSharp46/Formats/Jpg/Components/FloatIDCT.cs
deleted file mode 100644
index 5f2bd68b9..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/FloatIDCT.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using System.Buffers;
-
-namespace ImageSharp.Formats
-{
-    internal class FloatIDCT
-    {
-        //private float[] _temp = new float[64];
-
-        // Cosine matrix and transposed cosine matrix
-        private static readonly float[] c = buildC();
-        private static readonly float[] cT = buildCT();
-
-        internal FloatIDCT()
-        {
-#if DYNAMIC_IDCT
-            dynamicIDCT = dynamicIDCT ?? EmitIDCT();
-#endif
-        }
-
-        /// <summary>
-        /// Precomputes cosine terms in A.3.3 of 
-        /// http://www.w3.org/Graphics/JPEG/itu-t81.pdf
-        /// 
-        /// Closely follows the term precomputation in the
-        /// Java Advanced Imaging library.
-        /// </summary>
-        private static float[] buildC()
-        {
-            float[] c = new float[64];
-
-            for (int i = 0; i < 8; i++) // i == u or v
-            {
-                for (int j = 0; j < 8; j++) // j == x or y
-                {
-                    c[i*8 + j] = i == 0 ?
-                        0.353553391f : /* 1 / SQRT(8) */
-                        (float)(0.5 * Math.Cos(((2.0 * j + 1) * i * Math.PI) / 16.0));
-                }
-            }
-
-            return c;
-        }
-        private static float[] buildCT()
-        {
-            // Transpose i,k <-- j,i
-            float[] cT = new float[64];
-            for (int i = 0; i < 8; i++)
-                for (int j = 0; j < 8; j++)
-                    cT[j * 8 + i] = c[i * 8 + j];
-            return cT;
-        }
-
-        public static void SetValueClipped(byte[,] arr, int i, int j, float val)
-        {
-            // Clip into the 0...255 range & round
-            arr[i, j] = val < 0 ? (byte)0
-                : val > 255 ? (byte)255
-                    : (byte)(val + 0.5);
-        }
-
-        public static void Transform(ref Block block) => FastIDCT(block.Data);
-
-        /// See figure A.3.3 IDCT (informative) on A-5.
-        /// http://www.w3.org/Graphics/JPEG/itu-t81.pdf
-        public static void FastIDCT(int[] output)
-        {
-            //byte[,] output = new byte[8, 8];
-            //int[] output = new int[64];
-
-            float[] _temp = ArrayPool<float>.Shared.Rent(64);
-
-            float[] input = ArrayPool<float>.Shared.Rent(64);
-
-            for (int i = 0; i < output.Length; i++)
-            {
-                input[i] = output[i];
-            }
-
-            float temp, val = 0;
-            int idx = 0;
-            for (int i = 0; i < 8; i++)
-            {
-                int i8 = i * 8;
-                for (int j = 0; j < 8; j++)
-                {
-                    val = 0;
-
-                    for (int k = 0; k < 8; k++)
-                    {
-                        val += input[i8 + k] * c[k*8 + j];
-                    }
-
-                    _temp[idx++] = val;
-                }
-            }
-            for (int i = 0; i < 8; i++)
-            {
-                int i8 = i*8;
-                for (int j = 0; j < 8; j++)
-                {
-                    temp = 128f;
-
-                    for (int k = 0; k < 8; k++)
-                    {
-                        temp += cT[i*8 + k] * _temp[k * 8 + j];
-                    }
-
-                    if (temp < 0) output[i8 + j] = 0;
-                    else if (temp > 255) output[i8+ j] = 255;
-                    else output[i8 + j] = (int)(temp + 0.5); // Implements rounding
-                }
-            }
-            
-            ArrayPool<float>.Shared.Return(input, true);
-            ArrayPool<float>.Shared.Return(_temp, true);
-        }
-
-
-
-#if DYNAMIC_IDCT
-
-/// <summary>
-/// Generates a pure-IL nonbranching stream of instructions
-/// that perform the inverse DCT.  Relies on helper function
-/// SetValueClipped.
-/// </summary>
-/// <returns>A delegate to the DynamicMethod</returns>
-        private static IDCTFunc EmitIDCT()
-        {
-            Type[] args = { typeof(float[]), typeof(float[]), typeof(byte[,]) };
-
-            DynamicMethod idctMethod = new DynamicMethod("dynamicIDCT",
-                null,        // no return type
-                args); // input arrays
-
-            ILGenerator il = idctMethod.GetILGenerator();
-
-            int idx = 0;
-
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    il.Emit(OpCodes.Ldarg_1);                           // 1  {temp}
-                    il.Emit(OpCodes.Ldc_I4_S, (short)idx++);            // 3  {temp, idx}
-
-                    for (int k = 0; k < 8; k++)
-                    {
-                        il.Emit(OpCodes.Ldarg_0);                       // {in} 
-                        il.Emit(OpCodes.Ldc_I4_S, (short)(i * 8 + k));  // {in,idx}
-                        il.Emit(OpCodes.Ldelem_R4);                     // {in[idx]}
-                        il.Emit(OpCodes.Ldc_R4, c[k, j]);               // {in[idx],c[k,j]}
-                        il.Emit(OpCodes.Mul);                           // {in[idx]*c[k,j]}
-                        if (k != 0) il.Emit(OpCodes.Add);
-                    }
-
-                    il.Emit(OpCodes.Stelem_R4);                         // {}
-                }
-            }
-
-            var meth = typeof(DCT).GetMethod("SetValueClipped",
-                BindingFlags.Static | BindingFlags.Public, null,
-                CallingConventions.Standard,
-                new Type[] { 
-                    typeof(byte[,]),    // arr
-                    typeof(int),        // i
-                    typeof(int),        // j
-                    typeof(float) }     // val
-                , null);
-
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    il.Emit(OpCodes.Ldarg_2);               //   {output}
-                    il.Emit(OpCodes.Ldc_I4_S, (short)i);    //   {output,i}
-                    il.Emit(OpCodes.Ldc_I4_S, (short)j);    // X={output,i,j}
-
-                    il.Emit(OpCodes.Ldc_R4, 128.0f);        // {X,128.0f}
-
-                    for (int k = 0; k < 8; k++)
-                    {
-                        il.Emit(OpCodes.Ldarg_1);           // {X,temp} 
-                        il.Emit(OpCodes.Ldc_I4_S,
-                            (short)(k * 8 + j));            // {X,temp,idx}
-                        il.Emit(OpCodes.Ldelem_R4);         // {X,temp[idx]}
-                        il.Emit(OpCodes.Ldc_R4, cT[i, k]);  // {X,temp[idx],cT[i,k]}
-                        il.Emit(OpCodes.Mul);               // {X,in[idx]*c[k,j]}
-                        il.Emit(OpCodes.Add);
-                    }
-
-                    il.EmitCall(OpCodes.Call, meth, null);
-                }
-            }
-
-            il.Emit(OpCodes.Ret);
-
-            return (IDCTFunc)idctMethod.CreateDelegate(typeof(IDCTFunc));
-        }
-
-        private delegate void IDCTFunc(float[] input, float[] temp, byte[,] output);
-        private static IDCTFunc dynamicIDCT = null;
-#endif
-
-
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Jpg/Components/GrayImage.cs b/src/ImageSharp46/Formats/Jpg/Components/GrayImage.cs
deleted file mode 100644
index 5f5f015ad..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/GrayImage.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// <copyright file="GrayImage.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents a grayscale image
-    /// </summary>
-    internal class GrayImage
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GrayImage"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        public GrayImage(int width, int height)
-        {
-            this.Width = width;
-            this.Height = height;
-            this.Pixels = new byte[width * height];
-            this.Stride = width;
-            this.Offset = 0;
-        }
-
-        /// <summary>
-        /// Prevents a default instance of the <see cref="GrayImage"/> class from being created.
-        /// </summary>
-        private GrayImage()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the pixels.
-        /// </summary>
-        public byte[] Pixels { get; set; }
-
-        /// <summary>
-        /// Gets or sets the stride.
-        /// </summary>
-        public int Stride { get; set; }
-
-        /// <summary>
-        /// Gets or sets the horizontal position.
-        /// </summary>
-        public int X { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vertical position.
-        /// </summary>
-        public int Y { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the offset
-        /// </summary>
-        public int Offset { get; set; }
-
-        /// <summary>
-        /// Gets an image made up of a subset of the originals pixels.
-        /// </summary>
-        /// <param name="x">The x-coordinate of the image.</param>
-        /// <param name="y">The y-coordinate of the image.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <returns>
-        /// The <see cref="GrayImage"/>.
-        /// </returns>
-        public GrayImage Subimage(int x, int y, int width, int height)
-        {
-            return new GrayImage
-            {
-                Width = width,
-                Height = height,
-                Pixels = this.Pixels,
-                Stride = this.Stride,
-                Offset = (y * this.Stride) + x
-            };
-        }
-
-        /// <summary>
-        /// Gets the row offset at the given position
-        /// </summary>
-        /// <param name="y">The y-coordinate of the image.</param>
-        /// <returns>The <see cref="int"/></returns>
-        public int GetRowOffset(int y)
-        {
-            return this.Offset + (y * this.Stride);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/Huffman.cs b/src/ImageSharp46/Formats/Jpg/Components/Huffman.cs
deleted file mode 100644
index 345b45e0e..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/Huffman.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// <copyright file="Huffman.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System;
-using System.Buffers;
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents a Huffman tree
-    /// </summary>
-    internal struct Huffman : IDisposable
-    {
-        private static ArrayPool<ushort> UshortBuffer =
-            //ArrayPool<ushort>.Shared;
-            ArrayPool<ushort>.Create(1 << JpegDecoderCore.LutSize, 50);
-
-        private static ArrayPool<byte> ByteBuffer = 
-            //ArrayPool<byte>.Shared;
-            ArrayPool<byte>.Create(JpegDecoderCore.MaxNCodes, 50);
-
-        private static readonly ArrayPool<int> IntBuffer =
-            //ArrayPool<int>.Shared;
-            ArrayPool<int>.Create(JpegDecoderCore.MaxCodeLength, 50);
-
-        public void Init(int lutSize, int maxNCodes, int maxCodeLength)
-        {
-            //this.Lut = new ushort[1 << lutSize];
-            //this.Values = new byte[maxNCodes];
-            //this.MinCodes = new int[maxCodeLength];
-            //this.MaxCodes = new int[maxCodeLength];
-            //this.Indices = new int[maxCodeLength];
-
-            this.Lut = UshortBuffer.Rent(1 << lutSize);
-            this.Values = ByteBuffer.Rent(maxNCodes);
-            this.MinCodes = IntBuffer.Rent(maxCodeLength);
-            this.MaxCodes = IntBuffer.Rent(maxCodeLength); ;
-            this.Indices = IntBuffer.Rent(maxCodeLength); ;
-        }
-
-        /// <summary>
-        /// Gets or sets the number of codes in the tree.
-        /// </summary>
-        public int Length;
-
-        /// <summary>
-        /// Gets the look-up table for the next LutSize bits in the bit-stream.
-        /// The high 8 bits of the uint16 are the encoded value. The low 8 bits
-        /// are 1 plus the code length, or 0 if the value is too large to fit in
-        /// lutSize bits.
-        /// </summary>
-        public ushort[] Lut;
-
-        /// <summary>
-        /// Gets the the decoded values, sorted by their encoding.
-        /// </summary>
-        public byte[] Values;
-
-        /// <summary>
-        /// Gets the array of minimum codes.
-        /// MinCodes[i] is the minimum code of length i, or -1 if there are no codes of that length.
-        /// </summary>
-        public int[] MinCodes;
-
-        /// <summary>
-        /// Gets the array of maximum codes.
-        /// MaxCodes[i] is the maximum code of length i, or -1 if there are no codes of that length.
-        /// </summary>
-        public int[] MaxCodes;
-
-        /// <summary>
-        /// Gets the array of indices. Indices[i] is the index into Values of MinCodes[i].
-        /// </summary>
-        public int[] Indices;
-
-        public void Dispose()
-        {
-            UshortBuffer.Return(Lut, true);
-            ByteBuffer.Return(Values, true);
-            IntBuffer.Return(MinCodes, true);
-            IntBuffer.Return(MaxCodes, true);
-            IntBuffer.Return(Indices, true);
-        }
-    }
-
-    
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Jpg/Components/IDCT.cs b/src/ImageSharp46/Formats/Jpg/Components/IDCT.cs
deleted file mode 100644
index 88b493c4b..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/IDCT.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// <copyright file="IDCT.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Numerics;
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Performs a 2-D Inverse Discrete Cosine Transformation.
-    /// </summary>
-    internal class IDCT
-    {
-        private const int w1 = 2841; // 2048*sqrt(2)*cos(1*pi/16)
-        private const int w2 = 2676; // 2048*sqrt(2)*cos(2*pi/16)
-        private const int w3 = 2408; // 2048*sqrt(2)*cos(3*pi/16)
-        private const int w5 = 1609; // 2048*sqrt(2)*cos(5*pi/16)
-        private const int w6 = 1108; // 2048*sqrt(2)*cos(6*pi/16)
-        private const int w7 = 565;  // 2048*sqrt(2)*cos(7*pi/16)
-
-        private const int w1pw7 = w1 + w7;
-        private const int w1mw7 = w1 - w7;
-        private const int w2pw6 = w2 + w6;
-        private const int w2mw6 = w2 - w6;
-        private const int w3pw5 = w3 + w5;
-        private const int w3mw5 = w3 - w5;
-
-        private const int r2 = 181; // 256/sqrt(2)
-
-        /// <summary>
-        /// Performs a 2-D Inverse Discrete Cosine Transformation.
-        /// <para>
-        /// The input coefficients should already have been multiplied by the
-        /// appropriate quantization table. We use fixed-point computation, with the
-        /// number of bits for the fractional component varying over the intermediate
-        /// stages.
-        /// </para>
-        /// For more on the actual algorithm, see Z. Wang, "Fast algorithms for the
-        /// discrete W transform and for the discrete Fourier transform", IEEE Trans. on
-        /// ASSP, Vol. ASSP- 32, pp. 803-816, Aug. 1984.
-        /// </summary>
-        /// <param name="src">The source block of coefficients</param>
-        public static void Transform(ref Block src)
-        {
-            // Horizontal 1-D IDCT.
-            for (int y = 0; y < 8; y++)
-            {
-                int y8 = y * 8;
-
-                // If all the AC components are zero, then the IDCT is trivial.
-                if (src[y8 + 1] == 0 && src[y8 + 2] == 0 && src[y8 + 3] == 0 &&
-                    src[y8 + 4] == 0 && src[y8 + 5] == 0 && src[y8 + 6] == 0 && src[y8 + 7] == 0)
-                {
-                    int dc = src[y8 + 0] << 3;
-                    src[y8 + 0] = dc;
-                    src[y8 + 1] = dc;
-                    src[y8 + 2] = dc;
-                    src[y8 + 3] = dc;
-                    src[y8 + 4] = dc;
-                    src[y8 + 5] = dc;
-                    src[y8 + 6] = dc;
-                    src[y8 + 7] = dc;
-                    continue;
-                }
-
-                // Prescale.
-                int x0 = (src[y8 + 0] << 11) + 128;
-                int x1 = src[y8 + 4] << 11;
-                int x2 = src[y8 + 6];
-                int x3 = src[y8 + 2];
-                int x4 = src[y8 + 1];
-                int x5 = src[y8 + 7];
-                int x6 = src[y8 + 5];
-                int x7 = src[y8 + 3];
-
-                // Stage 1.
-                int x8 = w7 * (x4 + x5);
-                x4 = x8 + (w1mw7 * x4);
-                x5 = x8 - (w1pw7 * x5);
-                x8 = w3 * (x6 + x7);
-                x6 = x8 - (w3mw5 * x6);
-                x7 = x8 - (w3pw5 * x7);
-
-                // Stage 2.
-                x8 = x0 + x1;
-                x0 -= x1;
-                x1 = w6 * (x3 + x2);
-                x2 = x1 - (w2pw6 * x2);
-                x3 = x1 + (w2mw6 * x3);
-                x1 = x4 + x6;
-                x4 -= x6;
-                x6 = x5 + x7;
-                x5 -= x7;
-
-                // Stage 3.
-                x7 = x8 + x3;
-                x8 -= x3;
-                x3 = x0 + x2;
-                x0 -= x2;
-                x2 = ((r2 * (x4 + x5)) + 128) >> 8;
-                x4 = ((r2 * (x4 - x5)) + 128) >> 8;
-
-                // Stage 4.
-                src[y8 + 0] = (x7 + x1) >> 8;
-                src[y8 + 1] = (x3 + x2) >> 8;
-                src[y8 + 2] = (x0 + x4) >> 8;
-                src[y8 + 3] = (x8 + x6) >> 8;
-                src[y8 + 4] = (x8 - x6) >> 8;
-                src[y8 + 5] = (x0 - x4) >> 8;
-                src[y8 + 6] = (x3 - x2) >> 8;
-                src[y8 + 7] = (x7 - x1) >> 8;
-            }
-
-            // Vertical 1-D IDCT.
-            for (int x = 0; x < 8; x++)
-            {
-                // Similar to the horizontal 1-D IDCT case, if all the AC components are zero, then the IDCT is trivial.
-                // However, after performing the horizontal 1-D IDCT, there are typically non-zero AC components, so
-                // we do not bother to check for the all-zero case.
-
-                // Prescale.
-                int y0 = (src[x] << 8) + 8192;
-                int y1 = src[32 + x] << 8;
-                int y2 = src[48 + x];
-                int y3 = src[16 + x];
-                int y4 = src[8 + x];
-                int y5 = src[56 + x];
-                int y6 = src[40 + x];
-                int y7 = src[24 + x];
-
-                // Stage 1.
-                int y8 = (w7 * (y4 + y5)) + 4;
-                y4 = (y8 + (w1mw7 * y4)) >> 3;
-                y5 = (y8 - (w1pw7 * y5)) >> 3;
-                y8 = (w3 * (y6 + y7)) + 4;
-                y6 = (y8 - (w3mw5 * y6)) >> 3;
-                y7 = (y8 - (w3pw5 * y7)) >> 3;
-
-                // Stage 2.
-                y8 = y0 + y1;
-                y0 -= y1;
-                y1 = (w6 * (y3 + y2)) + 4;
-                y2 = (y1 - (w2pw6 * y2)) >> 3;
-                y3 = (y1 + (w2mw6 * y3)) >> 3;
-                y1 = y4 + y6;
-                y4 -= y6;
-                y6 = y5 + y7;
-                y5 -= y7;
-
-                // Stage 3.
-                y7 = y8 + y3;
-                y8 -= y3;
-                y3 = y0 + y2;
-                y0 -= y2;
-                y2 = ((r2 * (y4 + y5)) + 128) >> 8;
-                y4 = ((r2 * (y4 - y5)) + 128) >> 8;
-
-                // Stage 4.
-                src[x] = (y7 + y1) >> 14;
-                src[8 + x] = (y3 + y2) >> 14;
-                src[16 + x] = (y0 + y4) >> 14;
-                src[24 + x] = (y8 + y6) >> 14;
-                src[32 + x] = (y8 - y6) >> 14;
-                src[40 + x] = (y0 - y4) >> 14;
-                src[48 + x] = (y3 - y2) >> 14;
-                src[56 + x] = (y7 - y1) >> 14;
-            }
-        }
-
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/Components/MagicDCT.cs b/src/ImageSharp46/Formats/Jpg/Components/MagicDCT.cs
deleted file mode 100644
index 6c71ec92e..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/MagicDCT.cs
+++ /dev/null
@@ -1,572 +0,0 @@
-using System;
-using System.Buffers;
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace ImageSharp.Formats
-{
-    public struct Span<T>
-        where T : struct
-    {
-        public T[] Data;
-        public int Offset;
-
-        public Span(int size, int offset = 0)
-        {
-            Data = new T[size];
-            Offset = offset;
-        }
-
-        public Span(T[] data, int offset = 0)
-        {
-            Data = data;
-            Offset = offset;
-        }
-
-        public T this[int idx]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)] get { return Data[idx + Offset]; }
-            [MethodImpl(MethodImplOptions.AggressiveInlining)] set { Data[idx + Offset] = value; }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<T> Slice(int offset)
-        {
-            return new Span<T>(Data, Offset + offset);
-        }
-
-        public static implicit operator Span<T>(T[] data) => new Span<T>(data, 0);
-
-        private static readonly ArrayPool<T> Pool = ArrayPool<T>.Create(128, 10);
-
-        public static Span<T> RentFromPool(int size, int offset = 0)
-        {
-            return new Span<T>(Pool.Rent(size), offset);
-        }
-
-        public void ReturnToPool()
-        {
-            Pool.Return(Data, true);
-            Data = null;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void AddOffset(int offset)
-        {
-            Offset += offset;
-        }
-    }
-
-    public static class MagicDCT
-    {
-        private static readonly ArrayPool<float> FloatArrayPool = ArrayPool<float>.Create(Block.BlockSize, 50);
-       
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Matrix4x4 Load(Span<float> src, int x, int y)
-        {
-            int b0 = y*8 + x;
-            y++;
-            int b1 = y*8 + x;
-            y++;
-            int b2 = y*8 + x;
-            y++;
-            int b3 = y*8 + x;
-
-            return new Matrix4x4(
-                src[b0], src[b0 + 1], src[b0 + 2], src[b0 + 3],
-                src[b1], src[b1 + 1], src[b1 + 2], src[b1 + 3],
-                src[b2], src[b2 + 1], src[b2 + 2], src[b2 + 3],
-                src[b3], src[b3 + 1], src[b3 + 2], src[b3 + 3]
-            );
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Store(Matrix4x4 s, Span<float> d, int x, int y)
-        {
-            int b0 = y*8 + x;
-            y++;
-            int b1 = y*8 + x;
-            y++;
-            int b2 = y*8 + x;
-            y++;
-            int b3 = y*8 + x;
-
-            d[b0] = s.M11;
-            d[b0 + 1] = s.M12;
-            d[b0 + 2] = s.M13;
-            d[b0 + 3] = s.M14;
-            d[b1] = s.M21;
-            d[b1 + 1] = s.M22;
-            d[b1 + 2] = s.M23;
-            d[b1 + 3] = s.M24;
-            d[b2] = s.M31;
-            d[b2 + 1] = s.M32;
-            d[b2 + 2] = s.M33;
-            d[b2 + 3] = s.M34;
-            d[b3] = s.M41;
-            d[b3 + 1] = s.M42;
-            d[b3 + 2] = s.M43;
-            d[b3 + 3] = s.M44;
-        }
-
-        public static void Transpose8x8_SSE_Slow(Span<float> data)
-        {
-            Matrix4x4 a11 = Load(data, 0, 0);
-            Matrix4x4 a12 = Load(data, 4, 0);
-            Matrix4x4 a21 = Load(data, 0, 4);
-            Matrix4x4 a22 = Load(data, 4, 4);
-
-            a11 = Matrix4x4.Transpose(a11);
-            a12 = Matrix4x4.Transpose(a12);
-            a21 = Matrix4x4.Transpose(a21);
-            a22 = Matrix4x4.Transpose(a22);
-
-            Store(a11, data, 0, 0);
-            Store(a21, data, 4, 0);
-            Store(a12, data, 0, 4);
-            Store(a22, data, 4, 4);
-        }
-
-        public static void Transpose8x8_SSE_Slow(Span<float> src, Span<float> dest)
-        {
-            Matrix4x4 a11 = Load(src, 0, 0);
-            Matrix4x4 a12 = Load(src, 4, 0);
-            Matrix4x4 a21 = Load(src, 0, 4);
-            Matrix4x4 a22 = Load(src, 4, 4);
-
-            a11 = Matrix4x4.Transpose(a11);
-            a12 = Matrix4x4.Transpose(a12);
-            a21 = Matrix4x4.Transpose(a21);
-            a22 = Matrix4x4.Transpose(a22);
-
-            Store(a11, dest, 0, 0);
-            Store(a21, dest, 4, 0);
-            Store(a12, dest, 0, 4);
-            Store(a22, dest, 4, 4);
-        }
-
-        public static void Transpose8x8(Span<float> data)
-        {
-            for (int i = 1; i < 8; i++)
-            {
-                int i8 = i*8;
-                for (int j = 0; j < i; j++)
-                {
-                    float tmp = data[i8 + j];
-                    data[i8 + j] = data[j*8 + i];
-                    data[j*8 + i] = tmp;
-                }
-            }
-        }
-
-        public static void Transpose8x8(Span<float> src, Span<float> dest)
-        {
-            for (int i = 0; i < 8; i++)
-            {
-                int i8 = i*8;
-                for (int j = 0; j < 8; j++)
-                {
-                    dest[j*8 + i] = src[i8 + j];
-                }
-            }
-
-            //Matrix4x4 a11 = Load(src, 0, 0);
-            //Matrix4x4 a12 = Load(src, 4, 0);
-            //Matrix4x4 a21 = Load(src, 0, 4);
-            //Matrix4x4 a22 = Load(src, 4, 4);
-
-            //a11 = Matrix4x4.Transpose(a11);
-            //a12 = Matrix4x4.Transpose(a12);
-            //a21 = Matrix4x4.Transpose(a21);
-            //a22 = Matrix4x4.Transpose(a22);
-
-            //Store(a11, dest, 0, 0);
-            //Store(a21, dest, 4, 0);
-            //Store(a12, dest, 0, 4);
-            //Store(a22, dest, 4, 4);
-        }
-
-        public static void iDCT1Dllm_32f(Span<float> y, Span<float> x)
-        {
-            float a0, a1, a2, a3, b0, b1, b2, b3;
-            float z0, z1, z2, z3, z4;
-
-            float r0 = 1.414214f;
-            float r1 = 1.387040f;
-            float r2 = 1.306563f;
-            float r3 = 1.175876f;
-            float r4 = 1.000000f;
-            float r5 = 0.785695f;
-            float r6 = 0.541196f;
-            float r7 = 0.275899f;
-
-            z0 = y[1] + y[7];
-            z1 = y[3] + y[5];
-            z2 = y[3] + y[7];
-            z3 = y[1] + y[5];
-            z4 = (z0 + z1)*r3;
-
-            z0 = z0*(-r3 + r7);
-            z1 = z1*(-r3 - r1);
-            z2 = z2*(-r3 - r5) + z4;
-            z3 = z3*(-r3 + r5) + z4;
-
-            b3 = y[7]*(-r1 + r3 + r5 - r7) + z0 + z2;
-            b2 = y[5]*(r1 + r3 - r5 + r7) + z1 + z3;
-            b1 = y[3]*(r1 + r3 + r5 - r7) + z1 + z2;
-            b0 = y[1]*(r1 + r3 - r5 - r7) + z0 + z3;
-
-            z4 = (y[2] + y[6])*r6;
-            z0 = y[0] + y[4];
-            z1 = y[0] - y[4];
-            z2 = z4 - y[6]*(r2 + r6);
-            z3 = z4 + y[2]*(r2 - r6);
-            a0 = z0 + z3;
-            a3 = z0 - z3;
-            a1 = z1 + z2;
-            a2 = z1 - z2;
-
-            x[0] = a0 + b0;
-            x[7] = a0 - b0;
-            x[1] = a1 + b1;
-            x[6] = a1 - b1;
-            x[2] = a2 + b2;
-            x[5] = a2 - b2;
-            x[3] = a3 + b3;
-            x[4] = a3 - b3;
-        }
-
-        public static void iDCT2D_llm(Span<float> s, Span<float> d, Span<float> temp)
-        {
-            int j;
-
-            for (j = 0; j < 8; j++)
-            {
-                iDCT1Dllm_32f(s.Slice(j*8), temp.Slice(j*8));
-            }
-
-            Transpose8x8(temp, d);
-
-            for (j = 0; j < 8; j++)
-            {
-                iDCT1Dllm_32f(d.Slice(j*8), temp.Slice(j*8));
-            }
-
-            Transpose8x8(temp, d);
-
-            for (j = 0; j < 64; j++)
-            {
-                d[j] *= 0.125f;
-            }
-        }
-
-        public static void IDCT(ref Block block)
-        {
-            Span<float> src = Span<float>.RentFromPool(64);
-
-            for (int i = 0; i < 64; i++)
-            {
-                src[i] = block[i];
-            }
-
-            Span<float> dest = Span<float>.RentFromPool(64);
-            Span<float> temp  = Span<float>.RentFromPool(64);
-            
-            //iDCT2D_llm(src, dest, temp);
-            //iDCT8x8GT(src, dest);
-            iDCT8x8_llm_sse(src, dest, temp);
-
-            for (int i = 0; i < 64; i++)
-            {
-                block[i] = (int) (dest[i] + 0.5f);
-            }
-
-            src.ReturnToPool();
-            dest.ReturnToPool();
-            temp.ReturnToPool();
-        }
-
-        public static void iDCT8x8GT(Span<float> s, Span<float> d)
-        {
-            idct81d_sse_GT(s, d);
-
-            Transpose8x8(d);
-
-            idct81d_sse_GT(d, d);
-
-            Transpose8x8(d);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Vector4 _mm_load_ps(Span<float> src, int offset)
-        {
-            src = src.Slice(offset);
-            return new Vector4(src[0], src[1], src[2], src[3]);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Vector4 _mm_load_ps(Span<float> src)
-        {
-            return new Vector4(src[0], src[1], src[2], src[3]);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void _mm_store_ps(Span<float> dest, int offset, Vector4 src)
-        {
-            dest = dest.Slice(offset);
-            dest[0] = src.X;
-            dest[1] = src.Y;
-            dest[2] = src.Z;
-            dest[3] = src.W;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void _mm_store_ps(Span<float> dest, Vector4 src)
-        {
-            dest[0] = src.X;
-            dest[1] = src.Y;
-            dest[2] = src.Z;
-            dest[3] = src.W;
-        }
-
-
-        public static void idct81d_sse_GT(Span<float> src, Span<float> dst)
-        {
-            Vector4 c1414 = new Vector4(1.4142135623731f);
-            Vector4 c0250 = new Vector4(0.25f);
-            Vector4 c0353 = new Vector4(0.353553390593274f);
-            Vector4 c0707 = new Vector4(0.707106781186547f);
-
-            for (int i = 0; i < 2; i++)
-            {
-                Vector4 ms0 = _mm_load_ps(src, 0);
-                Vector4 ms1 = _mm_load_ps(src, 8);
-                Vector4 ms2 = _mm_load_ps(src, 16);
-                Vector4 ms3 = _mm_load_ps(src, 24);
-                Vector4 ms4 = _mm_load_ps(src, 32);
-                Vector4 ms5 = _mm_load_ps(src, 40);
-                Vector4 ms6 = _mm_load_ps(src, 48);
-                Vector4 ms7 = _mm_load_ps(src, 56);
-
-                Vector4 mx00 = (c1414*ms0);
-
-                Vector4 mx01 = ((new Vector4(1.38703984532215f)*ms1) + (new Vector4(0.275899379282943f)*ms7));
-                Vector4 mx02 = ((new Vector4(1.30656296487638f)*ms2) + (new Vector4(0.541196100146197f)*ms6));
-                Vector4 mx03 = ((new Vector4(1.17587560241936f)*ms3) + (new Vector4(0.785694958387102f)*ms5));
-
-                Vector4 mx04 = (c1414*ms4);
-
-                Vector4 mx05 = ((new Vector4(-0.785694958387102f)*ms3) + (new Vector4(+1.17587560241936f)*ms5));
-                Vector4 mx06 = ((new Vector4(0.541196100146197f)*ms2) + (new Vector4(-1.30656296487638f)*ms6));
-                Vector4 mx07 = ((new Vector4(-0.275899379282943f)*ms1) + (new Vector4(1.38703984532215f)*ms7));
-                Vector4 mx09 = (mx00 + mx04);
-                Vector4 mx0a = (mx01 + mx03);
-
-                Vector4 mx0b = (c1414*mx02);
-
-                Vector4 mx0c = (mx00 - mx04);
-                Vector4 mx0d = (mx01 - mx03);
-
-                Vector4 mx0e = (c0353*(mx09 - mx0b));
-                Vector4 mx0f = (c0353*(mx0c - mx0d));
-                Vector4 mx10 = (c0353*(mx0c - mx0d));
-                Vector4 mx11 = (c1414*mx06);
-
-                Vector4 mx12 = (mx05 + mx07);
-
-                Vector4 mx13 = (mx05 - mx07);
-
-                Vector4 mx14 = (c0353*(mx11 + mx12));
-                Vector4 mx15 = (c0353*(mx11 - mx12));
-                Vector4 mx16 = (new Vector4(0.5f)*mx13);
-
-                _mm_store_ps(dst, 0, ((c0250 + (mx09 + mx0b))*(c0353*mx0a)));
-                _mm_store_ps(dst, 8, (c0707*(mx0f + mx15)));
-                _mm_store_ps(dst, 16, (c0707*(mx0f - mx15)));
-                _mm_store_ps(dst, 24, (c0707*(mx0e + mx16)));
-                _mm_store_ps(dst, 32, (c0707*(mx0e - mx16)));
-                _mm_store_ps(dst, 40, (c0707*(mx10 - mx14)));
-                _mm_store_ps(dst, 48, (c0707*(mx10 + mx14)));
-
-                _mm_store_ps(dst, 56, ((c0250*(mx09 + mx0b)) - (c0353*mx0a)));
-
-                dst = dst.Slice(4);
-                src = src.Slice(4);
-            }
-        }
-
-        private static readonly Vector4 _1_175876 = new Vector4(1.175876f);
-        private static readonly Vector4 _1_961571 = new Vector4(-1.961571f);
-        private static readonly Vector4 _0_390181 = new Vector4(-0.390181f);
-        private static readonly Vector4 _0_899976 = new Vector4(-0.899976f);
-        private static readonly Vector4 _2_562915 = new Vector4(-2.562915f);
-        private static readonly Vector4 _0_298631 = new Vector4(0.298631f);
-        private static readonly Vector4 _2_053120 = new Vector4(2.053120f);
-        private static readonly Vector4 _3_072711 = new Vector4(3.072711f);
-        private static readonly Vector4 _1_501321 = new Vector4(1.501321f);
-        private static readonly Vector4 _0_541196 = new Vector4(0.541196f);
-        private static readonly Vector4 _1_847759 = new Vector4(-1.847759f);
-        private static readonly Vector4 _0_765367 = new Vector4(0.765367f);
-
-        public static void iDCT2D8x4_32f(Span<float> y, Span<float> x)
-        {
-            /*
-	        float a0,a1,a2,a3,b0,b1,b2,b3; float z0,z1,z2,z3,z4; float r[8]; int i;
-	        for(i = 0;i < 8;i++){ r[i] = (float)(cos((double)i / 16.0 * M_PI) * M_SQRT2); }
-	        */
-            /*
-	        0: 1.414214
-	        1: 1.387040
-	        2: 1.306563
-	        3: 
-	        4: 1.000000
-	        5: 0.785695
-	        6: 
-	        7: 0.275899
-	        */
-            Vector4 my1 = _mm_load_ps(y, 8);
-            Vector4 my7 = _mm_load_ps(y, 56);
-            Vector4 mz0 = my1 + my7;
-
-            Vector4 my3 = _mm_load_ps(y, 24);
-            Vector4 mz2 = my3 + my7;
-            Vector4 my5 = _mm_load_ps(y, 40);
-            Vector4 mz1 = my3 + my5;
-            Vector4 mz3 = my1 + my5;
-            
-            Vector4 mz4 = ((mz0 + mz1)* _1_175876);
-            //z0 = y[1] + y[7]; z1 = y[3] + y[5]; z2 = y[3] + y[7]; z3 = y[1] + y[5];
-            //z4 = (z0 + z1) * r[3];
-            
-            mz2 = mz2* _1_961571 + mz4;
-            mz3 = mz3* _0_390181 + mz4;
-            mz0 = mz0* _0_899976;
-            mz1 = mz1* _2_562915;
-            
-            /*
-            -0.899976
-            -2.562915
-            -1.961571
-            -0.390181
-            z0 = z0 * (-r[3] + r[7]);
-            z1 = z1 * (-r[3] - r[1]);
-            z2 = z2 * (-r[3] - r[5]) + z4;
-            z3 = z3 * (-r[3] + r[5]) + z4;*/
-
-            
-            Vector4 mb3 = my7* _0_298631 + mz0 + mz2;
-            Vector4 mb2 = my5* _2_053120 + mz1 + mz3;
-            Vector4 mb1 = my3* _3_072711 + mz1 + mz2;
-            Vector4 mb0 = my1* _1_501321 + mz0 + mz3;
-
-            /*
-            0.298631
-            2.053120
-            3.072711
-            1.501321
-            b3 = y[7] * (-r[1] + r[3] + r[5] - r[7]) + z0 + z2;
-            b2 = y[5] * ( r[1] + r[3] - r[5] + r[7]) + z1 + z3;
-            b1 = y[3] * ( r[1] + r[3] + r[5] - r[7]) + z1 + z2;
-            b0 = y[1] * ( r[1] + r[3] - r[5] - r[7]) + z0 + z3;
-            */
-
-            Vector4 my2 = _mm_load_ps(y, 16);
-            Vector4 my6 = _mm_load_ps(y, 48);
-            mz4 = (my2 + my6)* _0_541196;
-            Vector4 my0 = _mm_load_ps(y, 0);
-            Vector4 my4 = _mm_load_ps(y, 32);
-            mz0 = my0 + my4;
-            mz1 = my0 - my4;
-
-            mz2 = mz4 + my6* _1_847759;
-            mz3 = mz4 + my2* _0_765367;
-
-            my0 = mz0 + mz3;
-            my3 = mz0 - mz3;
-            my1 = mz1 + mz2;
-            my2 = mz1 - mz2;
-            /*
-	        1.847759
-	        0.765367
-	        z4 = (y[2] + y[6]) * r[6];
-	        z0 = y[0] + y[4]; z1 = y[0] - y[4];
-	        z2 = z4 - y[6] * (r[2] + r[6]);
-	        z3 = z4 + y[2] * (r[2] - r[6]);
-	        a0 = z0 + z3; a3 = z0 - z3;
-	        a1 = z1 + z2; a2 = z1 - z2;
-	        */
-
-            _mm_store_ps(x, 0, my0 + mb0);
-
-            _mm_store_ps(x, 56, my0 - mb0);
-
-            _mm_store_ps(x, 8, my1 + mb1);
-
-            _mm_store_ps(x, 48, my1 - mb1);
-
-            _mm_store_ps(x, 16, my2 + mb2);
-
-            _mm_store_ps(x, 40, my2 - mb2);
-
-            _mm_store_ps(x, 24, my3 + mb3);
-
-            _mm_store_ps(x, 32, my3 - mb3);
-            /*
-            x[0] = a0 + b0; x[7] = a0 - b0;
-            x[1] = a1 + b1; x[6] = a1 - b1;
-            x[2] = a2 + b2; x[5] = a2 - b2;
-            x[3] = a3 + b3; x[4] = a3 - b3;
-            for(i = 0;i < 8;i++){ x[i] *= 0.353554f; }
-            */
-        }
-
-        public static void iDCT8x8_llm_sse(Span<float> s, Span<float> d, Span<float> temp)
-        {
-            Transpose8x8(s, temp);
-            iDCT2D8x4_32f(temp, d);
-
-            iDCT2D8x4_32f(temp.Slice(4), d.Slice(4));
-            
-            Transpose8x8(d, temp);
-
-            iDCT2D8x4_32f(temp, d);
-
-            iDCT2D8x4_32f(temp.Slice(4), d.Slice(4));
-
-            Vector4 c = new Vector4(0.1250f);
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//0
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//1
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//2
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//3
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//4
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//5
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//6
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//7
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//8
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//9
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//10
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//11
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//12
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//13
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//14
-
-            _mm_store_ps(d, (_mm_load_ps(d)*c));d.AddOffset(4);//15
-        }
-}
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Jpg/Components/YCbCrImage.cs b/src/ImageSharp46/Formats/Jpg/Components/YCbCrImage.cs
deleted file mode 100644
index 564da379b..000000000
--- a/src/ImageSharp46/Formats/Jpg/Components/YCbCrImage.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// <copyright file="YCbCrImage.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents an image made up of three color components (luminance, blue chroma, red chroma)
-    /// </summary>
-    internal class YCbCrImage
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="YCbCrImage"/> class.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="ratio">The ratio.</param>
-        public YCbCrImage(int width, int height, YCbCrSubsampleRatio ratio)
-        {
-            int cw, ch;
-            YCbCrSize(width, height, ratio, out cw, out ch);
-            this.YChannel = new byte[width * height];
-            this.CbChannel = new byte[cw * ch];
-            this.CrChannel = new byte[cw * ch];
-            this.Ratio = ratio;
-            this.YStride = width;
-            this.CStride = cw;
-            this.X = 0;
-            this.Y = 0;
-            this.Width = width;
-            this.Height = height;
-        }
-
-        /// <summary>
-        /// Prevents a default instance of the <see cref="YCbCrImage"/> class from being created.
-        /// </summary>
-        private YCbCrImage()
-        {
-        }
-
-        /// <summary>
-        /// Provides enumeration of the various available subsample ratios.
-        /// </summary>
-        public enum YCbCrSubsampleRatio
-        {
-            YCbCrSubsampleRatio444,
-
-            YCbCrSubsampleRatio422,
-
-            YCbCrSubsampleRatio420,
-
-            YCbCrSubsampleRatio440,
-
-            YCbCrSubsampleRatio411,
-
-            YCbCrSubsampleRatio410,
-        }
-
-        /// <summary>
-        /// Gets or sets the luminance components channel.
-        /// </summary>
-        public byte[] YChannel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the blue chroma components channel.
-        /// </summary>
-        public byte[] CbChannel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the red chroma components channel.
-        /// </summary>
-        public byte[] CrChannel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Y slice index delta between vertically adjacent pixels.
-        /// </summary>
-        public int YStride { get; set; }
-
-        /// <summary>
-        /// Gets or sets the red and blue chroma slice index delta between vertically adjacent pixels
-        /// that map to separate chroma samples.
-        /// </summary>
-        public int CStride { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the first luminance element.
-        /// </summary>
-        public int YOffset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index of the first element of red or blue chroma.
-        /// </summary>
-        public int COffset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the horizontal position.
-        /// </summary>
-        public int X { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vertical position.
-        /// </summary>
-        public int Y { get; set; }
-
-        /// <summary>
-        /// Gets or sets the width.
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the subsampling ratio.
-        /// </summary>
-        public YCbCrSubsampleRatio Ratio { get; set; }
-
-        /// <summary>
-        /// Gets an image made up of a subset of the originals pixels.
-        /// </summary>
-        /// <param name="x">The x-coordinate of the image.</param>
-        /// <param name="y">The y-coordinate of the image.</param>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <returns>
-        /// The <see cref="YCbCrImage"/>.
-        /// </returns>
-        public YCbCrImage Subimage(int x, int y, int width, int height)
-        {
-            YCbCrImage ret = new YCbCrImage
-            {
-                Width = width,
-                Height = height,
-                YChannel = this.YChannel,
-                CbChannel = this.CbChannel,
-                CrChannel = this.CrChannel,
-                Ratio = this.Ratio,
-                YStride = this.YStride,
-                CStride = this.CStride,
-                YOffset = (y * this.YStride) + x,
-                COffset = (y * this.CStride) + x
-            };
-            return ret;
-        }
-
-        /// <summary>
-        /// Returns the offset of the first luminance component at the given row
-        /// </summary>
-        /// <param name="y">The row number.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public int GetRowYOffset(int y)
-        {
-            return y * this.YStride;
-        }
-
-        /// <summary>
-        /// Returns the offset of the first chroma component at the given row
-        /// </summary>
-        /// <param name="y">The row number.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        public int GetRowCOffset(int y)
-        {
-            switch (this.Ratio)
-            {
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio422:
-                    return y * this.CStride;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio420:
-                    return (y / 2) * this.CStride;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio440:
-                    return (y / 2) * this.CStride;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio411:
-                    return y * this.CStride;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio410:
-                    return (y / 2) * this.CStride;
-                default:
-                    return y * this.CStride;
-            }
-        }
-
-        /// <summary>
-        /// Returns the height and width of the chroma components
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="ratio">The subsampling ratio.</param>
-        /// <param name="chromaWidth">The chroma width.</param>
-        /// <param name="chromaHeight">The chroma height.</param>
-        private static void YCbCrSize(int width, int height, YCbCrSubsampleRatio ratio, out int chromaWidth, out int chromaHeight)
-        {
-            switch (ratio)
-            {
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio422:
-                    chromaWidth = (width + 1) / 2;
-                    chromaHeight = height;
-                    break;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio420:
-                    chromaWidth = (width + 1) / 2;
-                    chromaHeight = (height + 1) / 2;
-                    break;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio440:
-                    chromaWidth = width;
-                    chromaHeight = (height + 1) / 2;
-                    break;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio411:
-                    chromaWidth = (width + 3) / 4;
-                    chromaHeight = height;
-                    break;
-                case YCbCrSubsampleRatio.YCbCrSubsampleRatio410:
-                    chromaWidth = (width + 3) / 4;
-                    chromaHeight = (height + 1) / 2;
-                    break;
-                default:
-
-                    // Default to 4:4:4 subsampling.
-                    chromaWidth = width;
-                    chromaHeight = height;
-                    break;
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegConstants.cs b/src/ImageSharp46/Formats/Jpg/JpegConstants.cs
deleted file mode 100644
index 19d726e70..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegConstants.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// <copyright file="JpegConstants.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Defines jpeg constants defined in the specification.
-    /// </summary>
-    internal static class JpegConstants
-    {
-        /// <summary>
-        /// The maximum allowable length in each dimension of a jpeg image.
-        /// </summary>
-        public const ushort MaxLength = 65535;
-
-        /// <summary>
-        /// Represents high detail chroma horizontal subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourFourFourHorizontal = { 0x11, 0x11, 0x11 };
-
-        /// <summary>
-        /// Represents high detail chroma vertical subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourFourFourVertical = { 0x11, 0x11, 0x11 };
-
-        /// <summary>
-        /// Represents medium detail chroma vertical subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourTwoTwoVertical = { 0x11, 0x11, 0x11 };
-
-        /// <summary>
-        /// Represents low detail chroma vertical subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourTwoZeroVertical = { 0x22, 0x11, 0x11 };
-
-        /// <summary>
-        /// Represents medium detail chroma horizontal subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourTwoTwoHorizontal = { 0x22, 0x11, 0x11 };
-
-        /// <summary>
-        /// Represents low detail chroma horizontal subsampling.
-        /// </summary>
-        public static readonly byte[] ChromaFourTwoZeroHorizontal = { 0x22, 0x11, 0x11 };
-
-        /// <summary>
-        /// Describes component ids for start of frame components.
-        /// </summary>
-        internal static class Components
-        {
-            /// <summary>
-            /// The YCbCr luminance component id.
-            /// </summary>
-            public const byte Y = 1;
-
-            /// <summary>
-            /// The YCbCr chroma component id.
-            /// </summary>
-            public const byte Cb = 2;
-
-            /// <summary>
-            /// The YCbCr chroma component id.
-            /// </summary>
-            public const byte Cr = 3;
-
-            /// <summary>
-            /// The YIQ x coordinate component id.
-            /// </summary>
-            public const byte I = 4;
-
-            /// <summary>
-            /// The YIQ y coordinate component id.
-            /// </summary>
-            public const byte Q = 5;
-        }
-
-        /// <summary>
-        /// Describes common Jpeg markers
-        /// </summary>
-        internal static class Markers
-        {
-            /// <summary>
-            /// Marker prefix. Next byte is a marker.
-            /// </summary>
-            public const byte XFF = 0xff;
-
-            /// <summary>
-            /// Start of Image
-            /// </summary>
-            public const byte SOI = 0xd8;
-
-            /// <summary>
-            /// Start of Frame (baseline DCT)
-            /// <remarks>
-            /// Indicates that this is a baseline DCT-based JPEG, and specifies the width, height, number of components,
-            /// and component subsampling (e.g., 4:2:0).
-            /// </remarks>
-            /// </summary>
-            public const byte SOF0 = 0xc0;
-
-            /// <summary>
-            /// Start Of Frame (Extended Sequential DCT)
-            /// <remarks>
-            /// Indicates that this is a progressive DCT-based JPEG, and specifies the width, height, number of components,
-            /// and component subsampling (e.g., 4:2:0).
-            /// </remarks>
-            /// </summary>
-            public const byte SOF1 = 0xc1;
-
-            /// <summary>
-            /// Start Of Frame (progressive DCT)
-            /// <remarks>
-            /// Indicates that this is a progressive DCT-based JPEG, and specifies the width, height, number of components,
-            /// and component subsampling (e.g., 4:2:0).
-            /// </remarks>
-            /// </summary>
-            public const byte SOF2 = 0xc2;
-
-            /// <summary>
-            /// Define Huffman Table(s)
-            /// <remarks>
-            /// Specifies one or more Huffman tables.
-            /// </remarks>
-            /// </summary>
-            public const byte DHT = 0xc4;
-
-            /// <summary>
-            /// Define Quantization Table(s)
-            /// <remarks>
-            /// Specifies one or more quantization tables.
-            /// </remarks>
-            /// </summary>
-            public const byte DQT = 0xdb;
-
-            /// <summary>
-            /// Define Restart Interval
-            /// <remarks>
-            /// Specifies the interval between RSTn markers, in macroblocks. This marker is followed by two bytes
-            /// indicating the fixed size so it can be treated like any other variable size segment.
-            /// </remarks>
-            /// </summary>
-            public const byte DRI = 0xdd;
-
-            /// <summary>
-            /// Define First Restart
-            /// <remarks>
-            /// Inserted every r macroblocks, where r is the restart interval set by a DRI marker.
-            /// Not used if there was no DRI marker. The low three bits of the marker code cycle in value from 0 to 7.
-            /// </remarks>
-            /// </summary>
-            public const byte RST0 = 0xd0;
-
-            /// <summary>
-            /// Define Eigth Restart
-            /// <remarks>
-            /// Inserted every r macroblocks, where r is the restart interval set by a DRI marker.
-            /// Not used if there was no DRI marker. The low three bits of the marker code cycle in value from 0 to 7.
-            /// </remarks>
-            /// </summary>
-            public const byte RST7 = 0xd7;
-
-            /// <summary>
-            /// Start of Scan
-            /// <remarks>
-            /// Begins a top-to-bottom scan of the image. In baseline DCT JPEG images, there is generally a single scan.
-            /// Progressive DCT JPEG images usually contain multiple scans. This marker specifies which slice of data it
-            /// will contain, and is immediately followed by entropy-coded data.
-            /// </remarks>
-            /// </summary>
-            public const byte SOS = 0xda;
-
-            /// <summary>
-            /// Comment
-            /// <remarks>
-            /// Contains a text comment.
-            /// </remarks>
-            /// </summary>
-            public const byte COM = 0xfe;
-
-            /// <summary>
-            /// End of Image
-            /// </summary>
-            public const byte EOI = 0xd9;
-
-            /// <summary>
-            /// Application specific marker for marking the jpeg format.
-            /// <see href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html"/>
-            /// </summary>
-            public const byte APP0 = 0xe0;
-
-            /// <summary>
-            /// Application specific marker for marking where to store metadata.
-            /// </summary>
-            public const byte APP1 = 0xe1;
-
-            /// <summary>
-            /// Application specific marker used by Adobe for storing encoding information for DCT filters.
-            /// </summary>
-            public const byte APP14 = 0xee;
-
-            /// <summary>
-            /// Application specific marker used by GraphicConverter to store JPEG quality.
-            /// </summary>
-            public const byte APP15 = 0xef;
-        }
-
-        /// <summary>
-        /// Describes Adobe specific markers <see href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe"/>
-        /// </summary>
-        internal static class Adobe
-        {
-            /// <summary>
-            /// The color transform is unknown.(RGB or CMYK)
-            /// </summary>
-            public const int ColorTransformUnknown = 0;
-
-            /// <summary>
-            /// The color transform is YCbCr (luminance, red chroma, blue chroma)
-            /// </summary>
-            public const int ColorTransformYCbCr = 1;
-
-            /// <summary>
-            /// The color transform is YCCK (luminance, red chroma, blue chroma, keyline)
-            /// </summary>
-            public const int ColorTransformYcck = 2;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Jpg/JpegDecoder.cs b/src/ImageSharp46/Formats/Jpg/JpegDecoder.cs
deleted file mode 100644
index d3c64a9c0..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegDecoder.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// <copyright file="JpegDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Image decoder for generating an image out of a jpg stream.
-    /// </summary>
-    public class JpegDecoder : IImageDecoder
-    {
-        /// <summary>
-        /// Gets the size of the header for this image type.
-        /// </summary>
-        /// <value>The size of the header.</value>
-        public int HeaderSize => 11;
-
-        /// <summary>
-        /// Indicates if the image decoder supports the specified
-        /// file extension.
-        /// </summary>
-        /// <param name="extension">The file extension.</param>
-        /// <returns>
-        /// <c>true</c>, if the decoder supports the specified
-        /// extensions; otherwise <c>false</c>.
-        /// </returns>
-        /// <exception cref="System.ArgumentNullException"><paramref name="extension"/>
-        /// is null (Nothing in Visual Basic).</exception>
-        /// <exception cref="System.ArgumentException"><paramref name="extension"/> is a string
-        /// of length zero or contains only blanks.</exception>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, "extension");
-
-            if (extension.StartsWith("."))
-            {
-                extension = extension.Substring(1);
-            }
-
-            return extension.Equals("JPG", StringComparison.OrdinalIgnoreCase) ||
-                   extension.Equals("JPEG", StringComparison.OrdinalIgnoreCase) ||
-                   extension.Equals("JFIF", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Indicates if the image decoder supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="header">The file header.</param>
-        /// <returns>
-        /// <c>true</c>, if the decoder supports the specified
-        /// file header; otherwise <c>false</c>.
-        /// </returns>
-        /// <exception cref="System.ArgumentNullException"><paramref name="header"/>
-        /// is null (Nothing in Visual Basic).</exception>
-        public bool IsSupportedFileFormat(byte[] header)
-        {
-            Guard.NotNull(header, "header");
-
-            bool isSupported = false;
-
-            if (header.Length >= 11)
-            {
-                bool isJfif = IsJfif(header);
-                bool isExif = IsExif(header);
-                bool isJpeg = IsJpeg(header);
-
-                isSupported = isJfif || isExif || isJpeg;
-            }
-
-            return isSupported;
-        }
-
-        /// <inheritdoc/>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.NotNull(image, "image");
-            Guard.NotNull(stream, "stream");
-
-            using (JpegDecoderCore decoder = new JpegDecoderCore())
-            {
-                decoder.Decode(image, stream, false);
-            }
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the given bytes identify Jfif data.
-        /// </summary>
-        /// <param name="header">The bytes representing the file header.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        private static bool IsJfif(byte[] header)
-        {
-            bool isJfif =
-                header[6] == 0x4A && // J
-                header[7] == 0x46 && // F
-                header[8] == 0x49 && // I
-                header[9] == 0x46 && // F
-                header[10] == 0x00;
-
-            return isJfif;
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the given bytes identify EXIF data.
-        /// </summary>
-        /// <param name="header">The bytes representing the file header.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        private static bool IsExif(byte[] header)
-        {
-            bool isExif =
-                header[6] == 0x45 && // E
-                header[7] == 0x78 && // X
-                header[8] == 0x69 && // I
-                header[9] == 0x66 && // F
-                header[10] == 0x00;
-
-            return isExif;
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the given bytes identify Jpeg data.
-        /// This is a last chance resort for jpegs that contain ICC information.
-        /// </summary>
-        /// <param name="header">The bytes representing the file header.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        private static bool IsJpeg(byte[] header)
-        {
-            bool isJpg =
-                header[0] == 0xFF && // 255
-                header[1] == 0xD8; // 216
-
-            return isJpg;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegDecoderCore.cs b/src/ImageSharp46/Formats/Jpg/JpegDecoderCore.cs
deleted file mode 100644
index 2f0b22829..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegDecoderCore.cs
+++ /dev/null
@@ -1,2282 +0,0 @@
-// <copyright file="JpegDecoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Runtime.CompilerServices;
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Performs the jpeg decoding operation.
-    /// </summary>
-    internal class JpegDecoderCore : IDisposable
-    {
-        /// <summary>
-        /// The maximum (inclusive) number of bits in a Huffman code.
-        /// </summary>
-        internal const int MaxCodeLength = 16;
-
-        /// <summary>
-        /// The maximum (inclusive) number of codes in a Huffman tree.
-        /// </summary>
-        internal const int MaxNCodes = 256;
-
-        /// <summary>
-        /// The log-2 size of the Huffman decoder's look-up table.
-        /// </summary>
-        internal const int LutSize = 8;
-
-        /// <summary>
-        /// The maximum number of color components
-        /// </summary>
-        private const int MaxComponents = 4;
-
-        /// <summary>
-        /// The maximum number of Huffman table classes
-        /// </summary>
-        private const int MaxTc = 1;
-
-        /// <summary>
-        /// The maximum number of Huffman table identifiers
-        /// </summary>
-        private const int MaxTh = 3;
-
-        private const int ThRowSize = MaxTh + 1;
-
-        /// <summary>
-        /// The maximum number of quantization tables
-        /// </summary>
-        private const int MaxTq = 3;
-
-        /// <summary>
-        /// The DC table index
-        /// </summary>
-        private const int DcTable = 0;
-
-        /// <summary>
-        /// The AC table index
-        /// </summary>
-        private const int AcTable = 1;
-
-        /// <summary>
-        /// Unzig maps from the zigzag ordering to the natural ordering. For example,
-        /// unzig[3] is the column and row of the fourth element in zigzag order. The
-        /// value is 16, which means first column (16%8 == 0) and third row (16/8 == 2).
-        /// </summary>
-        private static readonly int[] Unzig =
-        {
-            0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26,
-            33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57,
-            50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31,
-            39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
-        };
-
-        /// <summary>
-        /// The component array
-        /// </summary>
-        private readonly Component[] componentArray;
-
-        /// <summary>
-        /// Saved state between progressive-mode scans.
-        /// </summary>
-        private readonly Block[][] progCoeffs;
-
-        /// <summary>
-        /// The huffman trees
-        /// </summary>
-        //private readonly Huffman[,] huffmanTrees;
-
-        private readonly Huffman[] huffmanTrees;
-
-        /// <summary>
-        /// Quantization tables, in zigzag order.
-        /// </summary>
-        private readonly Block[] quantizationTables;
-
-        /// <summary>
-        /// A temporary buffer for holding pixels
-        /// </summary>
-        private readonly byte[] temp;
-
-        /// <summary>
-        /// The byte buffer.
-        /// </summary>
-        private readonly Bytes bytes;
-
-        /// <summary>
-        /// The image width
-        /// </summary>
-        private int imageWidth;
-
-        /// <summary>
-        /// The image height
-        /// </summary>
-        private int imageHeight;
-
-        /// <summary>
-        /// The number of color components within the image.
-        /// </summary>
-        private int componentCount;
-
-        /// <summary>
-        /// A grayscale image to decode to.
-        /// </summary>
-        private GrayImage grayImage;
-
-        /// <summary>
-        /// The full color image to decode to.
-        /// </summary>
-        private YCbCrImage ycbcrImage;
-
-        /// <summary>
-        /// The input stream.
-        /// </summary>
-        private Stream inputStream;
-
-        /// <summary>
-        /// Holds the unprocessed bits that have been taken from the byte-stream.
-        /// </summary>
-        private Bits bits;
-
-        /// <summary>
-        /// The array of keyline pixels in a CMYK image
-        /// </summary>
-        private byte[] blackPixels;
-
-        /// <summary>
-        /// The width in bytes or a single row of keyline pixels in a CMYK image
-        /// </summary>
-        private int blackStride;
-
-        /// <summary>
-        /// The restart interval
-        /// </summary>
-        private int restartInterval;
-
-        /// <summary>
-        /// Whether the image is interlaced (progressive)
-        /// </summary>
-        private bool isProgressive;
-
-        /// <summary>
-        /// Whether the image has a JFIF header
-        /// </summary>
-        private bool isJfif;
-
-        /// <summary>
-        /// Whether the image is in CMYK format with an App14 marker
-        /// </summary>
-        private bool adobeTransformValid;
-
-        /// <summary>
-        /// The App14 marker color-space
-        /// </summary>
-        private byte adobeTransform;
-
-        /// <summary>
-        /// End-of-Band run, specified in section G.1.2.2.
-        /// </summary>
-        private ushort eobRun;
-
-        /// <summary>
-        /// The horizontal resolution. Calculated if the image has a JFIF header.
-        /// </summary>
-        private short horizontalResolution;
-
-        /// <summary>
-        /// The vertical resolution. Calculated if the image has a JFIF header.
-        /// </summary>
-        private short verticalResolution;
-
-        private int blockIndex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JpegDecoderCore"/> class.
-        /// </summary>
-        public JpegDecoderCore()
-        {
-            //this.huffmanTrees = new Huffman[MaxTc + 1, MaxTh + 1];
-            this.huffmanTrees = new Huffman[(MaxTc + 1)*(MaxTh + 1)];
-
-            this.quantizationTables = Block.CreateArray(MaxTq + 1);
-            this.temp = new byte[2 * Block.BlockSize];
-            this.componentArray = new Component[MaxComponents];
-            this.progCoeffs = new Block[MaxComponents][];
-            this.bits = new Bits();
-            this.bytes = new Bytes();
-
-            // TODO: This looks like it could be static.
-
-            for (int i = 0; i < MaxTc + 1; i++)
-            {
-                for (int j = 0; j < MaxTh + 1; j++)
-                {
-                    //this.huffmanTrees[i, j].Init(LutSize, MaxNCodes, MaxCodeLength);
-                    this.huffmanTrees[i* ThRowSize + j].Init(LutSize, MaxNCodes, MaxCodeLength);
-                }
-            }
-
-            //for (int i = 0; i < this.quantizationTables.Length; i++)
-            //{
-            //    //this.quantizationTables[i] = new Block();
-            //    this.quantizationTables[i].Init();
-            //}
-
-            //for (int i = 0; i < this.componentArray.Length; i++)
-            //{
-            //    this.componentArray[i] = new Component();
-            //}
-        }
-
-
-        /// <summary>
-        /// Decodes the image from the specified this._stream and sets
-        /// the data to image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image, where the data should be set to.</param>
-        /// <param name="stream">The stream, where the image should be.</param>
-        /// <param name="configOnly">Whether to decode metadata only.</param>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream, bool configOnly)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            this.inputStream = stream;
-
-            // Check for the Start Of Image marker.
-            this.ReadFull(this.temp, 0, 2);
-            if (this.temp[0] != JpegConstants.Markers.XFF || this.temp[1] != JpegConstants.Markers.SOI)
-            {
-                throw new ImageFormatException("Missing SOI marker.");
-            }
-
-            // Process the remaining segments until the End Of Image marker.
-            while (true)
-            {
-                this.ReadFull(this.temp, 0, 2);
-                while (this.temp[0] != 0xff)
-                {
-                    // Strictly speaking, this is a format error. However, libjpeg is
-                    // liberal in what it accepts. As of version 9, next_marker in
-                    // jdmarker.c treats this as a warning (JWRN_EXTRANEOUS_DATA) and
-                    // continues to decode the stream. Even before next_marker sees
-                    // extraneous data, jpeg_fill_bit_buffer in jdhuff.c reads as many
-                    // bytes as it can, possibly past the end of a scan's data. It
-                    // effectively puts back any markers that it overscanned (e.g. an
-                    // "\xff\xd9" EOI marker), but it does not put back non-marker data,
-                    // and thus it can silently ignore a small number of extraneous
-                    // non-marker bytes before next_marker has a chance to see them (and
-                    // print a warning).
-                    // We are therefore also liberal in what we accept. Extraneous data
-                    // is silently ignore
-                    // This is similar to, but not exactly the same as, the restart
-                    // mechanism within a scan (the RST[0-7] markers).
-                    // Note that extraneous 0xff bytes in e.g. SOS data are escaped as
-                    // "\xff\x00", and so are detected a little further down below.
-                    this.temp[0] = this.temp[1];
-                    this.temp[1] = this.ReadByte();
-                }
-
-                byte marker = this.temp[1];
-                if (marker == 0)
-                {
-                    // Treat "\xff\x00" as extraneous data.
-                    continue;
-                }
-
-                while (marker == 0xff)
-                {
-                    // Section B.1.1.2 says, "Any marker may optionally be preceded by any
-                    // number of fill bytes, which are bytes assigned code X'FF'".
-                    marker = this.ReadByte();
-                }
-
-                // End Of Image.
-                if (marker == JpegConstants.Markers.EOI)
-                {
-                    break;
-                }
-
-                if (JpegConstants.Markers.RST0 <= marker && marker <= JpegConstants.Markers.RST7)
-                {
-                    // Figures B.2 and B.16 of the specification suggest that restart markers should
-                    // only occur between Entropy Coded Segments and not after the final ECS.
-                    // However, some encoders may generate incorrect JPEGs with a final restart
-                    // marker. That restart marker will be seen here instead of inside the ProcessSOS
-                    // method, and is ignored as a harmless error. Restart markers have no extra data,
-                    // so we check for this before we read the 16-bit length of the segment.
-                    continue;
-                }
-
-                // Read the 16-bit length of the segment. The value includes the 2 bytes for the
-                // length itself, so we subtract 2 to get the number of remaining bytes.
-                this.ReadFull(this.temp, 0, 2);
-                int remaining = (this.temp[0] << 8) + this.temp[1] - 2;
-                if (remaining < 0)
-                {
-                    throw new ImageFormatException("Short segment length.");
-                }
-
-                switch (marker)
-                {
-                    case JpegConstants.Markers.SOF0:
-                    case JpegConstants.Markers.SOF1:
-                    case JpegConstants.Markers.SOF2:
-                        this.isProgressive = marker == JpegConstants.Markers.SOF2;
-                        this.ProcessStartOfFrameMarker(remaining);
-                        if (configOnly && this.isJfif)
-                        {
-                            return;
-                        }
-
-                        break;
-                    case JpegConstants.Markers.DHT:
-                        if (configOnly)
-                        {
-                            this.Skip(remaining);
-                        }
-                        else
-                        {
-                            this.ProcessDefineHuffmanTablesMarker(remaining);
-                        }
-
-                        break;
-                    case JpegConstants.Markers.DQT:
-                        if (configOnly)
-                        {
-                            this.Skip(remaining);
-                        }
-                        else this.ProcessDqt(remaining);
-                        break;
-                    case JpegConstants.Markers.SOS:
-                        if (configOnly)
-                        {
-                            return;
-                        }
-
-                        this.ProcessStartOfScan(remaining);
-                        break;
-                    case JpegConstants.Markers.DRI:
-                        if (configOnly)
-                        {
-                            this.Skip(remaining);
-                        }
-                        else
-                        {
-                            this.ProcessDefineRestartIntervalMarker(remaining);
-                        }
-
-                        break;
-                    case JpegConstants.Markers.APP0:
-                        this.ProcessApplicationHeader(remaining);
-                        break;
-                    case JpegConstants.Markers.APP1:
-                        this.ProcessApp1Marker(remaining, image);
-                        break;
-                    case JpegConstants.Markers.APP14:
-                        this.ProcessApp14Marker(remaining);
-                        break;
-                    default:
-                        if ((JpegConstants.Markers.APP0 <= marker && marker <= JpegConstants.Markers.APP15) || marker == JpegConstants.Markers.COM)
-                        {
-                            this.Skip(remaining);
-                        }
-                        else if (marker < JpegConstants.Markers.SOF0)
-                        {
-                            // See Table B.1 "Marker code assignments".
-                            throw new ImageFormatException("Unknown marker");
-                        }
-                        else
-                        {
-                            throw new ImageFormatException("Unknown marker");
-                        }
-
-                        break;
-                }
-            }
-
-            if (this.grayImage != null)
-            {
-                this.ConvertFromGrayScale(this.imageWidth, this.imageHeight, image);
-            }
-            else if (this.ycbcrImage != null)
-            {
-                if (this.componentCount == 4)
-                {
-                    this.ConvertFromCmyk(this.imageWidth, this.imageHeight, image);
-                    return;
-                }
-
-                if (this.componentCount == 3)
-                {
-                    if (this.IsRGB())
-                    {
-                        this.ConvertFromRGB(this.imageWidth, this.imageHeight, image);
-                        return;
-                    }
-
-                    this.ConvertFromYCbCr(this.imageWidth, this.imageHeight, image);
-                    return;
-                }
-
-                throw new ImageFormatException("JpegDecoder only supports RGB, CMYK and Grayscale color spaces.");
-            }
-            else
-            {
-                throw new ImageFormatException("Missing SOS marker.");
-            }
-        }
-
-        /// <summary>
-        /// Reads bytes from the byte buffer to ensure that bits.UnreadBits is at
-        /// least n. For best performance (avoiding function calls inside hot loops),
-        /// the caller is the one responsible for first checking that bits.UnreadBits &lt; n.
-        /// </summary>
-        /// <param name="n">The number of bits to ensure.</param>
-        private void EnsureNBits(int n)
-        {
-            while (true)
-            {
-                byte c = this.ReadByteStuffedByte();
-                this.bits.Accumulator = (this.bits.Accumulator << 8) | c;
-                this.bits.UnreadBits += 8;
-                if (this.bits.Mask == 0)
-                {
-                    this.bits.Mask = 1 << 7;
-                }
-                else
-                {
-                    this.bits.Mask <<= 8;
-                }
-
-                if (this.bits.UnreadBits >= n)
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// The composition of RECEIVE and EXTEND, specified in section F.2.2.1.
-        /// </summary>
-        /// <param name="t">The byte</param>
-        /// <returns>The <see cref="int"/></returns>
-        private int ReceiveExtend(byte t)
-        {
-            if (this.bits.UnreadBits < t)
-            {
-                this.EnsureNBits(t);
-            }
-
-            this.bits.UnreadBits -= t;
-            this.bits.Mask >>= t;
-            int s = 1 << t;
-            int x = (int)((this.bits.Accumulator >> this.bits.UnreadBits) & (s - 1));
-
-            if (x < (s >> 1))
-            {
-                x += ((-1) << t) + 1;
-            }
-
-            return x;
-        }
-
-        /// <summary>
-        /// Processes a Define Huffman Table marker, and initializes a huffman
-        /// struct from its contents. Specified in section B.2.4.2.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessDefineHuffmanTablesMarker(int remaining)
-        {
-            while (remaining > 0)
-            {
-                if (remaining < 17)
-                {
-                    throw new ImageFormatException("DHT has wrong length");
-                }
-
-                this.ReadFull(this.temp, 0, 17);
-
-                int tc = this.temp[0] >> 4;
-                if (tc > MaxTc)
-                {
-                    throw new ImageFormatException("Bad Tc value");
-                }
-
-                int th = this.temp[0] & 0x0f;
-                if (th > MaxTh || (!this.isProgressive && (th > 1)))
-                {
-                    throw new ImageFormatException("Bad Th value");
-                }
-
-                ProcessDefineHuffmanTablesMarkerLoop(ref this.huffmanTrees[tc* ThRowSize + th], ref remaining);
-            }
-        }
-
-        private void ProcessDefineHuffmanTablesMarkerLoop(ref Huffman huffman, ref int remaining)
-        {
-
-            // Read nCodes and huffman.Valuess (and derive h.Length).
-            // nCodes[i] is the number of codes with code length i.
-            // h.Length is the total number of codes.
-            huffman.Length = 0;
-
-            int[] ncodes = new int[MaxCodeLength];
-            for (int i = 0; i < ncodes.Length; i++)
-            {
-                ncodes[i] = this.temp[i + 1];
-                huffman.Length += ncodes[i];
-            }
-
-            if (huffman.Length == 0)
-            {
-                throw new ImageFormatException("Huffman table has zero length");
-            }
-
-            if (huffman.Length > MaxNCodes)
-            {
-                throw new ImageFormatException("Huffman table has excessive length");
-            }
-
-            remaining -= huffman.Length + 17;
-            if (remaining < 0)
-            {
-                throw new ImageFormatException("DHT has wrong length");
-            }
-
-            this.ReadFull(huffman.Values, 0, huffman.Length);
-
-            // Derive the look-up table.
-            for (int i = 0; i < huffman.Lut.Length; i++)
-            {
-                huffman.Lut[i] = 0;
-            }
-
-            uint x = 0, code = 0;
-
-            for (int i = 0; i < LutSize; i++)
-            {
-                code <<= 1;
-
-                for (int j = 0; j < ncodes[i]; j++)
-                {
-                    // The codeLength is 1+i, so shift code by 8-(1+i) to
-                    // calculate the high bits for every 8-bit sequence
-                    // whose codeLength's high bits matches code.
-                    // The high 8 bits of lutValue are the encoded value.
-                    // The low 8 bits are 1 plus the codeLength.
-                    byte base2 = (byte) (code << (7 - i));
-                    ushort lutValue = (ushort) ((huffman.Values[x] << 8) | (2 + i));
-
-                    for (int k = 0; k < 1 << (7 - i); k++)
-                    {
-                        huffman.Lut[base2 | k] = lutValue;
-                    }
-
-                    code++;
-                    x++;
-                }
-            }
-
-            // Derive minCodes, maxCodes, and indices.
-            int c = 0, index = 0;
-            for (int i = 0; i < ncodes.Length; i++)
-            {
-                int nc = ncodes[i];
-                if (nc == 0)
-                {
-                    huffman.MinCodes[i] = -1;
-                    huffman.MaxCodes[i] = -1;
-                    huffman.Indices[i] = -1;
-                }
-                else
-                {
-                    huffman.MinCodes[i] = c;
-                    huffman.MaxCodes[i] = c + nc - 1;
-                    huffman.Indices[i] = index;
-                    c += nc;
-                    index += nc;
-                }
-
-                c <<= 1;
-            }
-        }
-
-        /// <summary>
-        /// Returns the next Huffman-coded value from the bit-stream, decoded according to the given value.
-        /// </summary>
-        /// <param name="huffman">The huffman value</param>
-        /// <returns>The <see cref="byte"/></returns>
-        private byte DecodeHuffman(ref Huffman huffman)
-        {
-            if (huffman.Length == 0)
-            {
-                throw new ImageFormatException("Uninitialized Huffman table");
-            }
-
-            if (this.bits.UnreadBits < 8)
-            {
-                try
-                {
-                    this.EnsureNBits(8);
-
-                    ushort v = huffman.Lut[(this.bits.Accumulator >> (this.bits.UnreadBits - LutSize)) & 0xff];
-
-                    if (v != 0)
-                    {
-                        byte n = (byte)((v & 0xff) - 1);
-                        this.bits.UnreadBits -= n;
-                        this.bits.Mask >>= n;
-                        return (byte)(v >> 8);
-                    }
-                }
-                catch (MissingFF00Exception)
-                {
-                    if (this.bytes.UnreadableBytes != 0)
-                    {
-                        this.UnreadByteStuffedByte();
-                    }
-                }
-                catch (ShortHuffmanDataException)
-                {
-                    if (this.bytes.UnreadableBytes != 0)
-                    {
-                        this.UnreadByteStuffedByte();
-                    }
-                }
-            }
-
-            int code = 0;
-            for (int i = 0; i < MaxCodeLength; i++)
-            {
-                if (this.bits.UnreadBits == 0)
-                {
-                    this.EnsureNBits(1);
-                }
-
-                if ((this.bits.Accumulator & this.bits.Mask) != 0)
-                {
-                    code |= 1;
-                }
-
-                this.bits.UnreadBits--;
-                this.bits.Mask >>= 1;
-
-                if (code <= huffman.MaxCodes[i])
-                {
-                    return huffman.Values[huffman.Indices[i] + code - huffman.MinCodes[i]];
-                }
-
-                code <<= 1;
-            }
-
-            throw new ImageFormatException("Bad Huffman code");
-        }
-
-        /// <summary>
-        /// Decodes a single bit
-        /// </summary>
-        /// <returns>The <see cref="bool"/></returns>
-        private bool DecodeBit()
-        {
-            if (this.bits.UnreadBits == 0)
-            {
-                this.EnsureNBits(1);
-            }
-
-            bool ret = (this.bits.Accumulator & this.bits.Mask) != 0;
-            this.bits.UnreadBits--;
-            this.bits.Mask >>= 1;
-            return ret;
-        }
-
-        /// <summary>
-        /// Decodes the given number of bits
-        /// </summary>
-        /// <param name="count">The number of bits to decode.</param>
-        /// <returns>The <see cref="uint"/></returns>
-        private uint DecodeBits(int count)
-        {
-            if (this.bits.UnreadBits < count)
-            {
-                this.EnsureNBits(count);
-            }
-
-            uint ret = this.bits.Accumulator >> (this.bits.UnreadBits - count);
-            ret = (uint)(ret & ((1 << count) - 1));
-            this.bits.UnreadBits -= count;
-            this.bits.Mask >>= count;
-            return ret;
-        }
-
-        /// <summary>
-        /// Fills up the bytes buffer from the underlying stream.
-        /// It should only be called when there are no unread bytes in bytes.
-        /// </summary>
-        private void Fill()
-        {
-            if (this.bytes.I != this.bytes.J)
-            {
-                throw new ImageFormatException("Fill called when unread bytes exist.");
-            }
-
-            // Move the last 2 bytes to the start of the buffer, in case we need
-            // to call UnreadByteStuffedByte.
-            if (this.bytes.J > 2)
-            {
-                this.bytes.Buffer[0] = this.bytes.Buffer[this.bytes.J - 2];
-                this.bytes.Buffer[1] = this.bytes.Buffer[this.bytes.J - 1];
-                this.bytes.I = 2;
-                this.bytes.J = 2;
-            }
-
-            // Fill in the rest of the buffer.
-            int n = this.inputStream.Read(this.bytes.Buffer, this.bytes.J, this.bytes.Buffer.Length - this.bytes.J);
-            if (n == 0)
-            {
-                throw new EOFException();
-            }
-
-            this.bytes.J += n;
-        }
-
-        /// <summary>
-        /// Undoes the most recent ReadByteStuffedByte call,
-        /// giving a byte of data back from bits to bytes. The Huffman look-up table
-        /// requires at least 8 bits for look-up, which means that Huffman decoding can
-        /// sometimes overshoot and read one or two too many bytes. Two-byte overshoot
-        /// can happen when expecting to read a 0xff 0x00 byte-stuffed byte.
-        /// </summary>
-        private void UnreadByteStuffedByte()
-        {
-            this.bytes.I -= this.bytes.UnreadableBytes;
-            this.bytes.UnreadableBytes = 0;
-            if (this.bits.UnreadBits >= 8)
-            {
-                this.bits.Accumulator >>= 8;
-                this.bits.UnreadBits -= 8;
-                this.bits.Mask >>= 8;
-            }
-        }
-
-        /// <summary>
-        /// Returns the next byte, whether buffered or not buffered. It does not care about byte stuffing.
-        /// </summary>
-        /// <returns>The <see cref="byte"/></returns>
-        private byte ReadByte()
-        {
-            while (this.bytes.I == this.bytes.J)
-            {
-                this.Fill();
-            }
-
-            byte x = this.bytes.Buffer[this.bytes.I];
-            this.bytes.I++;
-            this.bytes.UnreadableBytes = 0;
-            return x;
-        }
-
-        /// <summary>
-        /// ReadByteStuffedByte is like ReadByte but is for byte-stuffed Huffman data.
-        /// </summary>
-        /// <returns>The <see cref="byte"/></returns>
-        private byte ReadByteStuffedByte()
-        {
-            byte x;
-
-            // Take the fast path if bytes.buf contains at least two bytes.
-            if (this.bytes.I + 2 <= this.bytes.J)
-            {
-                x = this.bytes.Buffer[this.bytes.I];
-                this.bytes.I++;
-                this.bytes.UnreadableBytes = 1;
-                if (x != JpegConstants.Markers.XFF)
-                {
-                    return x;
-                }
-
-                if (this.bytes.Buffer[this.bytes.I] != 0x00)
-                {
-                    throw new MissingFF00Exception();
-                }
-
-                this.bytes.I++;
-                this.bytes.UnreadableBytes = 2;
-                return JpegConstants.Markers.XFF;
-            }
-
-            this.bytes.UnreadableBytes = 0;
-
-            x = this.ReadByte();
-            this.bytes.UnreadableBytes = 1;
-            if (x != JpegConstants.Markers.XFF)
-            {
-                return x;
-            }
-
-            x = this.ReadByte();
-            this.bytes.UnreadableBytes = 2;
-            if (x != 0x00)
-            {
-                throw new MissingFF00Exception();
-            }
-
-            return JpegConstants.Markers.XFF;
-        }
-
-        /// <summary>
-        /// Reads exactly length bytes into data. It does not care about byte stuffing.
-        /// </summary>
-        /// <param name="data">The data to write to.</param>
-        /// <param name="offset">The offset in the source buffer</param>
-        /// <param name="length">The number of bytes to read</param>
-        private void ReadFull(byte[] data, int offset, int length)
-        {
-            // Unread the overshot bytes, if any.
-            if (this.bytes.UnreadableBytes != 0)
-            {
-                if (this.bits.UnreadBits >= 8)
-                {
-                    this.UnreadByteStuffedByte();
-                }
-
-                this.bytes.UnreadableBytes = 0;
-            }
-
-            while (length > 0)
-            {
-                if (this.bytes.J - this.bytes.I >= length)
-                {
-                    Array.Copy(this.bytes.Buffer, this.bytes.I, data, offset, length);
-                    this.bytes.I += length;
-                    length -= length;
-                }
-                else
-                {
-                    Array.Copy(this.bytes.Buffer, this.bytes.I, data, offset, this.bytes.J - this.bytes.I);
-                    offset += this.bytes.J - this.bytes.I;
-                    length -= this.bytes.J - this.bytes.I;
-                    this.bytes.I += this.bytes.J - this.bytes.I;
-
-                    this.Fill();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Skips the next n bytes.
-        /// </summary>
-        /// <param name="count">The number of bytes to ignore.</param>
-        private void Skip(int count)
-        {
-            // Unread the overshot bytes, if any.
-            if (this.bytes.UnreadableBytes != 0)
-            {
-                if (this.bits.UnreadBits >= 8)
-                {
-                    this.UnreadByteStuffedByte();
-                }
-
-                this.bytes.UnreadableBytes = 0;
-            }
-
-            while (true)
-            {
-                int m = this.bytes.J - this.bytes.I;
-                if (m > count)
-                {
-                    m = count;
-                }
-
-                this.bytes.I += m;
-                count -= m;
-                if (count == 0)
-                {
-                    break;
-                }
-
-                this.Fill();
-            }
-        }
-
-        /// <summary>
-        /// Processes the Start of Frame marker.  Specified in section B.2.2.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessStartOfFrameMarker(int remaining)
-        {
-            if (this.componentCount != 0)
-            {
-                throw new ImageFormatException("Multiple SOF markers");
-            }
-
-            switch (remaining)
-            {
-                case 6 + (3 * 1): // Grayscale image.
-                    this.componentCount = 1;
-                    break;
-                case 6 + (3 * 3): // YCbCr or RGB image.
-                    this.componentCount = 3;
-                    break;
-                case 6 + (3 * 4): // YCbCrK or CMYK image.
-                    this.componentCount = 4;
-                    break;
-                default:
-                    throw new ImageFormatException("Incorrect number of components");
-            }
-
-            this.ReadFull(this.temp, 0, remaining);
-
-            // We only support 8-bit precision.
-            if (this.temp[0] != 8)
-            {
-                throw new ImageFormatException("Only 8-Bit precision supported.");
-            }
-
-            this.imageHeight = (this.temp[1] << 8) + this.temp[2];
-            this.imageWidth = (this.temp[3] << 8) + this.temp[4];
-            if (this.temp[5] != this.componentCount)
-            {
-                throw new ImageFormatException("SOF has wrong length");
-            }
-
-            for (int i = 0; i < this.componentCount; i++)
-            {
-                this.componentArray[i].Identifier = this.temp[6 + (3 * i)];
-
-                // Section B.2.2 states that "the value of C_i shall be different from
-                // the values of C_1 through C_(i-1)".
-                for (int j = 0; j < i; j++)
-                {
-                    if (this.componentArray[i].Identifier == this.componentArray[j].Identifier)
-                    {
-                        throw new ImageFormatException("Repeated component identifier");
-                    }
-                }
-
-                this.componentArray[i].Selector = this.temp[8 + (3 * i)];
-                if (this.componentArray[i].Selector > MaxTq)
-                {
-                    throw new ImageFormatException("Bad Tq value");
-                }
-
-                byte hv = this.temp[7 + (3 * i)];
-                int h = hv >> 4;
-                int v = hv & 0x0f;
-                if (h < 1 || h > 4 || v < 1 || v > 4)
-                {
-                    throw new ImageFormatException("Unsupported Luma/chroma subsampling ratio");
-                }
-
-                if (h == 3 || v == 3)
-                {
-                    throw new ImageFormatException("Lnsupported subsampling ratio");
-                }
-
-                switch (this.componentCount)
-                {
-                    case 1:
-
-                        // If a JPEG image has only one component, section A.2 says "this data
-                        // is non-interleaved by definition" and section A.2.2 says "[in this
-                        // case...] the order of data units within a scan shall be left-to-right
-                        // and top-to-bottom... regardless of the values of H_1 and V_1". Section
-                        // 4.8.2 also says "[for non-interleaved data], the MCU is defined to be
-                        // one data unit". Similarly, section A.1.1 explains that it is the ratio
-                        // of H_i to max_j(H_j) that matters, and similarly for V. For grayscale
-                        // images, H_1 is the maximum H_j for all components j, so that ratio is
-                        // always 1. The component's (h, v) is effectively always (1, 1): even if
-                        // the nominal (h, v) is (2, 1), a 20x5 image is encoded in three 8x8
-                        // MCUs, not two 16x8 MCUs.
-                        h = 1;
-                        v = 1;
-                        break;
-
-                    case 3:
-
-                        // For YCbCr images, we only support 4:4:4, 4:4:0, 4:2:2, 4:2:0,
-                        // 4:1:1 or 4:1:0 chroma subsampling ratios. This implies that the
-                        // (h, v) values for the Y component are either (1, 1), (1, 2),
-                        // (2, 1), (2, 2), (4, 1) or (4, 2), and the Y component's values
-                        // must be a multiple of the Cb and Cr component's values. We also
-                        // assume that the two chroma components have the same subsampling
-                        // ratio.
-                        switch (i)
-                        {
-                            case 0:
-                                {
-                                    // Y.
-                                    // We have already verified, above, that h and v are both
-                                    // either 1, 2 or 4, so invalid (h, v) combinations are those
-                                    // with v == 4.
-                                    if (v == 4)
-                                    {
-                                        throw new ImageFormatException("Unsupported subsampling ratio");
-                                    }
-
-                                    break;
-                                }
-
-                            case 1:
-                                {
-                                    // Cb.
-                                    if (this.componentArray[0].HorizontalFactor % h != 0 || this.componentArray[0].VerticalFactor % v != 0)
-                                    {
-                                        throw new ImageFormatException("Unsupported subsampling ratio");
-                                    }
-
-                                    break;
-                                }
-
-                            case 2:
-                                {
-                                    // Cr.
-                                    if (this.componentArray[1].HorizontalFactor != h || this.componentArray[1].VerticalFactor != v)
-                                    {
-                                        throw new ImageFormatException("Unsupported subsampling ratio");
-                                    }
-
-                                    break;
-                                }
-                        }
-
-                        break;
-
-                    case 4:
-
-                        // For 4-component images (either CMYK or YCbCrK), we only support two
-                        // hv vectors: [0x11 0x11 0x11 0x11] and [0x22 0x11 0x11 0x22].
-                        // Theoretically, 4-component JPEG images could mix and match hv values
-                        // but in practice, those two combinations are the only ones in use,
-                        // and it simplifies the applyBlack code below if we can assume that:
-                        // - for CMYK, the C and K channels have full samples, and if the M
-                        // and Y channels subsample, they subsample both horizontally and
-                        // vertically.
-                        // - for YCbCrK, the Y and K channels have full samples.
-                        switch (i)
-                        {
-                            case 0:
-                                if (hv != 0x11 && hv != 0x22)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                            case 1:
-                            case 2:
-                                if (hv != 0x11)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                            case 3:
-                                if (this.componentArray[0].HorizontalFactor != h || this.componentArray[0].VerticalFactor != v)
-                                {
-                                    throw new ImageFormatException("Unsupported subsampling ratio");
-                                }
-
-                                break;
-                        }
-
-                        break;
-                }
-
-                this.componentArray[i].HorizontalFactor = h;
-                this.componentArray[i].VerticalFactor = v;
-            }
-        }
-
-        /// <summary>
-        /// Processes the Define Quantization Marker and tables. Specified in section B.2.4.1.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the tables do not match the header
-        /// </exception>
-        private void ProcessDqt(int remaining)
-        {
-            while (remaining > 0)
-            {
-                bool done = false;
-
-                remaining--;
-                byte x = this.ReadByte();
-                byte tq = (byte)(x & 0x0f);
-                if (tq > MaxTq)
-                {
-                    throw new ImageFormatException("Bad Tq value");
-                }
-
-                switch (x >> 4)
-                {
-                    case 0:
-                        if (remaining < Block.BlockSize)
-                        {
-                            done = true;
-                            break;
-                        }
-
-                        remaining -= Block.BlockSize;
-                        this.ReadFull(this.temp, 0, Block.BlockSize);
-
-                        for (int i = 0; i < Block.BlockSize; i++)
-                        {
-                            this.quantizationTables[tq][i] = this.temp[i];
-                        }
-
-                        break;
-                    case 1:
-                        if (remaining < 2 * Block.BlockSize)
-                        {
-                            done = true;
-                            break;
-                        }
-
-                        remaining -= 2 * Block.BlockSize;
-                        this.ReadFull(this.temp, 0, 2 * Block.BlockSize);
-
-                        for (int i = 0; i < Block.BlockSize; i++)
-                        {
-                            this.quantizationTables[tq][i] = (this.temp[2 * i] << 8) | this.temp[(2 * i) + 1];
-                        }
-
-                        break;
-                    default:
-                        throw new ImageFormatException("Bad Pq value");
-                }
-
-                if (done)
-                {
-                    break;
-                }
-            }
-
-            if (remaining != 0)
-            {
-                throw new ImageFormatException("DQT has wrong length");
-            }
-        }
-
-        /// <summary>
-        /// Processes the DRI (Define Restart Interval Marker) Which specifies the interval between RSTn markers, in macroblocks
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessDefineRestartIntervalMarker(int remaining)
-        {
-            if (remaining != 2)
-            {
-                throw new ImageFormatException("DRI has wrong length");
-            }
-
-            this.ReadFull(this.temp, 0, 2);
-            this.restartInterval = ((int)this.temp[0] << 8) + (int)this.temp[1];
-        }
-
-        /// <summary>
-        /// Processes the application header containing the JFIF identifier plus extra data.
-        /// </summary>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        private void ProcessApplicationHeader(int remaining)
-        {
-            if (remaining < 5)
-            {
-                this.Skip(remaining);
-                return;
-            }
-
-            this.ReadFull(this.temp, 0, 13);
-            remaining -= 13;
-
-            // TODO: We should be using constants for this.
-            this.isJfif = this.temp[0] == 'J' &&
-                          this.temp[1] == 'F' &&
-                          this.temp[2] == 'I' &&
-                          this.temp[3] == 'F' &&
-                          this.temp[4] == '\x00';
-
-            if (this.isJfif)
-            {
-                this.horizontalResolution = (short)(this.temp[9] + (this.temp[10] << 8));
-                this.verticalResolution = (short)(this.temp[11] + (this.temp[12] << 8));
-            }
-
-            if (remaining > 0)
-            {
-                this.Skip(remaining);
-            }
-        }
-
-        /// <summary>
-        /// Processes the App1 marker retrieving any stored metadata
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <param name="image">The image.</param>
-        private void ProcessApp1Marker<TColor, TPacked>(int remaining, Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (remaining < 6)
-            {
-                this.Skip(remaining);
-                return;
-            }
-
-            byte[] profile = new byte[remaining];
-            this.ReadFull(profile, 0, remaining);
-
-            if (profile[0] == 'E' &&
-                profile[1] == 'x' &&
-                profile[2] == 'i' &&
-                profile[3] == 'f' &&
-                profile[4] == '\0' &&
-                profile[5] == '\0')
-            {
-                image.ExifProfile = new ExifProfile(profile);
-            }
-        }
-
-        /// <summary>
-        /// Processes the "Adobe" APP14 segment stores image encoding information for DCT filters.
-        /// This segment may be copied or deleted as a block using the Extra "Adobe" tag, but note that it is not
-        /// deleted by default when deleting all metadata because it may affect the appearance of the image.
-        /// </summary>
-        /// <param name="remaining">The remaining number of bytes in the stream.</param>
-        private void ProcessApp14Marker(int remaining)
-        {
-            if (remaining < 12)
-            {
-                this.Skip(remaining);
-                return;
-            }
-
-            this.ReadFull(this.temp, 0, 12);
-            remaining -= 12;
-
-            if (this.temp[0] == 'A' &&
-                this.temp[1] == 'd' &&
-                this.temp[2] == 'o' &&
-                this.temp[3] == 'b' &&
-                this.temp[4] == 'e')
-            {
-                this.adobeTransformValid = true;
-                this.adobeTransform = this.temp[11];
-            }
-
-            if (remaining > 0)
-            {
-                this.Skip(remaining);
-            }
-        }
-
-        /// <summary>
-        /// Converts the image from the original CMYK image pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="width">The image width.</param>
-        /// <param name="height">The image height.</param>
-        /// <param name="image">The image.</param>
-        private void ConvertFromCmyk<TColor, TPacked>(int width, int height, Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (!this.adobeTransformValid)
-            {
-                throw new ImageFormatException("Unknown color model: 4-component JPEG doesn't have Adobe APP14 metadata");
-            }
-
-            // If the 4-component JPEG image isn't explicitly marked as "Unknown (RGB
-            // or CMYK)" as per http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe
-            if (this.adobeTransform != JpegConstants.Adobe.ColorTransformUnknown)
-            {
-                int scale = this.componentArray[0].HorizontalFactor / this.componentArray[1].HorizontalFactor;
-
-                image.InitPixels(width, height);
-
-                using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-                {
-                    // Convert the YCbCr part of the YCbCrK to RGB, invert the RGB to get
-                    // CMY, and patch in the original K. The RGB to CMY inversion cancels
-                    // out the 'Adobe inversion' described in the applyBlack doc comment
-                    // above, so in practice, only the fourth channel (black) is inverted.
-                    Parallel.For(
-                        0,
-                        height,
-                        y =>
-                        {
-                            int yo = this.ycbcrImage.GetRowYOffset(y);
-                            int co = this.ycbcrImage.GetRowCOffset(y);
-
-                            for (int x = 0; x < width; x++)
-                            {
-                                byte yy = this.ycbcrImage.YChannel[yo + x];
-                                byte cb = this.ycbcrImage.CbChannel[co + (x / scale)];
-                                byte cr = this.ycbcrImage.CrChannel[co + (x / scale)];
-
-                                TColor packed = default(TColor);
-                                this.PackCmyk<TColor, TPacked>(ref packed, yy, cb, cr, x, y);
-                                pixels[x, y] = packed;
-                            }
-                        });
-                }
-
-                this.AssignResolution(image);
-            }
-        }
-
-        /// <summary>
-        /// Converts the image from the original grayscale image pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="width">The image width.</param>
-        /// <param name="height">The image height.</param>
-        /// <param name="image">The image.</param>
-        private void ConvertFromGrayScale<TColor, TPacked>(int width, int height, Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            image.InitPixels(width, height);
-
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    Bootstrapper.Instance.ParallelOptions,
-                    y =>
-                    {
-                        int yoff = this.grayImage.GetRowOffset(y);
-                        for (int x = 0; x < width; x++)
-                        {
-                            byte rgb = this.grayImage.Pixels[yoff + x];
-
-                            TColor packed = default(TColor);
-                            packed.PackFromBytes(rgb, rgb, rgb, 255);
-                            pixels[x, y] = packed;
-                        }
-                    });
-            }
-
-            this.AssignResolution(image);
-        }
-
-        /// <summary>
-        /// Converts the image from the original YCbCr image pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="width">The image width.</param>
-        /// <param name="height">The image height.</param>
-        /// <param name="image">The image.</param>
-        private void ConvertFromYCbCr<TColor, TPacked>(int width, int height, Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int scale = this.componentArray[0].HorizontalFactor / this.componentArray[1].HorizontalFactor;
-            image.InitPixels(width, height);
-
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    Bootstrapper.Instance.ParallelOptions,
-                    y =>
-                    {
-                        int yo = this.ycbcrImage.GetRowYOffset(y);
-                        int co = this.ycbcrImage.GetRowCOffset(y);
-
-                        for (int x = 0; x < width; x++)
-                        {
-                            byte yy = this.ycbcrImage.YChannel[yo + x];
-                            byte cb = this.ycbcrImage.CbChannel[co + (x / scale)];
-                            byte cr = this.ycbcrImage.CrChannel[co + (x / scale)];
-
-                            TColor packed = default(TColor);
-                            PackYcbCr<TColor, TPacked>(ref packed, yy, cb, cr);
-                            pixels[x, y] = packed;
-                        }
-                    });
-            }
-
-            this.AssignResolution(image);
-        }
-
-        /// <summary>
-        /// Converts the image from the original RBG image pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="width">The image width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="image">The image.</param>
-        private void ConvertFromRGB<TColor, TPacked>(int width, int height, Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int scale = this.componentArray[0].HorizontalFactor / this.componentArray[1].HorizontalFactor;
-            image.InitPixels(width, height);
-
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    Bootstrapper.Instance.ParallelOptions,
-                    y =>
-                    {
-                        int yo = this.ycbcrImage.GetRowYOffset(y);
-                        int co = this.ycbcrImage.GetRowCOffset(y);
-
-                        for (int x = 0; x < width; x++)
-                        {
-                            byte red = this.ycbcrImage.YChannel[yo + x];
-                            byte green = this.ycbcrImage.CbChannel[co + (x / scale)];
-                            byte blue = this.ycbcrImage.CrChannel[co + (x / scale)];
-
-                            TColor packed = default(TColor);
-                            packed.PackFromBytes(red, green, blue, 255);
-                            pixels[x, y] = packed;
-                        }
-                    });
-            }
-
-            this.AssignResolution(image);
-        }
-
-        /// <summary>
-        /// Assigns the horizontal and vertical resolution to the image if it has a JFIF header.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to assign the resolution to.</param>
-        private void AssignResolution<TColor, TPacked>(Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (this.isJfif && this.horizontalResolution > 0 && this.verticalResolution > 0)
-            {
-                image.HorizontalResolution = this.horizontalResolution;
-                image.VerticalResolution = this.verticalResolution;
-            }
-        }
-
-        private Block scanWorkerBlock = Block.Create();
-
-        /// <summary>
-        /// Processes the SOS (Start of scan marker).
-        /// </summary>
-        /// <remarks>
-        /// TODO: This also needs some significant refactoring to follow a more OO format.
-        /// </remarks>
-        /// <param name="remaining">The remaining bytes in the segment block.</param>
-        /// <exception cref="ImageFormatException">
-        /// Missing SOF Marker
-        /// SOS has wrong length
-        /// </exception>
-        private void ProcessStartOfScan(int remaining)
-        {
-            if (this.componentCount == 0)
-            {
-                throw new ImageFormatException("Missing SOF marker");
-            }
-
-            if (remaining < 6 || 4 + (2 * this.componentCount) < remaining || remaining % 2 != 0)
-            {
-                throw new ImageFormatException("SOS has wrong length");
-            }
-
-            this.ReadFull(this.temp, 0, remaining);
-            byte scanComponentCount = this.temp[0];
-
-            int scanComponentCountX2 = 2 * scanComponentCount;
-            if (remaining != 4 + scanComponentCountX2)
-            {
-                throw new ImageFormatException("SOS length inconsistent with number of components");
-            }
-
-            Scan[] scan = new Scan[MaxComponents];
-            int totalHv = 0;
-
-            for (int i = 0; i < scanComponentCount; i++)
-            {
-                ProcessScanImpl(i, ref scan[i], scan, ref totalHv);
-            }
-
-            // Section B.2.3 states that if there is more than one component then the
-            // total H*V values in a scan must be <= 10.
-            if (this.componentCount > 1 && totalHv > 10)
-            {
-                throw new ImageFormatException("Total sampling factors too large.");
-            }
-
-            // zigStart and zigEnd are the spectral selection bounds.
-            // ah and al are the successive approximation high and low values.
-            // The spec calls these values Ss, Se, Ah and Al.
-            // For progressive JPEGs, these are the two more-or-less independent
-            // aspects of progression. Spectral selection progression is when not
-            // all of a block's 64 DCT coefficients are transmitted in one pass.
-            // For example, three passes could transmit coefficient 0 (the DC
-            // component), coefficients 1-5, and coefficients 6-63, in zig-zag
-            // order. Successive approximation is when not all of the bits of a
-            // band of coefficients are transmitted in one pass. For example,
-            // three passes could transmit the 6 most significant bits, followed
-            // by the second-least significant bit, followed by the least
-            // significant bit.
-            // For baseline JPEGs, these parameters are hard-coded to 0/63/0/0.
-            int zigStart = 0;
-            int zigEnd = Block.BlockSize - 1;
-            int ah = 0;
-            int al = 0;
-
-            if (this.isProgressive)
-            {
-                zigStart = this.temp[1 + scanComponentCountX2];
-                zigEnd = this.temp[2 + scanComponentCountX2];
-                ah = this.temp[3 + scanComponentCountX2] >> 4;
-                al = this.temp[3 + scanComponentCountX2] & 0x0f;
-
-                if ((zigStart == 0 && zigEnd != 0) || zigStart > zigEnd || Block.BlockSize <= zigEnd)
-                {
-                    throw new ImageFormatException("Bad spectral selection bounds");
-                }
-
-                if (zigStart != 0 && scanComponentCount != 1)
-                {
-                    throw new ImageFormatException("Progressive AC coefficients for more than one component");
-                }
-
-                if (ah != 0 && ah != al + 1)
-                {
-                    throw new ImageFormatException("Bad successive approximation values");
-                }
-            }
-
-            // mxx and myy are the number of MCUs (Minimum Coded Units) in the image.
-            int h0 = this.componentArray[0].HorizontalFactor;
-            int v0 = this.componentArray[0].VerticalFactor;
-            int mxx = (this.imageWidth + (8 * h0) - 1) / (8 * h0);
-            int myy = (this.imageHeight + (8 * v0) - 1) / (8 * v0);
-
-            if (this.grayImage == null && this.ycbcrImage == null)
-            {
-                this.MakeImage(mxx, myy);
-            }
-
-            if (this.isProgressive)
-            {
-                for (int i = 0; i < scanComponentCount; i++)
-                {
-                    int compIndex = scan[i].Index;
-                    if (this.progCoeffs[compIndex] == null)
-                    {
-                        this.progCoeffs[compIndex] = Block.CreateArray(mxx * myy * this.componentArray[compIndex].HorizontalFactor * this.componentArray[compIndex].VerticalFactor);
-
-                        for (int j = 0; j < this.progCoeffs[compIndex].Length; j++)
-                        {
-                            this.progCoeffs[compIndex][j].Init();
-                        }
-                    }
-                }
-            }
-
-            this.bits = new Bits();
-
-            int mcu = 0;
-            byte expectedRst = JpegConstants.Markers.RST0;
-
-            // b is the decoded coefficients block, in natural (not zig-zag) order.
-            //Block b;
-            int[] dc = new int[MaxComponents];
-
-            // bx and by are the location of the current block, in units of 8x8
-            // blocks: the third block in the first row has (bx, by) = (2, 0).
-            int bx, by, blockCount = 0;
-
-            for (int my = 0; my < myy; my++)
-            {
-                for (int mx = 0; mx < mxx; mx++)
-                {
-                    for (int i = 0; i < scanComponentCount; i++)
-                    {
-                        int compIndex = scan[i].Index;
-                        int hi = this.componentArray[compIndex].HorizontalFactor;
-                        int vi = this.componentArray[compIndex].VerticalFactor;
-                        
-
-                        for (int j = 0; j < hi * vi; j++)
-                        {
-                            // The blocks are traversed one MCU at a time. For 4:2:0 chroma
-                            // subsampling, there are four Y 8x8 blocks in every 16x16 MCU.
-                            // For a baseline 32x16 pixel image, the Y blocks visiting order is:
-                            // 0 1 4 5
-                            // 2 3 6 7
-                            // For progressive images, the interleaved scans (those with component count > 1)
-                            // are traversed as above, but non-interleaved scans are traversed left
-                            // to right, top to bottom:
-                            // 0 1 2 3
-                            // 4 5 6 7
-                            // Only DC scans (zigStart == 0) can be interleave AC scans must have
-                            // only one component.
-                            // To further complicate matters, for non-interleaved scans, there is no
-                            // data for any blocks that are inside the image at the MCU level but
-                            // outside the image at the pixel level. For example, a 24x16 pixel 4:2:0
-                            // progressive image consists of two 16x16 MCUs. The interleaved scans
-                            // will process 8 Y blocks:
-                            // 0 1 4 5
-                            // 2 3 6 7
-                            // The non-interleaved scans will process only 6 Y blocks:
-                            // 0 1 2
-                            // 3 4 5
-                            if (scanComponentCount != 1)
-                            {
-                                bx = (hi * mx) + (j % hi);
-                                by = (vi * my) + (j / hi);
-                            }
-                            else
-                            {
-                                int q = mxx * hi;
-                                bx = blockCount % q;
-                                by = blockCount / q;
-                                blockCount++;
-                                if (bx * 8 >= this.imageWidth || by * 8 >= this.imageHeight)
-                                {
-                                    continue;
-                                }
-                            }
-
-                            var qtIndex = this.componentArray[compIndex].Selector;
-                            
-                            if (this.isProgressive) // Load the previous partially decoded coefficients, if applicable.
-                            {
-                                blockIndex = ((@by * mxx) * hi) + bx;
-                                ProcessBlockImpl(ah, 
-                                    ref this.progCoeffs[compIndex][blockIndex], 
-                                    scan, i, zigStart, zigEnd, al, dc, compIndex, @by, mxx, hi, bx,
-                                    ref this.quantizationTables[qtIndex]
-                                    );
-                            }
-                            else
-                            {
-                                //var b = Block.Create();
-                                scanWorkerBlock.Clear();
-                                
-                                ProcessBlockImpl(ah, ref scanWorkerBlock, scan, i, zigStart, zigEnd, al, dc, compIndex, @by, mxx, hi,
-                                    bx, ref this.quantizationTables[qtIndex]
-                                    );
-                                
-                                //b.Dispose();
-                            }
-                        }
-
-                        // for j
-                    }
-
-                    // for i
-                    mcu++;
-
-                    if (this.restartInterval > 0 && mcu % this.restartInterval == 0 && mcu < mxx * myy)
-                    {
-                        // A more sophisticated decoder could use RST[0-7] markers to resynchronize from corrupt input,
-                        // but this one assumes well-formed input, and hence the restart marker follows immediately.
-                        this.ReadFull(this.temp, 0, 2);
-                        if (this.temp[0] != 0xff || this.temp[1] != expectedRst)
-                        {
-                            throw new ImageFormatException("Bad RST marker");
-                        }
-
-                        expectedRst++;
-                        if (expectedRst == JpegConstants.Markers.RST7 + 1)
-                        {
-                            expectedRst = JpegConstants.Markers.RST0;
-                        }
-
-                        // Reset the Huffman decoder.
-                        this.bits = new Bits();
-
-                        // Reset the DC components, as per section F.2.1.3.1.
-                        dc = new int[MaxComponents];
-
-                        // Reset the progressive decoder state, as per section G.1.2.2.
-                        this.eobRun = 0;
-                    }
-                }
-
-                // for mx
-            }
-
-            // for my
-        }
-
-        private void ProcessBlockImpl(int ah, ref Block b, Scan[] scan, int i, int zigStart, int zigEnd, int al,
-            int[] dc, int compIndex, int @by, int mxx, int hi, int bx, ref Block qt)
-        {
-            if (ah != 0)
-            {
-                this.Refine(ref b, ref this.huffmanTrees[AcTable * ThRowSize + scan[i].AcTableSelector], zigStart, zigEnd, 1 << al);
-            }
-            else
-            {
-                int zig = zigStart;
-                if (zig == 0)
-                {
-                    zig++;
-
-                    // Decode the DC coefficient, as specified in section F.2.2.1.
-                    byte value = this.DecodeHuffman(ref this.huffmanTrees[DcTable * ThRowSize + scan[i].DcTableSelector]);
-                    if (value > 16)
-                    {
-                        throw new ImageFormatException("Excessive DC component");
-                    }
-
-                    int deltaDC = this.ReceiveExtend(value);
-                    dc[compIndex] += deltaDC;
-                    b[0] = dc[compIndex] << al;
-                }
-
-                if (zig <= zigEnd && this.eobRun > 0)
-                {
-                    this.eobRun--;
-                }
-                else
-                {
-                    // Decode the AC coefficients, as specified in section F.2.2.2.
-                    //Huffman huffv = ;
-                    for (; zig <= zigEnd; zig++)
-                    {
-                        byte value = this.DecodeHuffman(ref this.huffmanTrees[AcTable * ThRowSize + scan[i].AcTableSelector]);
-                        byte val0 = (byte) (value >> 4);
-                        byte val1 = (byte) (value & 0x0f);
-                        if (val1 != 0)
-                        {
-                            zig += val0;
-                            if (zig > zigEnd)
-                            {
-                                break;
-                            }
-
-                            int ac = this.ReceiveExtend(val1);
-                            b[Unzig[zig]] = ac << al;
-                        }
-                        else
-                        {
-                            if (val0 != 0x0f)
-                            {
-                                this.eobRun = (ushort) (1 << val0);
-                                if (val0 != 0)
-                                {
-                                    this.eobRun |= (ushort) this.DecodeBits(val0);
-                                }
-
-                                this.eobRun--;
-                                break;
-                            }
-
-                            zig += 0x0f;
-                        }
-                    }
-                }
-            }
-
-            if (this.isProgressive)
-            {
-                if (zigEnd != Block.BlockSize - 1 || al != 0)
-                {
-                    // We haven't completely decoded this 8x8 block. Save the coefficients.
-                    
-                    this.progCoeffs[compIndex][((@by*mxx)*hi) + bx] = b.Clone();
-
-                    // At this point, we could execute the rest of the loop body to dequantize and
-                    // perform the inverse DCT, to save early stages of a progressive image to the
-                    // *image.YCbCr buffers (the whole point of progressive encoding), but in Go,
-                    // the jpeg.Decode function does not return until the entire image is decoded,
-                    // so we "continue" here to avoid wasted computation.
-                    return;
-                }
-            }
-
-            // Dequantize, perform the inverse DCT and store the block to the image.
-            for (int zig = 0; zig < Block.BlockSize; zig++)
-            {
-                b[Unzig[zig]] *= qt[zig];
-            }
-
-            //IDCT.Transform(ref b);
-            //FloatIDCT.Transform(ref b);
-            MagicDCT.IDCT(ref b);
-
-            byte[] dst;
-            int offset;
-            int stride;
-
-            if (this.componentCount == 1)
-            {
-                dst = this.grayImage.Pixels;
-                stride = this.grayImage.Stride;
-                offset = this.grayImage.Offset + (8*((@by*this.grayImage.Stride) + bx));
-            }
-            else
-            {
-                switch (compIndex)
-                {
-                    case 0:
-                        dst = this.ycbcrImage.YChannel;
-                        stride = this.ycbcrImage.YStride;
-                        offset = this.ycbcrImage.YOffset + (8*((@by*this.ycbcrImage.YStride) + bx));
-                        break;
-
-                    case 1:
-                        dst = this.ycbcrImage.CbChannel;
-                        stride = this.ycbcrImage.CStride;
-                        offset = this.ycbcrImage.COffset + (8*((@by*this.ycbcrImage.CStride) + bx));
-                        break;
-
-                    case 2:
-                        dst = this.ycbcrImage.CrChannel;
-                        stride = this.ycbcrImage.CStride;
-                        offset = this.ycbcrImage.COffset + (8*((@by*this.ycbcrImage.CStride) + bx));
-                        break;
-
-                    case 3:
-
-                        dst = this.blackPixels;
-                        stride = this.blackStride;
-                        offset = 8*((@by*this.blackStride) + bx);
-                        break;
-
-                    default:
-                        throw new ImageFormatException("Too many components");
-                }
-            }
-
-            // Level shift by +128, clip to [0, 255], and write to dst.
-            for (int y = 0; y < 8; y++)
-            {
-                int y8 = y*8;
-                int yStride = y*stride;
-
-                for (int x = 0; x < 8; x++)
-                {
-                    int c = b[y8 + x];
-                    if (c < -128)
-                    {
-                        c = 0;
-                    }
-                    else if (c > 127)
-                    {
-                        c = 255;
-                    }
-                    else
-                    {
-                        c += 128;
-                    }
-
-                    dst[yStride + x + offset] = (byte) c;
-                }
-            }
-        }
-
-        private void ProcessScanImpl(int i, ref Scan currentScan, Scan[] scan, ref int totalHv)
-        {
-            // Component selector.
-            int cs = this.temp[1 + (2 * i)];
-            int compIndex = -1;
-            for (int j = 0; j < this.componentCount; j++)
-            {
-                //Component compv = ;
-                if (cs == this.componentArray[j].Identifier)
-                {
-                    compIndex = j;
-                }
-            }
-
-            if (compIndex < 0)
-            {
-                throw new ImageFormatException("Unknown component selector");
-            }
-
-            currentScan.Index = (byte)compIndex;
-
-            ProcessComponentImpl(i, ref currentScan, scan, ref totalHv, ref this.componentArray[compIndex]);
-        }
-
-        private void ProcessComponentImpl(int i, ref Scan currentScan, Scan[] scan, ref int totalHv, ref Component currentComponent)
-        {
-            // Section B.2.3 states that "the value of Cs_j shall be different from
-            // the values of Cs_1 through Cs_(j-1)". Since we have previously
-            // verified that a frame's component identifiers (C_i values in section
-            // B.2.2) are unique, it suffices to check that the implicit indexes
-            // into comp are unique.
-            for (int j = 0; j < i; j++)
-            {
-                if (currentScan.Index == scan[j].Index)
-                {
-                    throw new ImageFormatException("Repeated component selector");
-                }
-            }
-
-
-            totalHv += currentComponent.HorizontalFactor*currentComponent.VerticalFactor;
-
-            currentScan.DcTableSelector = (byte) (this.temp[2 + (2*i)] >> 4);
-            if (currentScan.DcTableSelector > MaxTh)
-            {
-                throw new ImageFormatException("Bad DC table selector value");
-            }
-
-            currentScan.AcTableSelector = (byte) (this.temp[2 + (2*i)] & 0x0f);
-            if (currentScan.AcTableSelector > MaxTh)
-            {
-                throw new ImageFormatException("Bad AC table selector  value");
-            }
-        }
-
-        /// <summary>
-        /// Decodes a successive approximation refinement block, as specified in section G.1.2.
-        /// </summary>
-        /// <param name="b">The block of coefficients</param>
-        /// <param name="h">The Huffman tree</param>
-        /// <param name="zigStart">The zig-zag start index</param>
-        /// <param name="zigEnd">The zig-zag end index</param>
-        /// <param name="delta">The low transform offset</param>
-        private void Refine(ref Block b, ref Huffman h, int zigStart, int zigEnd, int delta)
-        {
-            // Refining a DC component is trivial.
-            if (zigStart == 0)
-            {
-                if (zigEnd != 0)
-                {
-                    throw new ImageFormatException("Invalid state for zig DC component");
-                }
-
-                bool bit = this.DecodeBit();
-                if (bit)
-                {
-                    b[0] |= delta;
-                }
-
-                return;
-            }
-
-            // Refining AC components is more complicated; see sections G.1.2.2 and G.1.2.3.
-            int zig = zigStart;
-            if (this.eobRun == 0)
-            {
-                for (; zig <= zigEnd; zig++)
-                {
-                    bool done = false;
-                    int z = 0;
-                    byte val = this.DecodeHuffman(ref h);
-                    int val0 = val >> 4;
-                    int val1 = val & 0x0f;
-
-                    switch (val1)
-                    {
-                        case 0:
-                            if (val0 != 0x0f)
-                            {
-                                this.eobRun = (ushort)(1 << val0);
-                                if (val0 != 0)
-                                {
-                                    this.eobRun |= (ushort)this.DecodeBits(val0);
-                                }
-
-                                done = true;
-                            }
-
-                            break;
-                        case 1:
-                            z = delta;
-                            bool bit = this.DecodeBit();
-                            if (!bit)
-                            {
-                                z = -z;
-                            }
-
-                            break;
-                        default:
-                            throw new ImageFormatException("Unexpected Huffman code");
-                    }
-
-                    if (done)
-                    {
-                        break;
-                    }
-
-                    zig = this.RefineNonZeroes(b, zig, zigEnd, val0, delta);
-                    if (zig > zigEnd)
-                    {
-                        throw new ImageFormatException($"Too many coefficients {zig} > {zigEnd}");
-                    }
-
-                    if (z != 0)
-                    {
-                        b[Unzig[zig]] = z;
-                    }
-                }
-            }
-
-            if (this.eobRun > 0)
-            {
-                this.eobRun--;
-                this.RefineNonZeroes(b, zig, zigEnd, -1, delta);
-            }
-        }
-
-        /// <summary>
-        /// Refines non-zero entries of b in zig-zag order.
-        /// If <paramref name="nz"/> >= 0, the first <paramref name="nz"/> zero entries are skipped over.
-        /// </summary>
-        /// <param name="b">The block of coefficients</param>
-        /// <param name="zig">The zig-zag start index</param>
-        /// <param name="zigEnd">The zig-zag end index</param>
-        /// <param name="nz">The non-zero entry</param>
-        /// <param name="delta">The low transform offset</param>
-        /// <returns>The <see cref="int"/></returns>
-        private int RefineNonZeroes(Block b, int zig, int zigEnd, int nz, int delta)
-        {
-            for (; zig <= zigEnd; zig++)
-            {
-                int u = Unzig[zig];
-                if (b[u] == 0)
-                {
-                    if (nz == 0)
-                    {
-                        break;
-                    }
-
-                    nz--;
-                    continue;
-                }
-
-                bool bit = this.DecodeBit();
-                if (!bit)
-                {
-                    continue;
-                }
-
-                if (b[u] >= 0)
-                {
-                    b[u] += delta;
-                }
-                else
-                {
-                    b[u] -= delta;
-                }
-            }
-
-            return zig;
-        }
-
-        /// <summary>
-        /// Makes the image from the buffer.
-        /// </summary>
-        /// <param name="mxx">The horizontal MCU count</param>
-        /// <param name="myy">The vertical MCU count</param>
-        private void MakeImage(int mxx, int myy)
-        {
-            if (this.componentCount == 1)
-            {
-                GrayImage gray = new GrayImage(8 * mxx, 8 * myy);
-                this.grayImage = gray.Subimage(0, 0, this.imageWidth, this.imageHeight);
-            }
-            else
-            {
-                int h0 = this.componentArray[0].HorizontalFactor;
-                int v0 = this.componentArray[0].VerticalFactor;
-                int horizontalRatio = h0 / this.componentArray[1].HorizontalFactor;
-                int verticalRatio = v0 / this.componentArray[1].VerticalFactor;
-
-                YCbCrImage.YCbCrSubsampleRatio ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio444;
-                switch ((horizontalRatio << 4) | verticalRatio)
-                {
-                    case 0x11:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio444;
-                        break;
-                    case 0x12:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio440;
-                        break;
-                    case 0x21:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio422;
-                        break;
-                    case 0x22:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio420;
-                        break;
-                    case 0x41:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio411;
-                        break;
-                    case 0x42:
-                        ratio = YCbCrImage.YCbCrSubsampleRatio.YCbCrSubsampleRatio410;
-                        break;
-                }
-
-                YCbCrImage ycbcr = new YCbCrImage(8 * h0 * mxx, 8 * v0 * myy, ratio);
-                this.ycbcrImage = ycbcr.Subimage(0, 0, this.imageWidth, this.imageHeight);
-
-                if (this.componentCount == 4)
-                {
-                    int h3 = this.componentArray[3].HorizontalFactor;
-                    int v3 = this.componentArray[3].VerticalFactor;
-                    this.blackPixels = new byte[8 * h3 * mxx * 8 * v3 * myy];
-                    this.blackStride = 8 * h3 * mxx;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the image in an RGB image.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private bool IsRGB()
-        {
-            if (this.isJfif)
-            {
-                return false;
-            }
-
-            if (this.adobeTransformValid && this.adobeTransform == JpegConstants.Adobe.ColorTransformUnknown)
-            {
-                // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/JPEG.html#Adobe
-                // says that 0 means Unknown (and in practice RGB) and 1 means YCbCr.
-                return true;
-            }
-
-            return this.componentArray[0].Identifier == 'R' && this.componentArray[1].Identifier == 'G' && this.componentArray[2].Identifier == 'B';
-        }
-
-        /// <summary>
-        /// Optimized method to pack bytes to the image from the YCbCr color space.
-        /// This is faster than implicit casting as it avoids double packing.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="packed">The packed pixel.</param>
-        /// <param name="y">The y luminance component.</param>
-        /// <param name="cb">The cb chroma component.</param>
-        /// <param name="cr">The cr chroma component.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void PackYcbCr<TColor, TPacked>(ref TColor packed, byte y, byte cb, byte cr)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int ccb = cb - 128;
-            int ccr = cr - 128;
-
-            byte r = (byte)(y + (1.402F * ccr)).Clamp(0, 255);
-            byte g = (byte)(y - (0.34414F * ccb) - (0.71414F * ccr)).Clamp(0, 255);
-            byte b = (byte)(y + (1.772F * ccb)).Clamp(0, 255);
-
-            packed.PackFromBytes(r, g, b, 255);
-        }
-
-        /// <summary>
-        /// Optimized method to pack bytes to the image from the CMYK color space.
-        /// This is faster than implicit casting as it avoids double packing.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="packed">The packed pixel.</param>
-        /// <param name="y">The y luminance component.</param>
-        /// <param name="cb">The cb chroma component.</param>
-        /// <param name="cr">The cr chroma component.</param>
-        /// <param name="xx">The x-position within the image.</param>
-        /// <param name="yy">The y-position within the image.</param>
-        private void PackCmyk<TColor, TPacked>(ref TColor packed, byte y, byte cb, byte cr, int xx, int yy)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // TODO: We can speed this up further with Vector4
-            int ccb = cb - 128;
-            int ccr = cr - 128;
-
-            // First convert from YCbCr to CMY
-            float cyan = (y + (1.402F * ccr)).Clamp(0, 255) / 255F;
-            float magenta = (y - (0.34414F * ccb) - (0.71414F * ccr)).Clamp(0, 255) / 255F;
-            float yellow = (y + (1.772F * ccb)).Clamp(0, 255) / 255F;
-
-            // Get keyline
-            float keyline = (255 - this.blackPixels[(yy * this.blackStride) + xx]) / 255F;
-
-            // Convert back to RGB
-            byte r = (byte)(((1 - cyan) * (1 - keyline)).Clamp(0, 1) * 255);
-            byte g = (byte)(((1 - magenta) * (1 - keyline)).Clamp(0, 1) * 255);
-            byte b = (byte)(((1 - yellow) * (1 - keyline)).Clamp(0, 1) * 255);
-
-            packed.PackFromBytes(r, g, b, 255);
-        }
-
-        /// <summary>
-        /// Represents a component scan
-        /// </summary>
-        private struct Scan
-        {
-            /// <summary>
-            /// Gets or sets the component index.
-            /// </summary>
-            public byte Index { get; set; }
-
-            /// <summary>
-            /// Gets or sets the DC table selector
-            /// </summary>
-            public byte DcTableSelector { get; set; }
-
-            /// <summary>
-            /// Gets or sets the AC table selector
-            /// </summary>
-            public byte AcTableSelector { get; set; }
-        }
-
-        /// <summary>
-        /// The missing ff00 exception.
-        /// </summary>
-        private class MissingFF00Exception : Exception
-        {
-        }
-
-        /// <summary>
-        /// The short huffman data exception.
-        /// </summary>
-        private class ShortHuffmanDataException : Exception
-        {
-        }
-
-        /// <summary>
-        /// The EOF (End of File exception).
-        /// Thrown when the decoder encounters an EOF marker without a proceeding EOI (End Of Image) marker
-        /// </summary>
-        private class EOFException : Exception
-        {
-        }
-
-        public void Dispose()
-        {
-            scanWorkerBlock.Dispose();
-            Block.DisposeAll(this.quantizationTables);
-
-            foreach (Block[] blocks in progCoeffs)
-            {
-                if (blocks != null)
-                {
-                    Block.DisposeAll(blocks);
-                }
-            }
-
-            for (int i = 0; i < huffmanTrees.Length; i++)
-            {
-                huffmanTrees[i].Dispose();
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegEncoder.cs b/src/ImageSharp46/Formats/Jpg/JpegEncoder.cs
deleted file mode 100644
index 0fc1f3d35..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegEncoder.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// <copyright file="JpegEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Encoder for writing the data image to a stream in jpeg format.
-    /// </summary>
-    public class JpegEncoder : IImageEncoder
-    {
-        /// <summary>
-        /// The quality used to encode the image.
-        /// </summary>
-        private int quality = 75;
-
-        /// <summary>
-        /// The subsamples scheme used to encode the image.
-        /// </summary>
-        private JpegSubsample subsample = JpegSubsample.Ratio420;
-
-        /// <summary>
-        /// Whether subsampling has been specifically set.
-        /// </summary>
-        private bool subsampleSet;
-
-        /// <summary>
-        /// Gets or sets the quality, that will be used to encode the image. Quality
-        /// index must be between 0 and 100 (compression from max to min).
-        /// </summary>
-        /// <remarks>
-        /// If the quality is less than or equal to 80, the subsampling ratio will switch to <see cref="JpegSubsample.Ratio420"/>
-        /// </remarks>
-        /// <value>The quality of the jpg image from 0 to 100.</value>
-        public int Quality
-        {
-            get { return this.quality; }
-            set { this.quality = value.Clamp(1, 100); }
-        }
-
-        /// <summary>
-        /// Gets or sets the subsample ration, that will be used to encode the image.
-        /// </summary>
-        /// <value>The subsample ratio of the jpg image.</value>
-        public JpegSubsample Subsample
-        {
-            get
-            {
-                return this.subsample;
-            }
-
-            set
-            {
-                this.subsample = value;
-                this.subsampleSet = true;
-            }
-        }
-
-        /// <inheritdoc/>
-        public string MimeType => "image/jpeg";
-
-        /// <inheritdoc/>
-        public string Extension => "jpg";
-
-        /// <inheritdoc/>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, "extension");
-
-            if (extension.StartsWith("."))
-            {
-                extension = extension.Substring(1);
-            }
-
-            return extension.Equals(this.Extension, StringComparison.OrdinalIgnoreCase) ||
-                   extension.Equals("jpeg", StringComparison.OrdinalIgnoreCase) ||
-                   extension.Equals("jfif", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <inheritdoc/>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            JpegEncoderCore encode = new JpegEncoderCore();
-            if (this.subsampleSet)
-            {
-                encode.Encode(image, stream, this.Quality, this.Subsample);
-            }
-            else
-            {
-                encode.Encode(image, stream, this.Quality, this.Quality >= 80 ? JpegSubsample.Ratio444 : JpegSubsample.Ratio420);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegEncoderCore.cs b/src/ImageSharp46/Formats/Jpg/JpegEncoderCore.cs
deleted file mode 100644
index 75e00bc76..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegEncoderCore.cs
+++ /dev/null
@@ -1,1006 +0,0 @@
-// <copyright file="JpegEncoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Image encoder for writing an image to a stream as a jpeg.
-    /// </summary>
-    internal unsafe class JpegEncoderCore
-    {
-        /// <summary>
-        /// The number of quantization tables.
-        /// </summary>
-        private const int QuantizationTableCount = 2;
-
-        /// <summary>
-        /// Maps from the zig-zag ordering to the natural ordering. For example,
-        /// unzig[3] is the column and row of the fourth element in zig-zag order. The
-        /// value is 16, which means first column (16%8 == 0) and third row (16/8 == 2).
-        /// </summary>
-        private static readonly int[] Unzig =
-        {
-            0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26,
-            33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57,
-            50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31,
-            39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
-        };
-
-        /// <summary>
-        /// The Huffman encoding specifications.
-        /// This encoder uses the same Huffman encoding for all images.
-        /// </summary>
-        private static readonly HuffmanSpec[] TheHuffmanSpecs =
-        {
-            // Luminance DC.
-            new HuffmanSpec(
-                new byte[]
-                {
-                    0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0
-                },
-                new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }),
-            new HuffmanSpec(
-                new byte[]
-                {
-                    0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125
-                },
-                new byte[]
-                {
-                    0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21,
-                    0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71,
-                    0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1,
-                    0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72,
-                    0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25,
-                    0x26, 0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37,
-                    0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-                    0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-                    0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,
-                    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,
-                    0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93,
-                    0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3,
-                    0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3,
-                    0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
-                    0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3,
-                    0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-                    0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1,
-                    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
-                }),
-            new HuffmanSpec(
-                new byte[]
-                {
-                    0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0
-                },
-                new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }),
-
-            // Chrominance AC.
-            new HuffmanSpec(
-                new byte[]
-                {
-                    0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119
-                },
-                new byte[]
-                {
-                    0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31,
-                    0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22,
-                    0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xa1, 0xb1, 0xc1,
-                    0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1,
-                    0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18,
-                    0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36,
-                    0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47,
-                    0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-                    0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-                    0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a,
-                    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a,
-                    0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
-                    0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa,
-                    0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
-                    0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca,
-                    0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-                    0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
-                    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
-                })
-        };
-
-        /// <summary>
-        /// The compiled representations of theHuffmanSpec.
-        /// </summary>
-        private static readonly HuffmanLut[] TheHuffmanLut = new HuffmanLut[4];
-
-        /// <summary>
-        /// Counts the number of bits needed to hold an integer.
-        /// </summary>
-        private readonly byte[] bitCountLut =
-        {
-            0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-            6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8,
-        };
-
-        /// <summary>
-        /// The unscaled quantization tables in zig-zag order. Each
-        /// encoder copies and scales the tables according to its quality parameter.
-        /// The values are derived from section K.1 after converting from natural to
-        /// zig-zag order.
-        /// </summary>
-        private readonly byte[,] unscaledQuant =
-        {
-            {
-                // Luminance.
-                16, 11, 12, 14, 12, 10, 16, 14, 13, 14, 18, 17, 16, 19, 24, 40,
-                26, 24, 22, 22, 24, 49, 35, 37, 29, 40, 58, 51, 61, 60, 57, 51,
-                56, 55, 64, 72, 92, 78, 64, 68, 87, 69, 55, 56, 80, 109, 81,
-                87, 95, 98, 103, 104, 103, 62, 77, 113, 121, 112, 100, 120, 92,
-                101, 103, 99,
-            },
-            {
-                // Chrominance.
-                17, 18, 18, 24, 21, 24, 47, 26, 26, 47, 99, 66, 56, 66, 99, 99,
-                99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-                99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-                99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-            }
-        };
-
-        /// <summary>
-        /// A scratch buffer to reduce allocations.
-        /// </summary>
-        private readonly byte[] buffer = new byte[16];
-
-        /// <summary>
-        /// A buffer for reducing the number of stream writes when emitting Huffman tables. 64 seems to be enough.
-        /// </summary>
-        private readonly byte[] emitBuffer = new byte[64];
-
-        /// <summary>
-        /// A buffer for reducing the number of stream writes when emitting Huffman tables. Max combined table lengths + identifier.
-        /// </summary>
-        private readonly byte[] huffmanBuffer = new byte[179];
-
-        /// <summary>
-        /// The scaled quantization tables, in zig-zag order.
-        /// </summary>
-        private readonly byte[][] quant = new byte[QuantizationTableCount][];
-
-        /// <summary>
-        /// The SOS (Start Of Scan) marker "\xff\xda" followed by 12 bytes:
-        /// - the marker length "\x00\x0c",
-        /// - the number of components "\x03",
-        /// - component 1 uses DC table 0 and AC table 0 "\x01\x00",
-        /// - component 2 uses DC table 1 and AC table 1 "\x02\x11",
-        /// - component 3 uses DC table 1 and AC table 1 "\x03\x11",
-        /// - the bytes "\x00\x3f\x00". Section B.2.3 of the spec says that for
-        /// sequential DCTs, those bytes (8-bit Ss, 8-bit Se, 4-bit Ah, 4-bit Al)
-        /// should be 0x00, 0x3f, 0x00&lt;&lt;4 | 0x00.
-        /// </summary>
-        private readonly byte[] sosHeaderYCbCr =
-        {
-            JpegConstants.Markers.XFF, JpegConstants.Markers.SOS, // Marker
-            0x00, 0x0c, // Length (high byte, low byte), must be 6 + 2 * (number of components in scan)
-            0x03, // Number of components in a scan, 3
-            0x01, // Component Id Y
-            0x00, // DC/AC Huffman table
-            0x02, // Component Id Cb
-            0x11, // DC/AC Huffman table
-            0x03, // Component Id Cr
-            0x11, // DC/AC Huffman table
-            0x00, // Ss - Start of spectral selection.
-            0x3f, // Se - End of spectral selection.
-            0x00 // Ah + Ah (Successive approximation bit position high + low)
-        };
-
-        /// <summary>
-        /// The accumulated bits to write to the stream.
-        /// </summary>
-        private uint accumulatedBits;
-
-        /// <summary>
-        /// The accumulated bit count.
-        /// </summary>
-        private uint bitCount;
-
-        /// <summary>
-        /// The output stream. All attempted writes after the first error become no-ops.
-        /// </summary>
-        private Stream outputStream;
-
-        /// <summary>
-        /// The subsampling method to use.
-        /// </summary>
-        private JpegSubsample subsample;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="JpegEncoderCore"/> class.
-        /// </summary>
-        static JpegEncoderCore()
-        {
-            // Initialize the Huffman tables
-            for (int i = 0; i < TheHuffmanSpecs.Length; i++)
-            {
-                TheHuffmanLut[i] = new HuffmanLut(TheHuffmanSpecs[i]);
-            }
-        }
-
-        /// <summary>
-        /// Enumerates the Huffman tables
-        /// </summary>
-        private enum HuffIndex
-        {
-            /// <summary>
-            /// The DC luminance huffman table index
-            /// </summary>
-            LuminanceDC = 0,
-
-            /// <summary>
-            /// The AC luminance huffman table index
-            /// </summary>
-
-            LuminanceAC = 1,
-            // ReSharper restore UnusedMember.Local
-
-            /// <summary>
-            /// The DC chrominance huffman table index
-            /// </summary>
-            ChrominanceDC = 2,
-
-            /// <summary>
-            /// The AC chrominance huffman table index
-            /// </summary>
-            ChrominanceAC = 3,
-        }
-
-        /// <summary>
-        /// Enumerates the quantization tables
-        /// </summary>
-        private enum QuantIndex
-        {
-            /// <summary>
-            /// The luminance quantization table index
-            /// </summary>
-            Luminance = 0,
-
-            /// <summary>
-            /// The chrominance quantization table index
-            /// </summary>
-            Chrominance = 1,
-        }
-
-        /// <summary>
-        /// Encode writes the image to the jpeg baseline format with the given options.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to write from.</param>
-        /// <param name="stream">The stream to write to.</param>
-        /// <param name="quality">The quality.</param>
-        /// <param name="sample">The subsampling mode.</param>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream, int quality, JpegSubsample sample)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.NotNull(image, nameof(image));
-            Guard.NotNull(stream, nameof(stream));
-
-            ushort max = JpegConstants.MaxLength;
-            if (image.Width >= max || image.Height >= max)
-            {
-                throw new ImageFormatException($"Image is too large to encode at {image.Width}x{image.Height}.");
-            }
-
-            this.outputStream = stream;
-            this.subsample = sample;
-
-            for (int i = 0; i < QuantizationTableCount; i++)
-            {
-                this.quant[i] = new byte[Block.BlockSize];
-            }
-
-            if (quality < 1)
-            {
-                quality = 1;
-            }
-
-            if (quality > 100)
-            {
-                quality = 100;
-            }
-
-            // Convert from a quality rating to a scaling factor.
-            int scale;
-            if (quality < 50)
-            {
-                scale = 5000 / quality;
-            }
-            else
-            {
-                scale = 200 - (quality * 2);
-            }
-
-            // Initialize the quantization tables.
-            for (int i = 0; i < QuantizationTableCount; i++)
-            {
-                for (int j = 0; j < Block.BlockSize; j++)
-                {
-                    int x = this.unscaledQuant[i, j];
-                    x = ((x * scale) + 50) / 100;
-                    if (x < 1)
-                    {
-                        x = 1;
-                    }
-
-                    if (x > 255)
-                    {
-                        x = 255;
-                    }
-
-                    this.quant[i][j] = (byte)x;
-                }
-            }
-
-            // Compute number of components based on input image type.
-            int componentCount = 3;
-
-            // Write the Start Of Image marker.
-            this.WriteApplicationHeader((short)image.HorizontalResolution, (short)image.VerticalResolution);
-
-            this.WriteProfiles(image);
-
-            // Write the quantization tables.
-            this.WriteDefineQuantizationTables();
-
-            // Write the image dimensions.
-            this.WriteStartOfFrame(image.Width, image.Height, componentCount);
-
-            // Write the Huffman tables.
-            this.WriteDefineHuffmanTables(componentCount);
-
-            // Write the image data.
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                this.WriteStartOfScan(pixels);
-            }
-
-            // Write the End Of Image marker.
-            this.buffer[0] = JpegConstants.Markers.XFF;
-            this.buffer[1] = JpegConstants.Markers.EOI;
-            stream.Write(this.buffer, 0, 2);
-            stream.Flush();
-        }
-
-        /// <summary>
-        /// Gets the quotient of the two numbers rounded to the nearest integer, instead of rounded to zero.
-        /// </summary>
-        /// <param name="dividend">The value to divide.</param>
-        /// <param name="divisor">The value to divide by.</param>
-        /// <returns>The <see cref="int"/></returns>
-        private static int Round(int dividend, int divisor)
-        {
-            if (dividend >= 0)
-            {
-                return (dividend + (divisor >> 1)) / divisor;
-            }
-
-            return -((-dividend + (divisor >> 1)) / divisor);
-        }
-
-        /// <summary>
-        /// Emits the least significant count of bits of bits to the bit-stream.
-        /// The precondition is bits <example>&lt; 1&lt;&lt;nBits &amp;&amp; nBits &lt;= 16</example>.
-        /// </summary>
-        /// <param name="bits">The packed bits.</param>
-        /// <param name="count">The number of bits</param>
-        private void Emit(uint bits, uint count)
-        {
-            count += this.bitCount;
-            bits <<= (int)(32 - count);
-            bits |= this.accumulatedBits;
-
-            // Only write if more than 8 bits.
-            if (count >= 8)
-            {
-                // Track length
-                int len = 0;
-                while (count >= 8)
-                {
-                    byte b = (byte)(bits >> 24);
-                    this.emitBuffer[len++] = b;
-                    if (b == 0xff)
-                    {
-                        this.emitBuffer[len++] = 0x00;
-                    }
-
-                    bits <<= 8;
-                    count -= 8;
-                }
-
-                if (len > 0)
-                {
-                    this.outputStream.Write(this.emitBuffer, 0, len);
-                }
-            }
-
-            this.accumulatedBits = bits;
-            this.bitCount = count;
-        }
-
-        /// <summary>
-        /// Emits the given value with the given Huffman encoder.
-        /// </summary>
-        /// <param name="index">The index of the Huffman encoder</param>
-        /// <param name="value">The value to encode.</param>
-        private void EmitHuff(HuffIndex index, int value)
-        {
-            uint x = TheHuffmanLut[(int)index].Values[value];
-            this.Emit(x & ((1 << 24) - 1), x >> 24);
-        }
-
-        /// <summary>
-        /// Emits a run of runLength copies of value encoded with the given Huffman encoder.
-        /// </summary>
-        /// <param name="index">The index of the Huffman encoder</param>
-        /// <param name="runLength">The number of copies to encode.</param>
-        /// <param name="value">The value to encode.</param>
-        private void EmitHuffRLE(HuffIndex index, int runLength, int value)
-        {
-            int a = value;
-            int b = value;
-            if (a < 0)
-            {
-                a = -value;
-                b = value - 1;
-            }
-
-            uint bt;
-            if (a < 0x100)
-            {
-                bt = this.bitCountLut[a];
-            }
-            else
-            {
-                bt = 8 + (uint)this.bitCountLut[a >> 8];
-            }
-
-            this.EmitHuff(index, (int)((uint)(runLength << 4) | bt));
-            if (bt > 0)
-            {
-                this.Emit((uint)b & (uint)((1 << ((int)bt)) - 1), bt);
-            }
-        }
-
-        /// <summary>
-        /// Writes a block of pixel data using the given quantization table,
-        /// returning the post-quantized DC value of the DCT-transformed block.
-        /// The block is in natural (not zig-zag) order.
-        /// </summary>
-        /// <param name="block">The block to write.</param>
-        /// <param name="index">The quantization table index.</param>
-        /// <param name="prevDC">The previous DC value.</param>
-        /// <returns>The <see cref="int"/></returns>
-        private int WriteBlock(ref Block block, QuantIndex index, int prevDC)
-        {
-            FDCT.Transform(ref block);
-
-            // Emit the DC delta.
-            int dc = Round(block[0], 8 * this.quant[(int)index][0]);
-            this.EmitHuffRLE((HuffIndex)((2 * (int)index) + 0), 0, dc - prevDC);
-
-            // Emit the AC components.
-            HuffIndex h = (HuffIndex)((2 * (int)index) + 1);
-            int runLength = 0;
-
-            for (int zig = 1; zig < Block.BlockSize; zig++)
-            {
-                int ac = Round(block[Unzig[zig]], 8 * this.quant[(int)index][zig]);
-
-                if (ac == 0)
-                {
-                    runLength++;
-                }
-                else
-                {
-                    while (runLength > 15)
-                    {
-                        this.EmitHuff(h, 0xf0);
-                        runLength -= 16;
-                    }
-
-                    this.EmitHuffRLE(h, runLength, ac);
-                    runLength = 0;
-                }
-            }
-
-            if (runLength > 0)
-            {
-                this.EmitHuff(h, 0x00);
-            }
-
-            return dc;
-        }
-
-        /// <summary>
-        /// Converts the 8x8 region of the image whose top-left corner is x,y to its YCbCr values.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The pixel accessor.</param>
-        /// <param name="x">The x-position within the image.</param>
-        /// <param name="y">The y-position within the image.</param>
-        /// <param name="yBlock">The luminance block.</param>
-        /// <param name="cbBlock">The red chroma block.</param>
-        /// <param name="crBlock">The blue chroma block.</param>
-        // ReSharper disable StyleCop.SA1305
-        private void ToYCbCr<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels, int x, int y, 
-            ref Block yBlock, ref Block cbBlock, ref Block crBlock)
-            // ReSharper restore StyleCop.SA1305
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int xmax = pixels.Width - 1;
-            int ymax = pixels.Height - 1;
-            byte[] color = new byte[3];
-            for (int j = 0; j < 8; j++)
-            {
-                for (int i = 0; i < 8; i++)
-                {
-                    pixels[Math.Min(x + i, xmax), Math.Min(y + j, ymax)].ToBytes(color, 0, ComponentOrder.XYZ);
-
-                    byte r = color[0];
-                    byte g = color[1];
-                    byte b = color[2];
-
-                    // Convert returned bytes into the YCbCr color space. Assume RGBA
-                    byte yy = (byte)((0.299F * r) + (0.587F * g) + (0.114F * b));
-                    byte cb = (byte)(128 + ((-0.168736F * r) - (0.331264F * g) + (0.5F * b)));
-                    byte cr = (byte)(128 + ((0.5F * r) - (0.418688F * g) - (0.081312F * b)));
-
-                    int index = (8 * j) + i;
-                    yBlock[index] = yy;
-                    cbBlock[index] = cb;
-                    crBlock[index] = cr;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Scales the 16x16 region represented by the 4 source blocks to the 8x8
-        /// DST block.
-        /// </summary>
-        /// <param name="destination">The destination block array</param>
-        /// <param name="source">The source block array.</param>
-        private void Scale16X16To8X8(ref Block destination, Block[] source)
-        {
-            for (int i = 0; i < 4; i++)
-            {
-                int dstOff = ((i & 2) << 4) | ((i & 1) << 2);
-                for (int y = 0; y < 4; y++)
-                {
-                    for (int x = 0; x < 4; x++)
-                    {
-                        int j = (16 * y) + (2 * x);
-                        int sum = source[i][j] + source[i][j + 1] + source[i][j + 8] + source[i][j + 9];
-                        destination[(8 * y) + x + dstOff] = (sum + 2) / 4;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the application header containing the JFIF identifier plus extra data.
-        /// </summary>
-        /// <param name="horizontalResolution">The resolution of the image in the x- direction.</param>
-        /// <param name="verticalResolution">The resolution of the image in the y- direction.</param>
-        private void WriteApplicationHeader(short horizontalResolution, short verticalResolution)
-        {
-            // Write the start of image marker. Markers are always prefixed with with 0xff.
-            this.buffer[0] = JpegConstants.Markers.XFF;
-            this.buffer[1] = JpegConstants.Markers.SOI;
-
-            // Write the JFIF headers
-            this.buffer[2] = JpegConstants.Markers.XFF;
-            this.buffer[3] = JpegConstants.Markers.APP0; // Application Marker
-            this.buffer[4] = 0x00;
-            this.buffer[5] = 0x10;
-            this.buffer[6] = 0x4a; // J
-            this.buffer[7] = 0x46; // F
-            this.buffer[8] = 0x49; // I
-            this.buffer[9] = 0x46; // F
-            this.buffer[10] = 0x00; // = "JFIF",'\0'
-            this.buffer[11] = 0x01; // versionhi
-            this.buffer[12] = 0x01; // versionlo
-            this.buffer[13] = 0x01; // xyunits as dpi
-
-            // No thumbnail
-            this.buffer[14] = 0x00; // Thumbnail width
-            this.buffer[15] = 0x00; // Thumbnail height
-
-            this.outputStream.Write(this.buffer, 0, 16);
-
-            // Resolution. Big Endian
-            this.buffer[0] = (byte)(horizontalResolution >> 8);
-            this.buffer[1] = (byte)horizontalResolution;
-            this.buffer[2] = (byte)(verticalResolution >> 8);
-            this.buffer[3] = (byte)verticalResolution;
-
-            this.outputStream.Write(this.buffer, 0, 4);
-        }
-
-        /// <summary>
-        /// Writes the metadata profiles to the image.
-        /// </summary>
-        /// <param name="image">The image.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        private void WriteProfiles<TColor, TPacked>(Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            this.WriteProfile(image.ExifProfile);
-        }
-
-        /// <summary>
-        /// Writes the EXIF profile.
-        /// </summary>
-        /// <param name="exifProfile">The exif profile.</param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the EXIF profile size exceeds the limit
-        /// </exception>
-        private void WriteProfile(ExifProfile exifProfile)
-        {
-            const int Max = 65533;
-            byte[] data = exifProfile?.ToByteArray();
-            if (data == null || data.Length == 0)
-            {
-                return;
-            }
-
-            if (data.Length > Max)
-            {
-                throw new ImageFormatException($"Exif profile size exceeds limit. nameof{Max}");
-            }
-
-            int length = data.Length + 2;
-
-            this.buffer[0] = JpegConstants.Markers.XFF;
-            this.buffer[1] = JpegConstants.Markers.APP1; // Application Marker
-            this.buffer[2] = (byte)((length >> 8) & 0xFF);
-            this.buffer[3] = (byte)(length & 0xFF);
-
-            this.outputStream.Write(this.buffer, 0, 4);
-            this.outputStream.Write(data, 0, data.Length);
-        }
-
-        /// <summary>
-        /// Writes the Define Quantization Marker and tables.
-        /// </summary>
-        private void WriteDefineQuantizationTables()
-        {
-            // Marker + quantization table lengths
-            int markerlen = 2 + (QuantizationTableCount * (1 + Block.BlockSize));
-            this.WriteMarkerHeader(JpegConstants.Markers.DQT, markerlen);
-
-            // Loop through and collect the tables as one array.
-            // This allows us to reduce the number of writes to the stream.
-            byte[] dqt = new byte[(QuantizationTableCount * Block.BlockSize) + QuantizationTableCount];
-            int offset = 0;
-            for (int i = 0; i < QuantizationTableCount; i++)
-            {
-                dqt[offset++] = (byte)i;
-                int len = this.quant[i].Length;
-                for (int j = 0; j < len; j++)
-                {
-                    dqt[offset++] = this.quant[i][j];
-                }
-            }
-
-            this.outputStream.Write(dqt, 0, dqt.Length);
-        }
-
-        /// <summary>
-        /// Writes the Start Of Frame (Baseline) marker
-        /// </summary>
-        /// <param name="width">The width of the image</param>
-        /// <param name="height">The height of the image</param>
-        /// <param name="componentCount">The number of components in a pixel</param>
-        private void WriteStartOfFrame(int width, int height, int componentCount)
-        {
-            // "default" to 4:2:0
-            byte[] subsamples = { 0x22, 0x11, 0x11 };
-            byte[] chroma = { 0x00, 0x01, 0x01 };
-
-            switch (this.subsample)
-            {
-                case JpegSubsample.Ratio444:
-                    subsamples = new byte[] { 0x11, 0x11, 0x11 };
-                    break;
-                case JpegSubsample.Ratio420:
-                    subsamples = new byte[] { 0x22, 0x11, 0x11 };
-                    break;
-            }
-
-            // Length (high byte, low byte), 8 + components * 3.
-            int markerlen = 8 + (3 * componentCount);
-            this.WriteMarkerHeader(JpegConstants.Markers.SOF0, markerlen);
-            this.buffer[0] = 8; // Data Precision. 8 for now, 12 and 16 bit jpegs not supported
-            this.buffer[1] = (byte)(height >> 8);
-            this.buffer[2] = (byte)(height & 0xff); // (2 bytes, Hi-Lo), must be > 0 if DNL not supported
-            this.buffer[3] = (byte)(width >> 8);
-            this.buffer[4] = (byte)(width & 0xff); // (2 bytes, Hi-Lo), must be > 0 if DNL not supported
-            this.buffer[5] = (byte)componentCount; // Number of components (1 byte), usually 1 = Gray scaled, 3 = color YCbCr or YIQ, 4 = color CMYK)
-            if (componentCount == 1)
-            {
-                this.buffer[6] = 1;
-
-                // No subsampling for grayscale images.
-                this.buffer[7] = 0x11;
-                this.buffer[8] = 0x00;
-            }
-            else
-            {
-                for (int i = 0; i < componentCount; i++)
-                {
-                    this.buffer[(3 * i) + 6] = (byte)(i + 1);
-
-                    // We use 4:2:0 chroma subsampling by default.
-                    this.buffer[(3 * i) + 7] = subsamples[i];
-                    this.buffer[(3 * i) + 8] = chroma[i];
-                }
-            }
-
-            this.outputStream.Write(this.buffer, 0, (3 * (componentCount - 1)) + 9);
-        }
-
-        /// <summary>
-        /// Writes the Define Huffman Table marker and tables.
-        /// </summary>
-        /// <param name="componentCount">The number of components to write.</param>
-        private void WriteDefineHuffmanTables(int componentCount)
-        {
-            // Table identifiers.
-            byte[] headers = { 0x00, 0x10, 0x01, 0x11 };
-            int markerlen = 2;
-            HuffmanSpec[] specs = TheHuffmanSpecs;
-
-            if (componentCount == 1)
-            {
-                // Drop the Chrominance tables.
-                specs = new[] { TheHuffmanSpecs[0], TheHuffmanSpecs[1] };
-            }
-
-            foreach (HuffmanSpec s in specs)
-            {
-                markerlen += 1 + 16 + s.Values.Length;
-            }
-
-            this.WriteMarkerHeader(JpegConstants.Markers.DHT, markerlen);
-            for (int i = 0; i < specs.Length; i++)
-            {
-                HuffmanSpec spec = specs[i];
-                int len = 0;
-
-                fixed (byte* huffman = this.huffmanBuffer)
-                fixed (byte* count = spec.Count)
-                fixed (byte* values = spec.Values)
-                {
-                    huffman[len++] = headers[i];
-
-                    for (int c = 0; c < spec.Count.Length; c++)
-                    {
-                        huffman[len++] = count[c];
-                    }
-
-                    for (int v = 0; v < spec.Values.Length; v++)
-                    {
-                        huffman[len++] = values[v];
-                    }
-                }
-
-                this.outputStream.Write(this.huffmanBuffer, 0, len);
-            }
-        }
-
-        /// <summary>
-        /// Writes the StartOfScan marker.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">
-        /// The pixel accessor providing access to the image pixels.
-        /// </param>
-        private void WriteStartOfScan<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // TODO: We should allow grayscale writing.
-            this.outputStream.Write(this.sosHeaderYCbCr, 0, this.sosHeaderYCbCr.Length);
-
-            switch (this.subsample)
-            {
-                case JpegSubsample.Ratio444:
-                    this.Encode444(pixels);
-                    break;
-                case JpegSubsample.Ratio420:
-                    this.Encode420(pixels);
-                    break;
-            }
-
-            // Pad the last byte with 1's.
-            this.Emit(0x7f, 7);
-        }
-
-        /// <summary>
-        /// Encodes the image with no subsampling.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode444<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Block b = Block.Create();
-            Block cb = Block.Create();
-            Block cr = Block.Create();
-            // ReSharper disable once InconsistentNaming
-            int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
-
-            for (int y = 0; y < pixels.Height; y += 8)
-            {
-                for (int x = 0; x < pixels.Width; x += 8)
-                {
-                    this.ToYCbCr(pixels, x, y, ref b, ref cb, ref cr);
-                    prevDCY = this.WriteBlock(ref b, QuantIndex.Luminance, prevDCY);
-                    prevDCCb = this.WriteBlock(ref cb, QuantIndex.Chrominance, prevDCCb);
-                    prevDCCr = this.WriteBlock(ref cr, QuantIndex.Chrominance, prevDCCr);
-                }
-            }
-            b.Dispose();
-            cb.Dispose();
-            cr.Dispose();
-        }
-
-        /// <summary>
-        /// Encodes the image with subsampling. The Cb and Cr components are each subsampled
-        /// at a factor of 2 both horizontally and vertically.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode420<TColor, TPacked>(PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Block b = Block.Create();
-            Block[] cb = Block.CreateArray(4);
-            Block[] cr = Block.CreateArray(4);
-            // ReSharper disable once InconsistentNaming
-            int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
-            
-            for (int y = 0; y < pixels.Height; y += 16)
-            {
-                for (int x = 0; x < pixels.Width; x += 16)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        int xOff = (i & 1) * 8;
-                        int yOff = (i & 2) * 4;
-
-                        this.ToYCbCr(pixels, x + xOff, y + yOff, ref b, ref cb[i], ref cr[i]);
-                        prevDCY = this.WriteBlock(ref b, QuantIndex.Luminance, prevDCY);
-                    }
-
-                    this.Scale16X16To8X8(ref b, cb);
-                    prevDCCb = this.WriteBlock(ref b, QuantIndex.Chrominance, prevDCCb);
-                    this.Scale16X16To8X8(ref b, cr);
-                    prevDCCr = this.WriteBlock(ref b, QuantIndex.Chrominance, prevDCCr);
-                }
-            }
-
-            b.Dispose();
-            Block.DisposeAll(cb);
-            Block.DisposeAll(cr);
-        }
-
-        /// <summary>
-        /// Writes the header for a marker with the given length.
-        /// </summary>
-        /// <param name="marker">The marker to write.</param>
-        /// <param name="length">The marker length.</param>
-        private void WriteMarkerHeader(byte marker, int length)
-        {
-            // Markers are always prefixed with with 0xff.
-            this.buffer[0] = JpegConstants.Markers.XFF;
-            this.buffer[1] = marker;
-            this.buffer[2] = (byte)(length >> 8);
-            this.buffer[3] = (byte)(length & 0xff);
-            this.outputStream.Write(this.buffer, 0, 4);
-        }
-
-        /// <summary>
-        /// The Huffman encoding specifications.
-        /// </summary>
-        private struct HuffmanSpec
-        {
-            /// <summary>
-            /// Gets count[i] - The number of codes of length i bits.
-            /// </summary>
-            public readonly byte[] Count;
-
-            /// <summary>
-            /// Gets value[i] - The decoded value of the codeword at the given index.
-            /// </summary>
-            public readonly byte[] Values;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="HuffmanSpec"/> struct.
-            /// </summary>
-            /// <param name="count">The number of codes.</param>
-            /// <param name="values">The decoded values.</param>
-            public HuffmanSpec(byte[] count, byte[] values)
-            {
-                this.Count = count;
-                this.Values = values;
-            }
-        }
-
-        /// <summary>
-        /// A compiled look-up table representation of a huffmanSpec.
-        /// Each value maps to a uint32 of which the 8 most significant bits hold the
-        /// codeword size in bits and the 24 least significant bits hold the codeword.
-        /// The maximum codeword size is 16 bits.
-        /// </summary>
-        private class HuffmanLut
-        {
-            /// <summary>
-            /// The collection of huffman values.
-            /// </summary>
-            public readonly uint[] Values;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="HuffmanLut"/> class.
-            /// </summary>
-            /// <param name="spec">The encoding specifications.</param>
-            public HuffmanLut(HuffmanSpec spec)
-            {
-                int maxValue = 0;
-
-                foreach (byte v in spec.Values)
-                {
-                    if (v > maxValue)
-                    {
-                        maxValue = v;
-                    }
-                }
-
-                this.Values = new uint[maxValue + 1];
-
-                int code = 0;
-                int k = 0;
-
-                for (int i = 0; i < spec.Count.Length; i++)
-                {
-                    int bits = (i + 1) << 24;
-                    for (int j = 0; j < spec.Count[i]; j++)
-                    {
-                        this.Values[spec.Values[k]] = (uint)(bits | code);
-                        code++;
-                        k++;
-                    }
-
-                    code <<= 1;
-                }
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegFormat.cs b/src/ImageSharp46/Formats/Jpg/JpegFormat.cs
deleted file mode 100644
index 0e2ff7949..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegFormat.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// <copyright file="JpegFormat.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Encapsulates the means to encode and decode jpeg images.
-    /// </summary>
-    public class JpegFormat : IImageFormat
-    {
-        /// <inheritdoc/>
-        public IImageDecoder Decoder => new JpegDecoder();
-
-        /// <inheritdoc/>
-        public IImageEncoder Encoder => new JpegEncoder();
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/JpegSubsample.cs b/src/ImageSharp46/Formats/Jpg/JpegSubsample.cs
deleted file mode 100644
index 287323bdd..000000000
--- a/src/ImageSharp46/Formats/Jpg/JpegSubsample.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// <copyright file="JpegSubsample.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Enumerates the chroma subsampling method applied to the image.
-    /// </summary>
-    public enum JpegSubsample
-    {
-        /// <summary>
-        /// High Quality - Each of the three Y'CbCr components have the same sample rate,
-        /// thus there is no chroma subsampling.
-        /// </summary>
-        Ratio444,
-
-        /// <summary>
-        /// Medium Quality - The horizontal sampling is halved and the Cb and Cr channels are only
-        /// sampled on each alternate line.
-        /// </summary>
-        Ratio420
-    }
-}
diff --git a/src/ImageSharp46/Formats/Jpg/README.md b/src/ImageSharp46/Formats/Jpg/README.md
deleted file mode 100644
index 54bc14847..000000000
--- a/src/ImageSharp46/Formats/Jpg/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Encoder/Decoder adapted and extended from:
-
-https://golang.org/src/image/jpeg/
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Png/Filters/AverageFilter.cs b/src/ImageSharp46/Formats/Png/Filters/AverageFilter.cs
deleted file mode 100644
index bef124541..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/AverageFilter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// <copyright file="AverageFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// The Average filter uses the average of the two neighboring pixels (left and above) to predict
-    /// the value of a pixel.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal static class AverageFilter
-    {
-        /// <summary>
-        /// Decodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to decode</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>
-        /// </returns>
-        public static byte[] Decode(byte[] scanline, byte[] previousScanline, int bytesPerPixel)
-        {
-            // Average(x) + floor((Raw(x-bpp)+Prior(x))/2)
-            byte[] result = new byte[scanline.Length];
-
-            for (int x = 1; x < scanline.Length; x++)
-            {
-                byte left = (x - bytesPerPixel < 1) ? (byte)0 : result[x - bytesPerPixel];
-                byte above = previousScanline[x];
-
-                result[x] = (byte)((scanline[x] + Average(left, above)) % 256);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Encodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to encode</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Encode(byte[] scanline, byte[] previousScanline, int bytesPerPixel, int bytesPerScanline)
-        {
-            // Average(x) = Raw(x) - floor((Raw(x-bpp)+Prior(x))/2)
-            byte[] encodedScanline = new byte[bytesPerScanline + 1];
-
-            encodedScanline[0] = (byte)FilterType.Average;
-
-            for (int x = 0; x < bytesPerScanline; x++)
-            {
-                byte left = (x - bytesPerPixel < 0) ? (byte)0 : scanline[x - bytesPerPixel];
-                byte above = previousScanline[x];
-
-                encodedScanline[x + 1] = (byte)((scanline[x] - Average(left, above)) % 256);
-            }
-
-            return encodedScanline;
-        }
-
-        /// <summary>
-        /// Calculates the average value of two bytes
-        /// </summary>
-        /// <param name="left">The left byte</param>
-        /// <param name="above">The above byte</param>
-        /// <returns>The <see cref="int"/></returns>
-        private static int Average(byte left, byte above)
-        {
-            return Convert.ToInt32(Math.Floor((left + above) / 2.0D));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Filters/FilterType.cs b/src/ImageSharp46/Formats/Png/Filters/FilterType.cs
deleted file mode 100644
index 0eddf08f2..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/FilterType.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// <copyright file="FilterType.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Provides enumeration of the various PNG filter types.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal enum FilterType
-    {
-        /// <summary>
-        /// With the None filter, the scanline is transmitted unmodified; it is only necessary to
-        /// insert a filter type byte before the data.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The Sub filter transmits the difference between each byte and the value of the corresponding
-        /// byte of the prior pixel.
-        /// </summary>
-        Sub = 1,
-
-        /// <summary>
-        /// The Up filter is just like the Sub filter except that the pixel immediately above the current
-        /// pixel, rather than just to its left, is used as the predictor.
-        /// </summary>
-        Up = 2,
-
-        /// <summary>
-        /// The Average filter uses the average of the two neighboring pixels (left and above) to
-        /// predict the value of a pixel.
-        /// </summary>
-        Average = 3,
-
-        /// <summary>
-        /// The Paeth filter computes a simple linear function of the three neighboring pixels (left, above, upper left),
-        /// then chooses as predictor the neighboring pixel closest to the computed value.
-        /// This technique is due to Alan W. Paeth
-        /// </summary>
-        Paeth = 4
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Filters/NoneFilter.cs b/src/ImageSharp46/Formats/Png/Filters/NoneFilter.cs
deleted file mode 100644
index 175e5affa..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/NoneFilter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// <copyright file="NoneFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// The None filter, the scanline is transmitted unmodified; it is only necessary to
-    /// insert a filter type byte before the data.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal static class NoneFilter
-    {
-        /// <summary>
-        /// Decodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to decode</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Decode(byte[] scanline)
-        {
-            // No change required.
-            return scanline;
-        }
-
-        /// <summary>
-        /// Encodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to encode</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Encode(byte[] scanline, int bytesPerScanline)
-        {
-            // Insert a byte before the data.
-            byte[] encodedScanline = new byte[bytesPerScanline + 1];
-            encodedScanline[0] = (byte)FilterType.None;
-            Buffer.BlockCopy(scanline, 0, encodedScanline, 1, bytesPerScanline);
-
-            return encodedScanline;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Filters/PaethFilter.cs b/src/ImageSharp46/Formats/Png/Filters/PaethFilter.cs
deleted file mode 100644
index 232d7cc3d..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/PaethFilter.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// <copyright file="PaethFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// The Paeth filter computes a simple linear function of the three neighboring pixels (left, above, upper left),
-    /// then chooses as predictor the neighboring pixel closest to the computed value.
-    /// This technique is due to Alan W. Paeth.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal static class PaethFilter
-    {
-        /// <summary>
-        /// Decodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to decode</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Decode(byte[] scanline, byte[] previousScanline, int bytesPerPixel)
-        {
-            // Paeth(x) + PaethPredictor(Raw(x-bpp), Prior(x), Prior(x-bpp))
-            byte[] result = new byte[scanline.Length];
-
-            for (int x = 1; x < scanline.Length; x++)
-            {
-                byte left = (x - bytesPerPixel < 1) ? (byte)0 : result[x - bytesPerPixel];
-                byte above = previousScanline[x];
-                byte upperLeft = (x - bytesPerPixel < 1) ? (byte)0 : previousScanline[x - bytesPerPixel];
-
-                result[x] = (byte)((scanline[x] + PaethPredicator(left, above, upperLeft)) % 256);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Encodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to encode</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Encode(byte[] scanline, byte[] previousScanline, int bytesPerPixel, int bytesPerScanline)
-        {
-            // Paeth(x) = Raw(x) - PaethPredictor(Raw(x-bpp), Prior(x), Prior(x - bpp))
-            byte[] encodedScanline = new byte[bytesPerScanline + 1];
-            encodedScanline[0] = (byte)FilterType.Paeth;
-
-            for (int x = 0; x < bytesPerScanline; x++)
-            {
-                byte left = (x - bytesPerPixel < 0) ? (byte)0 : scanline[x - bytesPerPixel];
-                byte above = previousScanline[x];
-                byte upperLeft = (x - bytesPerPixel < 0) ? (byte)0 : previousScanline[x - bytesPerPixel];
-
-                encodedScanline[x + 1] = (byte)((scanline[x] - PaethPredicator(left, above, upperLeft)) % 256);
-            }
-
-            return encodedScanline;
-        }
-
-        /// <summary>
-        /// Computes a simple linear function of the three neighboring pixels (left, above, upper left), then chooses
-        /// as predictor the neighboring pixel closest to the computed value.
-        /// </summary>
-        /// <param name="left">The left neighbor pixel.</param>
-        /// <param name="above">The above neighbor pixel.</param>
-        /// <param name="upperLeft">The upper left neighbor pixel.</param>
-        /// <returns>
-        /// The <see cref="byte"/>.
-        /// </returns>
-        private static byte PaethPredicator(byte left, byte above, byte upperLeft)
-        {
-            int p = left + above - upperLeft;
-            int pa = Math.Abs(p - left);
-            int pb = Math.Abs(p - above);
-            int pc = Math.Abs(p - upperLeft);
-
-            if (pa <= pb && pa <= pc)
-            {
-                return left;
-            }
-
-            if (pb <= pc)
-            {
-                return above;
-            }
-
-            return upperLeft;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Filters/SubFilter.cs b/src/ImageSharp46/Formats/Png/Filters/SubFilter.cs
deleted file mode 100644
index c4fbe3e51..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/SubFilter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="SubFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// The Sub filter transmits the difference between each byte and the value of the corresponding byte
-    /// of the prior pixel.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal static class SubFilter
-    {
-        /// <summary>
-        /// Decodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to decode</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Decode(byte[] scanline, int bytesPerPixel)
-        {
-            // Sub(x) + Raw(x-bpp)
-            byte[] result = new byte[scanline.Length];
-
-            for (int x = 1; x < scanline.Length; x++)
-            {
-                byte priorRawByte = (x - bytesPerPixel < 1) ? (byte)0 : result[x - bytesPerPixel];
-
-                result[x] = (byte)((scanline[x] + priorRawByte) % 256);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Encodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to encode</param>
-        /// <param name="bytesPerPixel">The bytes per pixel.</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Encode(byte[] scanline, int bytesPerPixel, int bytesPerScanline)
-        {
-            // Sub(x) = Raw(x) - Raw(x-bpp)
-            byte[] encodedScanline = new byte[bytesPerScanline + 1];
-            encodedScanline[0] = (byte)FilterType.Sub;
-
-            for (int x = 0; x < bytesPerScanline; x++)
-            {
-                byte priorRawByte = (x - bytesPerPixel < 0) ? (byte)0 : scanline[x - bytesPerPixel];
-
-                encodedScanline[x + 1] = (byte)((scanline[x] - priorRawByte) % 256);
-            }
-
-            return encodedScanline;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Filters/UpFilter.cs b/src/ImageSharp46/Formats/Png/Filters/UpFilter.cs
deleted file mode 100644
index 026070421..000000000
--- a/src/ImageSharp46/Formats/Png/Filters/UpFilter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="UpFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// The Up filter is just like the Sub filter except that the pixel immediately above the current pixel,
-    /// rather than just to its left, is used as the predictor.
-    /// <see href="https://www.w3.org/TR/PNG-Filters.html"/>
-    /// </summary>
-    internal static class UpFilter
-    {
-        /// <summary>
-        /// Decodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to decode</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Decode(byte[] scanline, byte[] previousScanline)
-        {
-            // Up(x) + Prior(x)
-            byte[] result = new byte[scanline.Length];
-
-            for (int x = 1; x < scanline.Length; x++)
-            {
-                byte above = previousScanline[x];
-
-                result[x] = (byte)((scanline[x] + above) % 256);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Encodes the scanline
-        /// </summary>
-        /// <param name="scanline">The scanline to encode</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public static byte[] Encode(byte[] scanline, int bytesPerScanline, byte[] previousScanline)
-        {
-            // Up(x) = Raw(x) - Prior(x)
-            byte[] encodedScanline = new byte[bytesPerScanline + 1];
-            encodedScanline[0] = (byte)FilterType.Up;
-
-            for (int x = 0; x < bytesPerScanline; x++)
-            {
-                byte above = previousScanline[x];
-
-                encodedScanline[x + 1] = (byte)((scanline[x] - above) % 256);
-            }
-
-            return encodedScanline;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngChunk.cs b/src/ImageSharp46/Formats/Png/PngChunk.cs
deleted file mode 100644
index 3d769057c..000000000
--- a/src/ImageSharp46/Formats/Png/PngChunk.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <copyright file="PngChunk.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Stores header information about a chunk.
-    /// </summary>
-    internal sealed class PngChunk
-    {
-        /// <summary>
-        /// Gets or sets the length.
-        /// An unsigned integer giving the number of bytes in the chunk's
-        /// data field. The length counts only the data field, not itself,
-        /// the chunk type code, or the CRC. Zero is a valid length
-        /// </summary>
-        public int Length { get; set; }
-
-        /// <summary>
-        /// Gets or sets the chunk type as string with 4 chars.
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the data bytes appropriate to the chunk type, if any.
-        /// This field can be of zero length.
-        /// </summary>
-        public byte[] Data { get; set; }
-
-        /// <summary>
-        /// Gets or sets a CRC (Cyclic Redundancy Check) calculated on the preceding bytes in the chunk,
-        /// including the chunk type code and chunk data fields, but not including the length field.
-        /// The CRC is always present, even for chunks containing no data
-        /// </summary>
-        public uint Crc { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngChunkTypes.cs b/src/ImageSharp46/Formats/Png/PngChunkTypes.cs
deleted file mode 100644
index 72486b50d..000000000
--- a/src/ImageSharp46/Formats/Png/PngChunkTypes.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// <copyright file="PngChunkTypes.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Contains a list of possible chunk type identifiers.
-    /// </summary>
-    internal static class PngChunkTypes
-    {
-        /// <summary>
-        /// The first chunk in a png file. Can only exists once. Contains
-        /// common information like the width and the height of the image or
-        /// the used compression method.
-        /// </summary>
-        public const string Header = "IHDR";
-
-        /// <summary>
-        /// The PLTE chunk contains from 1 to 256 palette entries, each a three byte
-        /// series in the RGB format.
-        /// </summary>
-        public const string Palette = "PLTE";
-
-        /// <summary>
-        /// The IDAT chunk contains the actual image data. The image can contains more
-        /// than one chunk of this type. All chunks together are the whole image.
-        /// </summary>
-        public const string Data = "IDAT";
-
-        /// <summary>
-        /// This chunk must appear last. It marks the end of the PNG data stream.
-        /// The chunk's data field is empty.
-        /// </summary>
-        public const string End = "IEND";
-
-        /// <summary>
-        /// This chunk specifies that the image uses simple transparency:
-        /// either alpha values associated with palette entries (for indexed-color images)
-        /// or a single transparent color (for grayscale and true color images).
-        /// </summary>
-        public const string PaletteAlpha = "tRNS";
-
-        /// <summary>
-        /// Textual information that the encoder wishes to record with the image can be stored in
-        /// tEXt chunks. Each tEXt chunk contains a keyword and a text string.
-        /// </summary>
-        public const string Text = "tEXt";
-
-        /// <summary>
-        /// This chunk specifies the relationship between the image samples and the desired
-        /// display output intensity.
-        /// </summary>
-        public const string Gamma = "gAMA";
-
-        /// <summary>
-        /// The pHYs chunk specifies the intended pixel size or aspect ratio for display of the image.
-        /// </summary>
-        public const string Physical = "pHYs";
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngColorType.cs b/src/ImageSharp46/Formats/Png/PngColorType.cs
deleted file mode 100644
index 421e27ba3..000000000
--- a/src/ImageSharp46/Formats/Png/PngColorType.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <copyright file="PngColorType.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Provides enumeration of available PNG color types.
-    /// </summary>
-    public enum PngColorType : byte
-    {
-        /// <summary>
-        /// Each pixel is a grayscale sample.
-        /// </summary>
-        Grayscale = 0,
-
-        /// <summary>
-        /// Each pixel is an R,G,B triple.
-        /// </summary>
-        Rgb = 2,
-
-        /// <summary>
-        /// Each pixel is a palette index; a PLTE chunk must appear.
-        /// </summary>
-        Palette = 3,
-
-        /// <summary>
-        /// Each pixel is a grayscale sample, followed by an alpha sample.
-        /// </summary>
-        GrayscaleWithAlpha = 4,
-
-        /// <summary>
-        /// Each pixel is an R,G,B triple, followed by an alpha sample.
-        /// </summary>
-        RgbWithAlpha = 6
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Formats/Png/PngDecoder.cs b/src/ImageSharp46/Formats/Png/PngDecoder.cs
deleted file mode 100644
index 08e086a43..000000000
--- a/src/ImageSharp46/Formats/Png/PngDecoder.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// <copyright file="PngDecoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    /// <summary>
-    /// Encoder for generating an image out of a png encoded stream.
-    /// </summary>
-    /// <remarks>
-    /// At the moment the following features are supported:
-    /// <para>
-    /// <b>Filters:</b> all filters are supported.
-    /// </para>
-    /// <para>
-    /// <b>Pixel formats:</b>
-    /// <list type="bullet">
-    ///     <item>RGBA (True color) with alpha (8 bit).</item>
-    ///     <item>RGB (True color) without alpha (8 bit).</item>
-    ///     <item>Grayscale with alpha (8 bit).</item>
-    ///     <item>Grayscale without alpha (8 bit).</item>
-    ///     <item>Palette Index with alpha (8 bit).</item>
-    ///     <item>Palette Index without alpha (8 bit).</item>
-    /// </list>
-    /// </para>
-    /// </remarks>
-    public class PngDecoder : IImageDecoder
-    {
-        /// <summary>
-        /// Gets the size of the header for this image type.
-        /// </summary>
-        /// <value>The size of the header.</value>
-        public int HeaderSize => 8;
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="extension">The <see cref="string"/> containing the file extension.</param>
-        /// <returns>
-        /// True if the decoder supports the file extension; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, "extension");
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-
-            return extension.Equals("PNG", StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <summary>
-        /// Returns a value indicating whether the <see cref="IImageDecoder"/> supports the specified
-        /// file header.
-        /// </summary>
-        /// <param name="header">The <see cref="T:byte[]"/> containing the file header.</param>
-        /// <returns>
-        /// True if the decoder supports the file header; otherwise, false.
-        /// </returns>
-        public bool IsSupportedFileFormat(byte[] header)
-        {
-            return header.Length >= 8 &&
-                   header[0] == 0x89 &&
-                   header[1] == 0x50 && // P
-                   header[2] == 0x4E && // N
-                   header[3] == 0x47 && // G
-                   header[4] == 0x0D && // CR
-                   header[5] == 0x0A && // LF
-                   header[6] == 0x1A && // EOF
-                   header[7] == 0x0A;   // LF
-        }
-
-        /// <summary>
-        /// Decodes the image from the specified stream to the <see cref="ImageBase{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to decode to.</param>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            new PngDecoderCore().Decode(image, stream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngDecoderCore.cs b/src/ImageSharp46/Formats/Png/PngDecoderCore.cs
deleted file mode 100644
index cad32d9f2..000000000
--- a/src/ImageSharp46/Formats/Png/PngDecoderCore.cs
+++ /dev/null
@@ -1,645 +0,0 @@
-// <copyright file="PngDecoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-
-    /// <summary>
-    /// Performs the png decoding operation.
-    /// </summary>
-    internal class PngDecoderCore
-    {
-        /// <summary>
-        /// The dictionary of available color types.
-        /// </summary>
-        private static readonly Dictionary<int, byte[]> ColorTypes = new Dictionary<int, byte[]>();
-
-        /// <summary>
-        /// Reusable buffer for reading chunk types.
-        /// </summary>
-        private readonly byte[] chunkTypeBuffer = new byte[4];
-
-        /// <summary>
-        /// Reusable buffer for reading chunk lengths.
-        /// </summary>
-        private readonly byte[] chunkLengthBuffer = new byte[4];
-
-        /// <summary>
-        /// Reusable buffer for reading crc values.
-        /// </summary>
-        private readonly byte[] crcBuffer = new byte[4];
-
-        /// <summary>
-        /// Reusable buffer for reading char arrays.
-        /// </summary>
-        private readonly char[] chars = new char[4];
-
-        /// <summary>
-        /// The stream to decode from.
-        /// </summary>
-        private Stream currentStream;
-
-        /// <summary>
-        /// The png header.
-        /// </summary>
-        private PngHeader header;
-
-        /// <summary>
-        /// The number of bytes per pixel.
-        /// </summary>
-        private int bytesPerPixel;
-
-        /// <summary>
-        /// The number of bytes per sample
-        /// </summary>
-        private int bytesPerSample;
-
-        /// <summary>
-        /// The number of bytes per scanline
-        /// </summary>
-        private int bytesPerScanline;
-
-        /// <summary>
-        /// The palette containing color information for indexed png's
-        /// </summary>
-        private byte[] palette;
-
-        /// <summary>
-        /// The palette containing alpha channel color information for indexed png's
-        /// </summary>
-        private byte[] paletteAlpha;
-
-        /// <summary>
-        /// Initializes static members of the <see cref="PngDecoderCore"/> class.
-        /// </summary>
-        static PngDecoderCore()
-        {
-            ColorTypes.Add((int)PngColorType.Grayscale, new byte[] { 1, 2, 4, 8 });
-
-            ColorTypes.Add((int)PngColorType.Rgb, new byte[] { 8 });
-
-            ColorTypes.Add((int)PngColorType.Palette, new byte[] { 1, 2, 4, 8 });
-
-            ColorTypes.Add((int)PngColorType.GrayscaleWithAlpha, new byte[] { 8 });
-
-            ColorTypes.Add((int)PngColorType.RgbWithAlpha, new byte[] { 8 });
-        }
-
-        /// <summary>
-        /// Gets or sets the png color type
-        /// </summary>
-        public PngColorType PngColorType { get; set; }
-
-        /// <summary>
-        /// Decodes the stream to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to decode to.</param>
-        /// <param name="stream">The stream containing image data. </param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the stream does not contain and end chunk.
-        /// </exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// Thrown if the image is larger than the maximum allowable size.
-        /// </exception>
-        public void Decode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Image<TColor, TPacked> currentImage = image;
-            this.currentStream = stream;
-            this.currentStream.Skip(8);
-
-            bool isEndChunkReached = false;
-
-            using (MemoryStream dataStream = new MemoryStream())
-            {
-                PngChunk currentChunk;
-                while ((currentChunk = this.ReadChunk()) != null)
-                {
-                    if (isEndChunkReached)
-                    {
-                        throw new ImageFormatException("Image does not end with end chunk.");
-                    }
-
-                    switch (currentChunk.Type)
-                    {
-                        case PngChunkTypes.Header:
-                            this.ReadHeaderChunk(currentChunk.Data);
-                            this.ValidateHeader();
-                            break;
-                        case PngChunkTypes.Physical:
-                            this.ReadPhysicalChunk(currentImage, currentChunk.Data);
-                            break;
-                        case PngChunkTypes.Data:
-                            dataStream.Write(currentChunk.Data, 0, currentChunk.Data.Length);
-                            break;
-                        case PngChunkTypes.Palette:
-                            this.palette = currentChunk.Data;
-                            image.Quality = this.palette.Length / 3;
-                            break;
-                        case PngChunkTypes.PaletteAlpha:
-                            this.paletteAlpha = currentChunk.Data;
-                            break;
-                        case PngChunkTypes.Text:
-                            this.ReadTextChunk(currentImage, currentChunk.Data);
-                            break;
-                        case PngChunkTypes.End:
-                            isEndChunkReached = true;
-                            break;
-                    }
-                }
-
-                if (this.header.Width > image.MaxWidth || this.header.Height > image.MaxHeight)
-                {
-                    throw new ArgumentOutOfRangeException(
-                        $"The input png '{this.header.Width}x{this.header.Height}' is bigger than the "
-                        + $"max allowed size '{image.MaxWidth}x{image.MaxHeight}'");
-                }
-
-                image.InitPixels(this.header.Width, this.header.Height);
-
-                using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-                {
-                    this.ReadScanlines(dataStream, pixels);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads the data chunk containing physical dimension data.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to read to.</param>
-        /// <param name="data">The data containing physical data.</param>
-        private void ReadPhysicalChunk<TColor, TPacked>(Image<TColor, TPacked> image, byte[] data)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            data.ReverseBytes(0, 4);
-            data.ReverseBytes(4, 4);
-
-            // 39.3700787 = inches in a meter.
-            image.HorizontalResolution = BitConverter.ToInt32(data, 0) / 39.3700787d;
-            image.VerticalResolution = BitConverter.ToInt32(data, 4) / 39.3700787d;
-        }
-
-        /// <summary>
-        /// Calculates the correct number of bytes per pixel for the given color type.
-        /// </summary>
-        /// <returns>The <see cref="int"/></returns>
-        private int CalculateBytesPerPixel()
-        {
-            switch (this.PngColorType)
-            {
-                case PngColorType.Grayscale:
-                    return 1;
-
-                case PngColorType.GrayscaleWithAlpha:
-                    return 2;
-
-                case PngColorType.Palette:
-                    return 1;
-
-                case PngColorType.Rgb:
-                    return 3;
-
-                // PngColorType.RgbWithAlpha:
-                default:
-                    return 4;
-            }
-        }
-
-        /// <summary>
-        /// Calculates the scanline length.
-        /// </summary>
-        /// <returns>The <see cref="int"/> representing the length.</returns>
-        private int CalculateScanlineLength()
-        {
-            int scanlineLength = this.header.Width * this.header.BitDepth * this.bytesPerPixel;
-
-            int amount = scanlineLength % 8;
-            if (amount != 0)
-            {
-                scanlineLength += 8 - amount;
-            }
-
-            return scanlineLength / 8;
-        }
-
-        /// <summary>
-        /// Reads the scanlines within the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="dataStream">The <see cref="MemoryStream"/> containing data.</param>
-        /// <param name="pixels"> The pixel data.</param>
-        private void ReadScanlines<TColor, TPacked>(MemoryStream dataStream, PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            this.bytesPerPixel = this.CalculateBytesPerPixel();
-            this.bytesPerScanline = this.CalculateScanlineLength() + 1;
-            this.bytesPerSample = 1;
-            if (this.header.BitDepth >= 8)
-            {
-                this.bytesPerSample = this.header.BitDepth / 8;
-            }
-
-            dataStream.Position = 0;
-            using (ZlibInflateStream compressedStream = new ZlibInflateStream(dataStream))
-            {
-                this.DecodePixelData(compressedStream, pixels);
-            }
-        }
-
-        /// <summary>
-        /// Decodes the raw pixel data row by row
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="compressedStream">The compressed pixel data stream.</param>
-        /// <param name="pixels">The image pixel accessor.</param>
-        private void DecodePixelData<TColor, TPacked>(Stream compressedStream, PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // TODO: ArrayPool<byte>.Shared.Rent(this.bytesPerScanline)
-            byte[] previousScanline = new byte[this.bytesPerScanline];
-            byte[] scanline = new byte[this.bytesPerScanline];
-            for (int y = 0; y < this.header.Height; y++)
-            {
-                compressedStream.Read(scanline, 0, this.bytesPerScanline);
-
-                FilterType filterType = (FilterType)scanline[0];
-                byte[] defilteredScanline;
-
-                // TODO: It would be good if we can reduce the memory usage here. Each filter is creating a new row.
-                switch (filterType)
-                {
-                    case FilterType.None:
-
-                        defilteredScanline = NoneFilter.Decode(scanline);
-
-                        break;
-
-                    case FilterType.Sub:
-
-                        defilteredScanline = SubFilter.Decode(scanline, this.bytesPerPixel);
-
-                        break;
-
-                    case FilterType.Up:
-
-                        defilteredScanline = UpFilter.Decode(scanline, previousScanline);
-
-                        break;
-
-                    case FilterType.Average:
-
-                        defilteredScanline = AverageFilter.Decode(scanline, previousScanline, this.bytesPerPixel);
-
-                        break;
-
-                    case FilterType.Paeth:
-
-                        defilteredScanline = PaethFilter.Decode(scanline, previousScanline, this.bytesPerPixel);
-
-                        break;
-
-                    default:
-                        throw new ImageFormatException("Unknown filter type.");
-                }
-
-                previousScanline = defilteredScanline;
-                this.ProcessDefilteredScanline(defilteredScanline, y, pixels);
-            }
-        }
-
-        /// <summary>
-        /// Processes the de-filtered scanline filling the image pixel data
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="defilteredScanline">The de-filtered scanline</param>
-        /// <param name="row">The current image row.</param>
-        /// <param name="pixels">The image pixels</param>
-        private void ProcessDefilteredScanline<TColor, TPacked>(byte[] defilteredScanline, int row, PixelAccessor<TColor, TPacked> pixels)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            TColor color = default(TColor);
-            switch (this.PngColorType)
-            {
-                case PngColorType.Grayscale:
-
-                    for (int x = 0; x < this.header.Width; x++)
-                    {
-                        int offset = 1 + (x * this.bytesPerPixel);
-
-                        byte intensity = defilteredScanline[offset];
-                        color.PackFromBytes(intensity, intensity, intensity, 255);
-                        pixels[x, row] = color;
-                    }
-
-                    break;
-
-                case PngColorType.GrayscaleWithAlpha:
-
-                    for (int x = 0; x < this.header.Width; x++)
-                    {
-                        int offset = 1 + (x * this.bytesPerPixel);
-
-                        byte intensity = defilteredScanline[offset];
-                        byte alpha = defilteredScanline[offset + this.bytesPerSample];
-
-                        color.PackFromBytes(intensity, intensity, intensity, alpha);
-                        pixels[x, row] = color;
-                    }
-
-                    break;
-
-                case PngColorType.Palette:
-
-                    byte[] newScanline = defilteredScanline.ToArrayByBitsLength(this.header.BitDepth);
-
-                    if (this.paletteAlpha != null && this.paletteAlpha.Length > 0)
-                    {
-                        // If the alpha palette is not null and has one or more entries, this means, that the image contains an alpha
-                        // channel and we should try to read it.
-                        for (int x = 0; x < this.header.Width; x++)
-                        {
-                            int index = newScanline[x];
-                            int pixelOffset = index * 3;
-
-                            byte a = this.paletteAlpha.Length > index ? this.paletteAlpha[index] : (byte)255;
-
-                            if (a > 0)
-                            {
-                                byte r = this.palette[pixelOffset];
-                                byte g = this.palette[pixelOffset + 1];
-                                byte b = this.palette[pixelOffset + 2];
-                                color.PackFromBytes(r, g, b, a);
-                            }
-
-                            pixels[x, row] = color;
-                        }
-                    }
-                    else
-                    {
-                        for (int x = 0; x < this.header.Width; x++)
-                        {
-                            int index = newScanline[x];
-                            int pixelOffset = index * 3;
-
-                            byte r = this.palette[pixelOffset];
-                            byte g = this.palette[pixelOffset + 1];
-                            byte b = this.palette[pixelOffset + 2];
-
-                            color.PackFromBytes(r, g, b, 255);
-                            pixels[x, row] = color;
-                        }
-                    }
-
-                    break;
-
-                case PngColorType.Rgb:
-
-                    for (int x = 0; x < this.header.Width; x++)
-                    {
-                        int offset = 1 + (x * this.bytesPerPixel);
-
-                        byte r = defilteredScanline[offset];
-                        byte g = defilteredScanline[offset + this.bytesPerSample];
-                        byte b = defilteredScanline[offset + (2 * this.bytesPerSample)];
-
-                        color.PackFromBytes(r, g, b, 255);
-                        pixels[x, row] = color;
-                    }
-
-                    break;
-
-                case PngColorType.RgbWithAlpha:
-
-                    for (int x = 0; x < this.header.Width; x++)
-                    {
-                        int offset = 1 + (x * this.bytesPerPixel);
-
-                        byte r = defilteredScanline[offset];
-                        byte g = defilteredScanline[offset + this.bytesPerSample];
-                        byte b = defilteredScanline[offset + (2 * this.bytesPerSample)];
-                        byte a = defilteredScanline[offset + (3 * this.bytesPerSample)];
-
-                        color.PackFromBytes(r, g, b, a);
-                        pixels[x, row] = color;
-                    }
-
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Reads a text chunk containing image properties from the data.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to decode to.</param>
-        /// <param name="data">The <see cref="T:byte[]"/> containing  data.</param>
-        private void ReadTextChunk<TColor, TPacked>(Image<TColor, TPacked> image, byte[] data)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int zeroIndex = 0;
-
-            for (int i = 0; i < data.Length; i++)
-            {
-                if (data[i] == 0)
-                {
-                    zeroIndex = i;
-                    break;
-                }
-            }
-
-            string name = Encoding.Unicode.GetString(data, 0, zeroIndex);
-            string value = Encoding.Unicode.GetString(data, zeroIndex + 1, data.Length - zeroIndex - 1);
-
-            image.Properties.Add(new ImageProperty(name, value));
-        }
-
-        /// <summary>
-        /// Reads a header chunk from the data.
-        /// </summary>
-        /// <param name="data">The <see cref="T:byte[]"/> containing  data.</param>
-        private void ReadHeaderChunk(byte[] data)
-        {
-            this.header = new PngHeader();
-
-            data.ReverseBytes(0, 4);
-            data.ReverseBytes(4, 4);
-
-            this.header.Width = BitConverter.ToInt32(data, 0);
-            this.header.Height = BitConverter.ToInt32(data, 4);
-
-            this.header.BitDepth = data[8];
-            this.header.ColorType = data[9];
-            this.header.CompressionMethod = data[10];
-            this.header.FilterMethod = data[11];
-            this.header.InterlaceMethod = data[12];
-        }
-
-        /// <summary>
-        /// Validates the png header.
-        /// </summary>
-        /// <exception cref="NotSupportedException">
-        /// Thrown if the image does pass validation.
-        /// </exception>
-        private void ValidateHeader()
-        {
-            if (!ColorTypes.ContainsKey(this.header.ColorType))
-            {
-                throw new NotSupportedException("Color type is not supported or not valid.");
-            }
-
-            if (!ColorTypes[this.header.ColorType].Contains(this.header.BitDepth))
-            {
-                throw new NotSupportedException("Bit depth is not supported or not valid.");
-            }
-
-            if (this.header.FilterMethod != 0)
-            {
-                throw new NotSupportedException("The png specification only defines 0 as filter method.");
-            }
-
-            if (this.header.InterlaceMethod != 0)
-            {
-                // TODO: Support interlacing
-                throw new NotSupportedException("Interlacing is not supported.");
-            }
-
-            this.PngColorType = (PngColorType)this.header.ColorType;
-        }
-
-        /// <summary>
-        /// Reads a chunk from the stream.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="PngChunk"/>.
-        /// </returns>
-        private PngChunk ReadChunk()
-        {
-            PngChunk chunk = new PngChunk();
-
-            if (this.ReadChunkLength(chunk) == 0)
-            {
-                return null;
-            }
-
-            if (chunk.Length <= 0)
-            {
-                return null;
-            }
-
-            this.ReadChunkType(chunk);
-            this.ReadChunkData(chunk);
-            this.ReadChunkCrc(chunk);
-
-            return chunk;
-        }
-
-        /// <summary>
-        /// Reads the cycle redundancy chunk from the data.
-        /// </summary>
-        /// <param name="chunk">The chunk.</param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the input stream is not valid or corrupt.
-        /// </exception>
-        private void ReadChunkCrc(PngChunk chunk)
-        {
-            int numBytes = this.currentStream.Read(this.crcBuffer, 0, 4);
-            if (numBytes >= 1 && numBytes <= 3)
-            {
-                throw new ImageFormatException("Image stream is not valid!");
-            }
-
-            this.crcBuffer.ReverseBytes();
-
-            chunk.Crc = BitConverter.ToUInt32(this.crcBuffer, 0);
-
-            Crc32 crc = new Crc32();
-            crc.Update(this.chunkTypeBuffer);
-            crc.Update(chunk.Data);
-
-            if (crc.Value != chunk.Crc)
-            {
-                throw new ImageFormatException("CRC Error. PNG Image chunk is corrupt!");
-            }
-        }
-
-        /// <summary>
-        /// Reads the chunk data from the stream.
-        /// </summary>
-        /// <param name="chunk">The chunk.</param>
-        private void ReadChunkData(PngChunk chunk)
-        {
-            chunk.Data = new byte[chunk.Length];
-            this.currentStream.Read(chunk.Data, 0, chunk.Length);
-        }
-
-        /// <summary>
-        /// Identifies the chunk type from the chunk.
-        /// </summary>
-        /// <param name="chunk">The chunk.</param>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the input stream is not valid.
-        /// </exception>
-        private void ReadChunkType(PngChunk chunk)
-        {
-            int numBytes = this.currentStream.Read(this.chunkTypeBuffer, 0, 4);
-            if (numBytes >= 1 && numBytes <= 3)
-            {
-                throw new ImageFormatException("Image stream is not valid!");
-            }
-
-            this.chars[0] = (char)this.chunkTypeBuffer[0];
-            this.chars[1] = (char)this.chunkTypeBuffer[1];
-            this.chars[2] = (char)this.chunkTypeBuffer[2];
-            this.chars[3] = (char)this.chunkTypeBuffer[3];
-
-            chunk.Type = new string(this.chars);
-        }
-
-        /// <summary>
-        /// Calculates the length of the given chunk.
-        /// </summary>
-        /// <param name="chunk">he chunk.</param>
-        /// <returns>
-        /// The <see cref="int"/> representing the chunk length.
-        /// </returns>
-        /// <exception cref="ImageFormatException">
-        /// Thrown if the input stream is not valid.
-        /// </exception>
-        private int ReadChunkLength(PngChunk chunk)
-        {
-            int numBytes = this.currentStream.Read(this.chunkLengthBuffer, 0, 4);
-            if (numBytes >= 1 && numBytes <= 3)
-            {
-                throw new ImageFormatException("Image stream is not valid!");
-            }
-
-            this.chunkLengthBuffer.ReverseBytes();
-
-            chunk.Length = BitConverter.ToInt32(this.chunkLengthBuffer, 0);
-
-            return numBytes;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngEncoder.cs b/src/ImageSharp46/Formats/Png/PngEncoder.cs
deleted file mode 100644
index af4fe95d6..000000000
--- a/src/ImageSharp46/Formats/Png/PngEncoder.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// <copyright file="PngEncoder.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-
-    using ImageSharp.Quantizers;
-
-    /// <summary>
-    /// Image encoder for writing image data to a stream in png format.
-    /// </summary>
-    public class PngEncoder : IImageEncoder
-    {
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        public int Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the png color type
-        /// </summary>
-        public PngColorType PngColorType { get; set; } = PngColorType.RgbWithAlpha;
-
-        /// <inheritdoc/>
-        public string MimeType => "image/png";
-
-        /// <inheritdoc/>
-        public string Extension => "png";
-
-        /// <summary>
-        /// Gets or sets the compression level 1-9.
-        /// <remarks>Defaults to 6.</remarks>
-        /// </summary>
-        public int CompressionLevel { get; set; } = 6;
-
-        /// <summary>
-        /// Gets or sets the gamma value, that will be written
-        /// the the stream, when the <see cref="WriteGamma"/> property
-        /// is set to true. The default value is 2.2F.
-        /// </summary>
-        /// <value>The gamma value of the image.</value>
-        public float Gamma { get; set; } = 2.2F;
-
-        /// <summary>
-        /// Gets or sets quantizer for reducing the color count.
-        /// </summary>
-        public IQuantizer Quantizer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transparency threshold.
-        /// </summary>
-        public byte Threshold { get; set; } = 0;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance should write
-        /// gamma information to the stream. The default value is false.
-        /// </summary>
-        public bool WriteGamma { get; set; }
-
-        /// <inheritdoc/>
-        public bool IsSupportedFileExtension(string extension)
-        {
-            Guard.NotNullOrEmpty(extension, nameof(extension));
-
-            extension = extension.StartsWith(".") ? extension.Substring(1) : extension;
-
-            return extension.Equals(this.Extension, StringComparison.OrdinalIgnoreCase);
-        }
-
-        /// <inheritdoc/>
-        public void Encode<TColor, TPacked>(Image<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            PngEncoderCore encoder = new PngEncoderCore
-            {
-                CompressionLevel = this.CompressionLevel,
-                Gamma = this.Gamma,
-                Quality = this.Quality,
-                PngColorType = this.PngColorType,
-                Quantizer = this.Quantizer,
-                WriteGamma = this.WriteGamma,
-                Threshold = this.Threshold
-            };
-
-            encoder.Encode(image, stream);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngEncoderCore.cs b/src/ImageSharp46/Formats/Png/PngEncoderCore.cs
deleted file mode 100644
index a06e306f5..000000000
--- a/src/ImageSharp46/Formats/Png/PngEncoderCore.cs
+++ /dev/null
@@ -1,712 +0,0 @@
-// <copyright file="PngEncoderCore.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.Buffers;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-
-    using Quantizers;
-
-    /// <summary>
-    /// Performs the png encoding operation.
-    /// TODO: Perf. There's lots of array parsing and copying going on here. This should be unmanaged.
-    /// </summary>
-    internal sealed class PngEncoderCore
-    {
-        /// <summary>
-        /// The maximum block size, defaults at 64k for uncompressed blocks.
-        /// </summary>
-        private const int MaxBlockSize = 65535;
-
-        /// <summary>
-        /// Reusable buffer for writing chunk types.
-        /// </summary>
-        private readonly byte[] chunkTypeBuffer = new byte[4];
-
-        /// <summary>
-        /// Reusable buffer for writing chunk data.
-        /// </summary>
-        private readonly byte[] chunkDataBuffer = new byte[16];
-
-
-        /// <summary>
-        /// Contains the raw pixel data from an indexed image.
-        /// </summary>
-        private byte[] palettePixelData;
-
-        /// <summary>
-        /// The image width.
-        /// </summary>
-        private int width;
-
-        /// <summary>
-        /// The image height.
-        /// </summary>
-        private int height;
-
-        /// <summary>
-        /// The number of bits required to encode the colors in the png.
-        /// </summary>
-        private byte bitDepth;
-
-        /// <summary>
-        /// The number of bytes per pixel.
-        /// </summary>
-        private int bytesPerPixel;
-
-        /// <summary>
-        /// Gets or sets the quality of output for images.
-        /// </summary>
-        public int Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the png color type
-        /// </summary>
-        public PngColorType PngColorType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the compression level 1-9.
-        /// <remarks>Defaults to 6.</remarks>
-        /// </summary>
-        public int CompressionLevel { get; set; } = 6;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance should write
-        /// gamma information to the stream. The default value is false.
-        /// </summary>
-        public bool WriteGamma { get; set; }
-
-        /// <summary>
-        /// Gets or sets the gamma value, that will be written
-        /// the the stream, when the <see cref="WriteGamma"/> property
-        /// is set to true. The default value is 2.2F.
-        /// </summary>
-        /// <value>The gamma value of the image.</value>
-        public float Gamma { get; set; } = 2.2F;
-
-        /// <summary>
-        /// Gets or sets the quantizer for reducing the color count.
-        /// </summary>
-        public IQuantizer Quantizer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the transparency threshold.
-        /// </summary>
-        public byte Threshold { get; set; }
-
-        /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="ImageBase{TColor, TPacked}"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor, TPacked}"/> to encode from.</param>
-        /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TColor, TPacked>(ImageBase<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.NotNull(image, nameof(image));
-            Guard.NotNull(stream, nameof(stream));
-
-            this.width = image.Width;
-            this.height = image.Height;
-
-            // Write the png header.
-            this.chunkDataBuffer[0] = 0x89; // Set the high bit.
-            this.chunkDataBuffer[1] = 0x50; // P
-            this.chunkDataBuffer[2] = 0x4E; // N
-            this.chunkDataBuffer[3] = 0x47; // G
-            this.chunkDataBuffer[4] = 0x0D; // Line ending CRLF
-            this.chunkDataBuffer[5] = 0x0A; // Line ending CRLF
-            this.chunkDataBuffer[6] = 0x1A; // EOF
-            this.chunkDataBuffer[7] = 0x0A; // LF
-
-            stream.Write(this.chunkDataBuffer, 0, 8);
-
-            // Ensure that quality can be set but has a fallback.
-            int quality = this.Quality > 0 ? this.Quality : image.Quality;
-            this.Quality = quality > 0 ? quality.Clamp(1, int.MaxValue) : int.MaxValue;
-
-            // Set correct color type if the color count is 256 or less.
-            if (this.Quality <= 256)
-            {
-                this.PngColorType = PngColorType.Palette;
-            }
-
-            if (this.PngColorType == PngColorType.Palette && this.Quality > 256)
-            {
-                this.Quality = 256;
-            }
-
-            // Set correct bit depth.
-            this.bitDepth = this.Quality <= 256
-                               ? (byte)ImageMaths.GetBitsNeededForColorDepth(this.Quality).Clamp(1, 8)
-                               : (byte)8;
-
-            // Png only supports in four pixel depths: 1, 2, 4, and 8 bits when using the PLTE chunk
-            if (this.bitDepth == 3)
-            {
-                this.bitDepth = 4;
-            }
-            else if (this.bitDepth >= 5 || this.bitDepth <= 7)
-            {
-                this.bitDepth = 8;
-            }
-
-            this.bytesPerPixel = this.CalculateBytesPerPixel();
-
-            PngHeader header = new PngHeader
-            {
-                Width = image.Width,
-                Height = image.Height,
-                ColorType = (byte)this.PngColorType,
-                BitDepth = this.bitDepth,
-                FilterMethod = 0, // None
-                CompressionMethod = 0,
-                InterlaceMethod = 0
-            };
-
-            this.WriteHeaderChunk(stream, header);
-
-            // Collect the indexed pixel data
-            if (this.PngColorType == PngColorType.Palette)
-            {
-                this.CollectIndexedBytes(image, stream, header);
-            }
-
-            this.WritePhysicalChunk(stream, image);
-            this.WriteGammaChunk(stream);
-            this.WriteDataChunks(image, stream);
-            this.WriteEndChunk(stream);
-            stream.Flush();
-        }
-
-        /// <summary>
-        /// Writes an integer to the byte array.
-        /// </summary>
-        /// <param name="data">The <see cref="T:byte[]"/> containing image data.</param>
-        /// <param name="offset">The amount to offset by.</param>
-        /// <param name="value">The value to write.</param>
-        private static void WriteInteger(byte[] data, int offset, int value)
-        {
-            byte[] buffer = BitConverter.GetBytes(value);
-
-            buffer.ReverseBytes();
-            Buffer.BlockCopy(buffer, 0, data, offset, 4);
-        }
-
-        /// <summary>
-        /// Writes an integer to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="value">The value to write.</param>
-        private static void WriteInteger(Stream stream, int value)
-        {
-            byte[] buffer = BitConverter.GetBytes(value);
-
-            buffer.ReverseBytes();
-            stream.Write(buffer, 0, 4);
-        }
-
-        /// <summary>
-        /// Writes an unsigned integer to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="value">The value to write.</param>
-        private static void WriteInteger(Stream stream, uint value)
-        {
-            byte[] buffer = BitConverter.GetBytes(value);
-
-            buffer.ReverseBytes();
-            stream.Write(buffer, 0, 4);
-        }
-
-        /// <summary>
-        /// Collects the indexed pixel data.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="header">The <see cref="PngHeader"/>.</param>
-        private void CollectIndexedBytes<TColor, TPacked>(ImageBase<TColor, TPacked> image, Stream stream, PngHeader header)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Quantize the image and get the pixels.
-            QuantizedImage<TColor, TPacked> quantized = this.WritePaletteChunk(stream, header, image);
-            this.palettePixelData = quantized.Pixels;
-        }
-
-        /// <summary>
-        /// Collects a row of grayscale pixels.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="row">The row index.</param>
-        /// <param name="rawScanline">The raw scanline.</param>
-        private void CollectGrayscaleBytes<TColor, TPacked>(ImageBase<TColor, TPacked> image, int row, byte[] rawScanline)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Copy the pixels across from the image.
-            // Reuse the chunk type buffer.
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                for (int x = 0; x < this.width; x++)
-                {
-                    // Convert the color to YCbCr and store the luminance
-                    // Optionally store the original color alpha.
-                    int offset = x * this.bytesPerPixel;
-                    pixels[x, row].ToBytes(this.chunkTypeBuffer, 0, ComponentOrder.XYZW);
-                    byte luminance = (byte)((0.299F * this.chunkTypeBuffer[0]) + (0.587F * this.chunkTypeBuffer[1]) + (0.114F * this.chunkTypeBuffer[2]));
-
-                    for (int i = 0; i < this.bytesPerPixel; i++)
-                    {
-                        if (i == 0)
-                        {
-                            rawScanline[offset] = luminance;
-                        }
-                        else
-                        {
-                            rawScanline[offset + i] = this.chunkTypeBuffer[3];
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Collects a row of true color pixel data.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="row">The row index.</param>
-        /// <param name="rawScanline">The raw scanline.</param>
-        private void CollectColorBytes<TColor, TPacked>(ImageBase<TColor, TPacked> image, int row, byte[] rawScanline)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                int bpp = this.bytesPerPixel;
-                for (int x = 0; x < this.width; x++)
-                {
-                    pixels[x, row].ToBytes(rawScanline, x * this.bytesPerPixel, bpp == 4 ? ComponentOrder.XYZW : ComponentOrder.XYZ);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Encodes the pixel data line by line.
-        /// Each scanline is encoded in the most optimal manner to improve compression.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="row">The row.</param>
-        /// <param name="previousScanline">The previous scanline.</param>
-        /// <param name="rawScanline">The raw scanline.</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline.</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        private byte[] EncodePixelRow<TColor, TPacked>(ImageBase<TColor, TPacked> image, int row, byte[] previousScanline, byte[] rawScanline, int bytesPerScanline)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            switch (this.PngColorType)
-            {
-                case PngColorType.Palette:
-                    Buffer.BlockCopy(this.palettePixelData, row * bytesPerScanline, rawScanline, 0, bytesPerScanline);
-                    break;
-                case PngColorType.Grayscale:
-                case PngColorType.GrayscaleWithAlpha:
-                    this.CollectGrayscaleBytes(image, row, rawScanline);
-                    break;
-                default:
-                    this.CollectColorBytes(image, row, rawScanline);
-                    break;
-            }
-
-            byte[] filteredScanline = this.GetOptimalFilteredScanline(rawScanline, previousScanline, bytesPerScanline, this.bytesPerPixel);
-
-            return filteredScanline;
-        }
-
-        /// <summary>
-        /// Applies all PNG filters to the given scanline and returns the filtered scanline that is deemed
-        /// to be most compressible, using lowest total variation as proxy for compressibility.
-        /// </summary>
-        /// <param name="rawScanline">The raw scanline</param>
-        /// <param name="previousScanline">The previous scanline</param>
-        /// <param name="bytesPerScanline">The number of bytes per scanline</param>
-        /// <param name="bytesPerPixel">The number of bytes per pixel</param>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        private byte[] GetOptimalFilteredScanline(byte[] rawScanline, byte[] previousScanline, int bytesPerScanline, int bytesPerPixel)
-        {
-            Tuple<byte[], int>[] candidates;
-
-            // Palette images don't compress well with adaptive filtering.
-            if (this.PngColorType == PngColorType.Palette)
-            {
-                candidates = new Tuple<byte[], int>[1];
-
-                byte[] none = NoneFilter.Encode(rawScanline, bytesPerScanline);
-                candidates[0] = new Tuple<byte[], int>(none, this.CalculateTotalVariation(none));
-            }
-            else
-            {
-                candidates = new Tuple<byte[], int>[4];
-
-                byte[] sub = SubFilter.Encode(rawScanline, bytesPerPixel, bytesPerScanline);
-                candidates[0] = new Tuple<byte[], int>(sub, this.CalculateTotalVariation(sub));
-
-                byte[] up = UpFilter.Encode(rawScanline, bytesPerScanline, previousScanline);
-                candidates[1] = new Tuple<byte[], int>(up, this.CalculateTotalVariation(up));
-
-                byte[] average = AverageFilter.Encode(rawScanline, previousScanline, bytesPerPixel, bytesPerScanline);
-                candidates[2] = new Tuple<byte[], int>(average, this.CalculateTotalVariation(average));
-
-                byte[] paeth = PaethFilter.Encode(rawScanline, previousScanline, bytesPerPixel, bytesPerScanline);
-                candidates[3] = new Tuple<byte[], int>(paeth, this.CalculateTotalVariation(paeth));
-            }
-
-            int lowestTotalVariation = int.MaxValue;
-            int lowestTotalVariationIndex = 0;
-
-            for (int i = 0; i < candidates.Length; i++)
-            {
-                if (candidates[i].Item2 < lowestTotalVariation)
-                {
-                    lowestTotalVariationIndex = i;
-                    lowestTotalVariation = candidates[i].Item2;
-                }
-            }
-
-            return candidates[lowestTotalVariationIndex].Item1;
-        }
-
-        /// <summary>
-        /// Calculates the total variation of given byte array. Total variation is the sum of the absolute values of
-        /// neighbor differences.
-        /// </summary>
-        /// <param name="input">The scanline bytes</param>
-        /// <returns>The <see cref="int"/></returns>
-        private int CalculateTotalVariation(byte[] input)
-        {
-            int totalVariation = 0;
-
-            for (int i = 1; i < input.Length; i++)
-            {
-                totalVariation += Math.Abs(input[i] - input[i - 1]);
-            }
-
-            return totalVariation;
-        }
-
-        /// <summary>
-        /// Calculates the correct number of bytes per pixel for the given color type.
-        /// </summary>
-        /// <returns>The <see cref="int"/></returns>
-        private int CalculateBytesPerPixel()
-        {
-            switch (this.PngColorType)
-            {
-                case PngColorType.Grayscale:
-                    return 1;
-
-                case PngColorType.GrayscaleWithAlpha:
-                    return 2;
-
-                case PngColorType.Palette:
-                    return 1;
-
-                case PngColorType.Rgb:
-                    return 3;
-
-                // PngColorType.RgbWithAlpha
-                // TODO: Maybe figure out a way to detect if there are any transparent
-                // pixels and encode RGB if none.
-                default:
-                    return 4;
-            }
-        }
-
-        /// <summary>
-        /// Writes the header chunk to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="header">The <see cref="PngHeader"/>.</param>
-        private void WriteHeaderChunk(Stream stream, PngHeader header)
-        {
-            WriteInteger(this.chunkDataBuffer, 0, header.Width);
-            WriteInteger(this.chunkDataBuffer, 4, header.Height);
-
-            this.chunkDataBuffer[8] = header.BitDepth;
-            this.chunkDataBuffer[9] = header.ColorType;
-            this.chunkDataBuffer[10] = header.CompressionMethod;
-            this.chunkDataBuffer[11] = header.FilterMethod;
-            this.chunkDataBuffer[12] = header.InterlaceMethod;
-
-            this.WriteChunk(stream, PngChunkTypes.Header, this.chunkDataBuffer, 0, 13);
-        }
-
-        /// <summary>
-        /// Writes the palette chunk to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="header">The <see cref="PngHeader"/>.</param>
-        /// <param name="image">The image to encode.</param>
-        /// <returns>The <see cref="QuantizedImage{TColor, TPacked}"/></returns>
-        private QuantizedImage<TColor, TPacked> WritePaletteChunk<TColor, TPacked>(Stream stream, PngHeader header, ImageBase<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (this.Quality > 256)
-            {
-                return null;
-            }
-
-            if (this.Quantizer == null)
-            {
-                this.Quantizer = new WuQuantizer<TColor, TPacked>();
-            }
-
-            // Quantize the image returning a palette. This boxing is icky.
-            QuantizedImage<TColor, TPacked> quantized = ((IQuantizer<TColor, TPacked>)this.Quantizer).Quantize(image, this.Quality);
-
-            // Grab the palette and write it to the stream.
-            TColor[] palette = quantized.Palette;
-            int pixelCount = palette.Length;
-            List<byte> transparentPixels = new List<byte>();
-
-            // Get max colors for bit depth.
-            int colorTableLength = (int)Math.Pow(2, header.BitDepth) * 3;
-            byte[] colorTable = ArrayPool<byte>.Shared.Rent(colorTableLength);
-            byte[] bytes = ArrayPool<byte>.Shared.Rent(4);
-
-            try
-            {
-                for (int i = 0; i < pixelCount; i++)
-                {
-                    int offset = i * 3;
-                    palette[i].ToBytes(bytes, 0, ComponentOrder.XYZW);
-
-                    int alpha = bytes[3];
-
-                    // Premultiply the color. This helps prevent banding.
-                    // TODO: Vector<byte>?
-                    if (alpha < 255 && alpha > this.Threshold)
-                    {
-                        bytes[0] = (byte)(bytes[0] * alpha).Clamp(0, 255);
-                        bytes[1] = (byte)(bytes[1] * alpha).Clamp(0, 255);
-                        bytes[2] = (byte)(bytes[2] * alpha).Clamp(0, 255);
-                    }
-
-                    colorTable[offset] = bytes[0];
-                    colorTable[offset + 1] = bytes[1];
-                    colorTable[offset + 2] = bytes[2];
-
-                    if (alpha <= this.Threshold)
-                    {
-                        transparentPixels.Add((byte)offset);
-                    }
-                }
-
-                this.WriteChunk(stream, PngChunkTypes.Palette, colorTable, 0, colorTableLength);
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(colorTable);
-                ArrayPool<byte>.Shared.Return(bytes);
-            }
-
-            // Write the transparency data
-            if (transparentPixels.Any())
-            {
-                this.WriteChunk(stream, PngChunkTypes.PaletteAlpha, transparentPixels.ToArray());
-            }
-
-            return quantized;
-        }
-
-        /// <summary>
-        /// Writes the physical dimension information to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        /// <param name="imageBase">The image base.</param>
-        private void WritePhysicalChunk<TColor, TPacked>(Stream stream, ImageBase<TColor, TPacked> imageBase)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Image<TColor, TPacked> image = imageBase as Image<TColor, TPacked>;
-            if (image != null && image.HorizontalResolution > 0 && image.VerticalResolution > 0)
-            {
-                // 39.3700787 = inches in a meter.
-                int dpmX = (int)Math.Round(image.HorizontalResolution * 39.3700787D);
-                int dpmY = (int)Math.Round(image.VerticalResolution * 39.3700787D);
-
-                WriteInteger(this.chunkDataBuffer, 0, dpmX);
-                WriteInteger(this.chunkDataBuffer, 4, dpmY);
-
-                this.chunkDataBuffer[8] = 1;
-
-                this.WriteChunk(stream, PngChunkTypes.Physical, this.chunkDataBuffer, 0, 9);
-            }
-        }
-
-        /// <summary>
-        /// Writes the gamma information to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        private void WriteGammaChunk(Stream stream)
-        {
-            if (this.WriteGamma)
-            {
-                int gammaValue = (int)(this.Gamma * 100000F);
-
-                byte[] size = BitConverter.GetBytes(gammaValue);
-
-                this.chunkDataBuffer[0] = size[3];
-                this.chunkDataBuffer[1] = size[2];
-                this.chunkDataBuffer[2] = size[1];
-                this.chunkDataBuffer[3] = size[0];
-
-                this.WriteChunk(stream, PngChunkTypes.Gamma, this.chunkDataBuffer, 0, 4);
-            }
-        }
-
-        /// <summary>
-        /// Writes the pixel information to the stream.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="image">The image to encode.</param>
-        /// <param name="stream">The stream.</param>
-        private void WriteDataChunks<TColor, TPacked>(ImageBase<TColor, TPacked> image, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int bytesPerScanline = this.width * this.bytesPerPixel;
-            byte[] previousScanline = ArrayPool<byte>.Shared.Rent(bytesPerScanline);
-            byte[] rawScanline = ArrayPool<byte>.Shared.Rent(bytesPerScanline);
-
-            byte[] buffer;
-            int bufferLength;
-            MemoryStream memoryStream = null;
-            try
-            {
-                memoryStream = new MemoryStream();
-                using (ZlibDeflateStream deflateStream = new ZlibDeflateStream(memoryStream, this.CompressionLevel))
-                {
-                    for (int y = 0; y < this.height; y++)
-                    {
-                        byte[] data = this.EncodePixelRow(image, y, previousScanline, rawScanline, bytesPerScanline);
-                        deflateStream.Write(data, 0, data.Length);
-                        deflateStream.Flush();
-
-                        // Do a bit of shuffling;
-                        byte[] tmp = rawScanline;
-                        rawScanline = previousScanline;
-                        previousScanline = tmp;
-                    }
-
-                    bufferLength = (int)memoryStream.Length;
-                    buffer = memoryStream.ToArray();
-                }
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(previousScanline);
-                ArrayPool<byte>.Shared.Return(rawScanline);
-                memoryStream?.Dispose();
-            }
-
-            // Store the chunks in repeated 64k blocks. 
-            // This reduces the memory load for decoding the image for many decoders.
-            int numChunks = bufferLength / MaxBlockSize;
-
-            if (bufferLength % MaxBlockSize != 0)
-            {
-                numChunks++;
-            }
-
-            for (int i = 0; i < numChunks; i++)
-            {
-                int length = bufferLength - (i * MaxBlockSize);
-
-                if (length > MaxBlockSize)
-                {
-                    length = MaxBlockSize;
-                }
-
-                this.WriteChunk(stream, PngChunkTypes.Data, buffer, i * MaxBlockSize, length);
-            }
-        }
-
-        /// <summary>
-        /// Writes the chunk end to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
-        private void WriteEndChunk(Stream stream)
-        {
-            this.WriteChunk(stream, PngChunkTypes.End, null);
-        }
-
-        /// <summary>
-        /// Writes a chunk to the stream.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> to write to.</param>
-        /// <param name="type">The type of chunk to write.</param>
-        /// <param name="data">The <see cref="T:byte[]"/> containing data.</param>
-        private void WriteChunk(Stream stream, string type, byte[] data)
-        {
-            this.WriteChunk(stream, type, data, 0, data?.Length ?? 0);
-        }
-
-        /// <summary>
-        /// Writes a chunk of a specified length to the stream at the given offset.
-        /// </summary>
-        /// <param name="stream">The <see cref="Stream"/> to write to.</param>
-        /// <param name="type">The type of chunk to write.</param>
-        /// <param name="data">The <see cref="T:byte[]"/> containing data.</param>
-        /// <param name="offset">The position to offset the data at.</param>
-        /// <param name="length">The of the data to write.</param>
-        private void WriteChunk(Stream stream, string type, byte[] data, int offset, int length)
-        {
-            // Chunk length
-            WriteInteger(stream, length);
-
-            // Chunk type
-            this.chunkTypeBuffer[0] = (byte)type[0];
-            this.chunkTypeBuffer[1] = (byte)type[1];
-            this.chunkTypeBuffer[2] = (byte)type[2];
-            this.chunkTypeBuffer[3] = (byte)type[3];
-
-            stream.Write(this.chunkTypeBuffer, 0, 4);
-
-            Crc32 crc32 = new Crc32();
-            crc32.Update(this.chunkTypeBuffer);
-
-            // Chunk data
-            if (data != null)
-            {
-                stream.Write(data, offset, length);
-                crc32.Update(data, offset, length);
-            }
-
-            WriteInteger(stream, (uint)crc32.Value);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngFormat.cs b/src/ImageSharp46/Formats/Png/PngFormat.cs
deleted file mode 100644
index 230ba8b40..000000000
--- a/src/ImageSharp46/Formats/Png/PngFormat.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// <copyright file="PngFormat.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Encapsulates the means to encode and decode png images.
-    /// </summary>
-    public class PngFormat : IImageFormat
-    {
-        /// <inheritdoc/>
-        public IImageDecoder Decoder => new PngDecoder();
-
-        /// <inheritdoc/>
-        public IImageEncoder Encoder => new PngEncoder();
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/PngHeader.cs b/src/ImageSharp46/Formats/Png/PngHeader.cs
deleted file mode 100644
index 3121969b6..000000000
--- a/src/ImageSharp46/Formats/Png/PngHeader.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// <copyright file="PngHeader.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Represents the png header chunk.
-    /// </summary>
-    public sealed class PngHeader
-    {
-        /// <summary>
-        /// Gets or sets the dimension in x-direction of the image in pixels.
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the dimension in y-direction of the image in pixels.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets or sets the bit depth.
-        /// Bit depth is a single-byte integer giving the number of bits per sample
-        /// or per palette index (not per pixel). Valid values are 1, 2, 4, 8, and 16,
-        /// although not all values are allowed for all color types.
-        /// </summary>
-        public byte BitDepth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the color type.
-        /// Color type is a integer that describes the interpretation of the
-        /// image data. Color type codes represent sums of the following values:
-        /// 1 (palette used), 2 (color used), and 4 (alpha channel used).
-        /// </summary>
-        public byte ColorType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the compression method.
-        /// Indicates the method used to compress the image data. At present,
-        /// only compression method 0 (deflate/inflate compression with a sliding
-        /// window of at most 32768 bytes) is defined.
-        /// </summary>
-        public byte CompressionMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preprocessing method.
-        /// Indicates the preprocessing method applied to the image
-        /// data before compression. At present, only filter method 0
-        /// (adaptive filtering with five basic filter types) is defined.
-        /// </summary>
-        public byte FilterMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the  transmission order.
-        /// Indicates the transmission order of the image data.
-        /// Two values are currently defined: 0 (no interlace) or 1 (Adam7 interlace).
-        /// </summary>
-        public byte InterlaceMethod { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/README.md b/src/ImageSharp46/Formats/Png/README.md
deleted file mode 100644
index 8ade37956..000000000
--- a/src/ImageSharp46/Formats/Png/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Encoder/Decoder adapted from:
-
-https://github.com/yufeih/Nine.Imaging/
-https://imagetools.codeplex.com/
-https://github.com/leonbloy/pngcs
-
diff --git a/src/ImageSharp46/Formats/Png/Zlib/Adler32.cs b/src/ImageSharp46/Formats/Png/Zlib/Adler32.cs
deleted file mode 100644
index 5f92cc9e0..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/Adler32.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// <copyright file="Adler32.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// Computes Adler32 checksum for a stream of data. An Adler32
-    /// checksum is not as reliable as a CRC32 checksum, but a lot faster to
-    /// compute.
-    /// </summary>
-    /// <remarks>
-    /// The specification for Adler32 may be found in RFC 1950.
-    /// ZLIB Compressed Data Format Specification version 3.3)
-    ///
-    ///
-    /// From that document:
-    ///
-    ///      "ADLER32 (Adler-32 checksum)
-    ///       This contains a checksum value of the uncompressed data
-    ///       (excluding any dictionary data) computed according to Adler-32
-    ///       algorithm. This algorithm is a 32-bit extension and improvement
-    ///       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
-    ///       standard.
-    ///
-    ///       Adler-32 is composed of two sums accumulated per byte: s1 is
-    ///       the sum of all bytes, s2 is the sum of all s1 values. Both sums
-    ///       are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
-    ///       Adler-32 checksum is stored as s2*65536 + s1 in most-
-    ///       significant-byte first (network) order."
-    ///
-    ///  "8.2. The Adler-32 algorithm
-    ///
-    ///    The Adler-32 algorithm is much faster than the CRC32 algorithm yet
-    ///    still provides an extremely low probability of undetected errors.
-    ///
-    ///    The modulo on unsigned long accumulators can be delayed for 5552
-    ///    bytes, so the modulo operation time is negligible.  If the bytes
-    ///    are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
-    ///    and order sensitive, unlike the first sum, which is just a
-    ///    checksum.  That 65521 is prime is important to avoid a possible
-    ///    large class of two-byte errors that leave the check unchanged.
-    ///    (The Fletcher checksum uses 255, which is not prime and which also
-    ///    makes the Fletcher check insensitive to single byte changes 0 -
-    ///    255.)
-    ///
-    ///    The sum s1 is initialized to 1 instead of zero to make the length
-    ///    of the sequence part of s2, so that the length does not have to be
-    ///    checked separately. (Any sequence of zeroes has a Fletcher
-    ///    checksum of zero.)"
-    /// </remarks>
-    /// <see cref="ZlibInflateStream"/>
-    /// <see cref="ZlibDeflateStream"/>
-    internal sealed class Adler32 : IChecksum
-    {
-        /// <summary>
-        /// largest prime smaller than 65536
-        /// </summary>
-        private const uint Base = 65521;
-
-        /// <summary>
-        /// The checksum calculated to far.
-        /// </summary>
-        private uint checksum;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Adler32"/> class.
-        /// The checksum starts off with a value of 1.
-        /// </summary>
-        public Adler32()
-        {
-            this.Reset();
-        }
-
-        /// <inheritdoc/>
-        public long Value => this.checksum;
-
-        /// <inheritdoc/>
-        public void Reset()
-        {
-            this.checksum = 1;
-        }
-
-        /// <summary>
-        /// Updates the checksum with a byte value.
-        /// </summary>
-        /// <param name="value">
-        /// The data value to add. The high byte of the int is ignored.
-        /// </param>
-        public void Update(int value)
-        {
-            // We could make a length 1 byte array and call update again, but I
-            // would rather not have that overhead
-            uint s1 = this.checksum & 0xFFFF;
-            uint s2 = this.checksum >> 16;
-
-            s1 = (s1 + ((uint)value & 0xFF)) % Base;
-            s2 = (s1 + s2) % Base;
-
-            this.checksum = (s2 << 16) + s1;
-        }
-
-        /// <inheritdoc/>
-        public void Update(byte[] buffer)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
-
-            this.Update(buffer, 0, buffer.Length);
-        }
-
-        /// <inheritdoc/>
-        public void Update(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
-
-            if (offset < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(offset), "cannot be negative");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count), "cannot be negative");
-            }
-
-            if (offset >= buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(offset), "not a valid index into buffer");
-            }
-
-            if (offset + count > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count), "exceeds buffer size");
-            }
-
-            // (By Per Bothner)
-            uint s1 = this.checksum & 0xFFFF;
-            uint s2 = this.checksum >> 16;
-
-            while (count > 0)
-            {
-                // We can defer the modulo operation:
-                // s1 maximally grows from 65521 to 65521 + 255 * 3800
-                // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-                int n = 3800;
-                if (n > count)
-                {
-                    n = count;
-                }
-
-                count -= n;
-                while (--n >= 0)
-                {
-                    s1 = s1 + (uint)(buffer[offset++] & 0xff);
-                    s2 = s2 + s1;
-                }
-
-                s1 %= Base;
-                s2 %= Base;
-            }
-
-            this.checksum = (s2 << 16) | s1;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Zlib/Crc32.cs b/src/ImageSharp46/Formats/Png/Zlib/Crc32.cs
deleted file mode 100644
index d940112a8..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/Crc32.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// <copyright file="Crc32.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-
-    /// <summary>
-    /// Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
-    /// x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Polynomials over GF(2) are represented in binary, one bit per coefficient,
-    /// with the lowest powers in the most significant bit.  Then adding polynomials
-    /// is just exclusive-or, and multiplying a polynomial by x is a right shift by
-    /// one.  If we call the above polynomial p, and represent a byte as the
-    /// polynomial q, also with the lowest power in the most significant bit (so the
-    /// byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-    /// where a mod b means the remainder after dividing a by b.
-    /// </para>
-    /// <para>
-    /// This calculation is done using the shift-register method of multiplying and
-    /// taking the remainder.  The register is initialized to zero, and for each
-    /// incoming bit, x^32 is added mod p to the register if the bit is a one (where
-    /// x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-    /// x (which is shifting right by one and adding x^32 mod p if the bit shifted
-    /// out is a one).  We start with the highest power (least significant bit) of
-    /// q and repeat for all eight bits of q.
-    /// </para>
-    /// <para>
-    /// The table is simply the CRC of all possible eight bit values.  This is all
-    /// the information needed to generate CRC's on data a byte at a time for all
-    /// combinations of CRC register values and incoming bytes.
-    /// </para>
-    /// </remarks>
-    internal sealed class Crc32 : IChecksum
-    {
-        /// <summary>
-        /// The cycle redundancy check seed
-        /// </summary>
-        private const uint CrcSeed = 0xFFFFFFFF;
-
-        /// <summary>
-        /// The table of all possible eight bit values for fast lookup.
-        /// </summary>
-        private static readonly uint[] CrcTable =
-        {
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419,
-            0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4,
-            0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07,
-            0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856,
-            0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
-            0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
-            0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
-            0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A,
-            0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599,
-            0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190,
-            0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
-            0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E,
-            0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED,
-            0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
-            0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3,
-            0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,
-            0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5,
-            0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010,
-            0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17,
-            0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6,
-            0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
-            0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344,
-            0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
-            0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A,
-            0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1,
-            0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C,
-            0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,
-            0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE,
-            0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31,
-            0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C,
-            0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B,
-            0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
-            0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1,
-            0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
-            0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7,
-            0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66,
-            0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,
-            0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8,
-            0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B,
-            0x2D02EF8D
-        };
-
-        /// <summary>
-        /// The data checksum so far.
-        /// </summary>
-        private uint crc;
-
-        /// <inheritdoc/>
-        public long Value
-        {
-            get
-            {
-                return this.crc;
-            }
-
-            set
-            {
-                this.crc = (uint)value;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Reset()
-        {
-            this.crc = 0;
-        }
-
-        /// <summary>
-        /// Updates the checksum with the given value.
-        /// </summary>
-        /// <param name="value">The byte is taken as the lower 8 bits of value.</param>
-        public void Update(int value)
-        {
-            this.crc ^= CrcSeed;
-            this.crc = CrcTable[(this.crc ^ value) & 0xFF] ^ (this.crc >> 8);
-            this.crc ^= CrcSeed;
-        }
-
-        /// <inheritdoc/>
-        public void Update(byte[] buffer)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
-
-            this.Update(buffer, 0, buffer.Length);
-        }
-
-        /// <inheritdoc/>
-        public void Update(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count), "Count cannot be less than zero");
-            }
-
-            if (offset < 0 || offset + count > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(offset));
-            }
-
-            this.crc ^= CrcSeed;
-
-            while (--count >= 0)
-            {
-                this.crc = CrcTable[(this.crc ^ buffer[offset++]) & 0xFF] ^ (this.crc >> 8);
-            }
-
-            this.crc ^= CrcSeed;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Zlib/IChecksum.cs b/src/ImageSharp46/Formats/Png/Zlib/IChecksum.cs
deleted file mode 100644
index 935cdf953..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/IChecksum.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// <copyright file="IChecksum.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    /// <summary>
-    /// Interface to compute a data checksum used by checked input/output streams.
-    /// A data checksum can be updated by one byte or with a byte array. After each
-    /// update the value of the current checksum can be returned by calling
-    /// <code>Value</code>. The complete checksum object can also be reset
-    /// so it can be used again with new data.
-    /// </summary>
-    public interface IChecksum
-    {
-        /// <summary>
-        /// Gets the data checksum computed so far.
-        /// </summary>
-        long Value
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Resets the data checksum as if no update was ever called.
-        /// </summary>
-        void Reset();
-
-        /// <summary>
-        /// Adds one byte to the data checksum.
-        /// </summary>
-        /// <param name = "value">
-        /// The data value to add. The high byte of the integer is ignored.
-        /// </param>
-        void Update(int value);
-
-        /// <summary>
-        /// Updates the data checksum with the bytes taken from the array.
-        /// </summary>
-        /// <param name="buffer">
-        /// buffer an array of bytes
-        /// </param>
-        void Update(byte[] buffer);
-
-        /// <summary>
-        /// Adds the byte array to the data checksum.
-        /// </summary>
-        /// <param name = "buffer">
-        /// The buffer which contains the data
-        /// </param>
-        /// <param name = "offset">
-        /// The offset in the buffer where the data starts
-        /// </param>
-        /// <param name = "count">
-        /// the number of data bytes to add.
-        /// </param>
-        void Update(byte[] buffer, int offset, int count);
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Zlib/README.md b/src/ImageSharp46/Formats/Png/Zlib/README.md
deleted file mode 100644
index c297a91d5..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Adler32.cs and Crc32.cs have been copied from 
-https://github.com/ygrenier/SharpZipLib.Portable
diff --git a/src/ImageSharp46/Formats/Png/Zlib/ZlibDeflateStream.cs b/src/ImageSharp46/Formats/Png/Zlib/ZlibDeflateStream.cs
deleted file mode 100644
index 2deb7dcf0..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/ZlibDeflateStream.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// <copyright file="ZlibDeflateStream.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-    using System.IO.Compression;
-
-    /// <summary>
-    /// Provides methods and properties for compressing streams by using the Zlib Deflate algorithm.
-    /// </summary>
-    internal sealed class ZlibDeflateStream : Stream
-    {
-        /// <summary>
-        /// The raw stream containing the uncompressed image data.
-        /// </summary>
-        private readonly Stream rawStream;
-
-        /// <summary>
-        /// Computes the checksum for the data stream.
-        /// </summary>
-        private readonly Adler32 adler32 = new Adler32();
-
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second
-        /// time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose()
-        /// method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
-        /// <summary>
-        /// The stream responsible for compressing the input stream.
-        /// </summary>
-        private DeflateStream deflateStream;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ZlibDeflateStream"/> class.
-        /// </summary>
-        /// <param name="stream">The stream to compress.</param>
-        /// <param name="compressionLevel">The compression level.</param>
-        public ZlibDeflateStream(Stream stream, int compressionLevel)
-        {
-            this.rawStream = stream;
-
-            // Write the zlib header : http://tools.ietf.org/html/rfc1950
-            // CMF(Compression Method and flags)
-            // This byte is divided into a 4 - bit compression method and a
-            // 4-bit information field depending on the compression method.
-            // bits 0 to 3  CM Compression method
-            // bits 4 to 7  CINFO Compression info
-            //
-            //   0   1
-            // +---+---+
-            // |CMF|FLG|
-            // +---+---+
-            int cmf = 0x78;
-            int flg = 218;
-
-            // http://stackoverflow.com/a/2331025/277304
-            if (compressionLevel >= 5 && compressionLevel <= 6)
-            {
-                flg = 156;
-            }
-            else if (compressionLevel >= 3 && compressionLevel <= 4)
-            {
-                flg = 94;
-            }
-            else if (compressionLevel <= 2)
-            {
-                flg = 1;
-            }
-
-            // Just in case
-            flg -= ((cmf * 256) + flg) % 31;
-
-            if (flg < 0)
-            {
-                flg += 31;
-            }
-
-            this.rawStream.WriteByte((byte)cmf);
-            this.rawStream.WriteByte((byte)flg);
-
-            // Initialize the deflate Stream.
-            CompressionLevel level = CompressionLevel.Optimal;
-
-            if (compressionLevel >= 1 && compressionLevel <= 5)
-            {
-                level = CompressionLevel.Fastest;
-            }
-            else if (compressionLevel == 0)
-            {
-                level = CompressionLevel.NoCompression;
-            }
-
-            this.deflateStream = new DeflateStream(this.rawStream, level, true);
-        }
-
-        /// <inheritdoc/>
-        public override bool CanRead => false;
-
-        /// <inheritdoc/>
-        public override bool CanSeek => false;
-
-        /// <inheritdoc/>
-        public override bool CanWrite => true;
-
-        /// <inheritdoc/>
-        public override long Length
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override long Position
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-
-            set
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Flush()
-        {
-            this.deflateStream?.Flush();
-        }
-
-        /// <inheritdoc/>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            this.deflateStream.Write(buffer, offset, count);
-            this.adler32.Update(buffer, offset, count);
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                // dispose managed resources
-                if (this.deflateStream != null)
-                {
-                    this.deflateStream.Dispose();
-                    this.deflateStream = null;
-                }
-                else
-                {
-                    // Hack: empty input?
-                    this.rawStream.WriteByte(3);
-                    this.rawStream.WriteByte(0);
-                }
-
-                // Add the crc
-                uint crc = (uint)this.adler32.Value;
-                this.rawStream.WriteByte((byte)((crc >> 24) & 0xFF));
-                this.rawStream.WriteByte((byte)((crc >> 16) & 0xFF));
-                this.rawStream.WriteByte((byte)((crc >> 8) & 0xFF));
-                this.rawStream.WriteByte((byte)(crc & 0xFF));
-            }
-
-            base.Dispose(disposing);
-
-            // Call the appropriate methods to clean up
-            // unmanaged resources here.
-            // Note disposing is done.
-            this.isDisposed = true;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Formats/Png/Zlib/ZlibInflateStream.cs b/src/ImageSharp46/Formats/Png/Zlib/ZlibInflateStream.cs
deleted file mode 100644
index 977a4a167..000000000
--- a/src/ImageSharp46/Formats/Png/Zlib/ZlibInflateStream.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// <copyright file="ZlibInflateStream.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Formats
-{
-    using System;
-    using System.IO;
-    using System.IO.Compression;
-
-    /// <summary>
-    /// Provides methods and properties for decompressing streams by using the Zlib Deflate algorithm.
-    /// </summary>
-    internal sealed class ZlibInflateStream : Stream
-    {
-        /// <summary>
-        /// The raw stream containing the uncompressed image data.
-        /// </summary>
-        private readonly Stream rawStream;
-
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second
-        /// time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose()
-        /// method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
-        /// <summary>
-        /// The read crc data.
-        /// </summary>
-        private byte[] crcread;
-
-        /// <summary>
-        /// The stream responsible for decompressing the input stream.
-        /// </summary>
-        private DeflateStream deflateStream;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ZlibInflateStream"/> class.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <exception cref="Exception">
-        /// Thrown if the compression method is incorrect.
-        /// </exception>
-        public ZlibInflateStream(Stream stream)
-        {
-            // The DICT dictionary identifier identifying the used dictionary.
-
-            // The preset dictionary.
-            bool fdict;
-            this.rawStream = stream;
-
-            // Read the zlib header : http://tools.ietf.org/html/rfc1950
-            // CMF(Compression Method and flags)
-            // This byte is divided into a 4 - bit compression method and a
-            // 4-bit information field depending on the compression method.
-            // bits 0 to 3  CM Compression method
-            // bits 4 to 7  CINFO Compression info
-            //
-            //   0   1
-            // +---+---+
-            // |CMF|FLG|
-            // +---+---+
-            int cmf = this.rawStream.ReadByte();
-            int flag = this.rawStream.ReadByte();
-            if (cmf == -1 || flag == -1)
-            {
-                return;
-            }
-
-            if ((cmf & 0x0f) != 8)
-            {
-                throw new Exception($"Bad compression method for ZLIB header: cmf={cmf}");
-            }
-
-            // CINFO is the base-2 logarithm of the LZ77 window size, minus eight.
-            // int cinfo = ((cmf & (0xf0)) >> 8);
-            fdict = (flag & 32) != 0;
-
-            if (fdict)
-            {
-                // The DICT dictionary identifier identifying the used dictionary.
-                byte[] dictId = new byte[4];
-
-                for (int i = 0; i < 4; i++)
-                {
-                    // We consume but don't use this.
-                    dictId[i] = (byte)this.rawStream.ReadByte();
-                }
-            }
-
-            // Initialize the deflate Stream.
-            this.deflateStream = new DeflateStream(this.rawStream, CompressionMode.Decompress, true);
-        }
-
-        /// <inheritdoc/>
-        public override bool CanRead => true;
-
-        /// <inheritdoc/>
-        public override bool CanSeek => false;
-
-        /// <inheritdoc/>
-        public override bool CanWrite => false;
-
-        /// <inheritdoc/>
-        public override long Length
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override long Position
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-
-            set
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Flush()
-        {
-            this.deflateStream?.Flush();
-        }
-
-        /// <inheritdoc/>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            // We dont't check CRC on reading
-            int read = this.deflateStream.Read(buffer, offset, count);
-            if (read < 1 && this.crcread == null)
-            {
-                // The deflater has ended. We try to read the next 4 bytes from raw stream (crc)
-                this.crcread = new byte[4];
-                for (int i = 0; i < 4; i++)
-                {
-                    // we dont really check/use this
-                    this.crcread[i] = (byte)this.rawStream.ReadByte();
-                }
-            }
-
-            return read;
-        }
-
-        /// <inheritdoc/>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                // dispose managed resources
-                if (this.deflateStream != null)
-                {
-                    this.deflateStream.Dispose();
-                    this.deflateStream = null;
-
-                    if (this.crcread == null)
-                    {
-                        // Consume the trailing 4 bytes
-                        this.crcread = new byte[4];
-                        for (int i = 0; i < 4; i++)
-                        {
-                            this.crcread[i] = (byte)this.rawStream.ReadByte();
-                        }
-                    }
-                }
-            }
-
-            base.Dispose(disposing);
-
-            // Call the appropriate methods to clean up
-            // unmanaged resources here.
-            // Note disposing is done.
-            this.isDisposed = true;
-        }
-    }
-}
diff --git a/src/ImageSharp46/IO/BigEndianBitConverter.cs b/src/ImageSharp46/IO/BigEndianBitConverter.cs
deleted file mode 100644
index 084102728..000000000
--- a/src/ImageSharp46/IO/BigEndianBitConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="BigEndianBitConverter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    /// <summary>
-    /// Implementation of EndianBitConverter which converts to/from big-endian
-    /// byte arrays.
-    /// <remarks>
-    /// Adapted from Miscellaneous Utility Library <see href="http://jonskeet.uk/csharp/miscutil/" />
-    /// This product includes software developed by Jon Skeet and Marc Gravell. Contact <see href="mailto:skeet@pobox.com" />, or see
-    /// <see href="http://www.pobox.com/~skeet/" />.
-    /// </remarks>
-    /// </summary>
-    internal sealed class BigEndianBitConverter : EndianBitConverter
-    {
-        /// <inheritdoc/>
-        public override Endianness Endianness => Endianness.BigEndian;
-
-        /// <inheritdoc/>
-        public override bool IsLittleEndian() => false;
-
-        /// <inheritdoc/>
-        protected internal override void CopyBytesImpl(long value, int bytes, byte[] buffer, int index)
-        {
-            int endOffset = index + bytes - 1;
-            for (int i = 0; i < bytes; i++)
-            {
-                buffer[endOffset - i] = unchecked((byte)(value & 0xff));
-                value = value >> 8;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected internal override long FromBytes(byte[] buffer, int startIndex, int bytesToConvert)
-        {
-            long ret = 0;
-            for (int i = 0; i < bytesToConvert; i++)
-            {
-                ret = unchecked((ret << 8) | buffer[startIndex + i]);
-            }
-
-            return ret;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/IO/EndianBinaryReader.cs b/src/ImageSharp46/IO/EndianBinaryReader.cs
deleted file mode 100644
index 3b12401b6..000000000
--- a/src/ImageSharp46/IO/EndianBinaryReader.cs
+++ /dev/null
@@ -1,615 +0,0 @@
-// <copyright file="EndianBinaryReader.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    /// <summary>
-    /// Equivalent of <see cref="BinaryReader"/>, but with either endianness, depending on
-    /// the EndianBitConverter it is constructed with. No data is buffered in the
-    /// reader; the client may seek within the stream at will.
-    /// </summary>
-    internal class EndianBinaryReader : IDisposable
-    {
-        /// <summary>
-        /// Decoder to use for string conversions.
-        /// </summary>
-        private readonly Decoder decoder;
-
-        /// <summary>
-        /// Buffer used for temporary storage before conversion into primitives
-        /// </summary>
-        private readonly byte[] buffer = new byte[16];
-
-        /// <summary>
-        /// Buffer used for temporary storage when reading a single character
-        /// </summary>
-        private readonly char[] charBuffer = new char[1];
-
-        /// <summary>
-        /// Minimum number of bytes used to encode a character
-        /// </summary>
-        private readonly int minBytesPerChar;
-
-        /// <summary>
-        /// Whether or not this reader has been disposed yet.
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Equivalent of System.IO.BinaryWriter, but with either endianness, depending on
-        /// the EndianBitConverter it is constructed with.
-        /// </summary>
-        /// <param name="bitConverter">Converter to use when reading data</param>
-        /// <param name="stream">Stream to read data from</param>
-        public EndianBinaryReader(EndianBitConverter bitConverter, Stream stream)
-            : this(bitConverter, stream, Encoding.UTF8)
-        {
-        }
-
-        /// <summary>
-        /// Constructs a new binary reader with the given bit converter, reading
-        /// to the given stream, using the given encoding.
-        /// </summary>
-        /// <param name="bitConverter">Converter to use when reading data</param>
-        /// <param name="stream">Stream to read data from</param>
-        /// <param name="encoding">Encoding to use when reading character data</param>
-        public EndianBinaryReader(EndianBitConverter bitConverter, Stream stream, Encoding encoding)
-        {
-            // TODO: Use Guard
-            if (bitConverter == null)
-            {
-                throw new ArgumentNullException("bitConverter");
-            }
-
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream");
-            }
-
-            if (encoding == null)
-            {
-                throw new ArgumentNullException("encoding");
-            }
-
-            if (!stream.CanRead)
-            {
-                throw new ArgumentException("Stream isn't writable", "stream");
-            }
-
-            this.BaseStream = stream;
-            this.BitConverter = bitConverter;
-            this.Encoding = encoding;
-            this.decoder = encoding.GetDecoder();
-            this.minBytesPerChar = 1;
-
-            if (encoding is UnicodeEncoding)
-            {
-                this.minBytesPerChar = 2;
-            }
-        }
-
-        /// <summary>
-        /// Gets the bit converter used to read values from the stream.
-        /// </summary>
-        public EndianBitConverter BitConverter { get; }
-
-        /// <summary>
-        /// Gets the encoding used to read strings
-        /// </summary>
-        public Encoding Encoding { get; }
-
-        /// <summary>
-        /// Gets the underlying stream of the EndianBinaryReader.
-        /// </summary>
-        public Stream BaseStream { get; }
-
-        /// <summary>
-        /// Closes the reader, including the underlying stream.
-        /// </summary>
-        public void Close()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Seeks within the stream.
-        /// </summary>
-        /// <param name="offset">Offset to seek to.</param>
-        /// <param name="origin">Origin of seek operation.</param>
-        public void Seek(int offset, SeekOrigin origin)
-        {
-            this.CheckDisposed();
-            this.BaseStream.Seek(offset, origin);
-        }
-
-        /// <summary>
-        /// Reads a single byte from the stream.
-        /// </summary>
-        /// <returns>The byte read</returns>
-        public byte ReadByte()
-        {
-            this.ReadInternal(this.buffer, 1);
-            return this.buffer[0];
-        }
-
-        /// <summary>
-        /// Reads a single signed byte from the stream.
-        /// </summary>
-        /// <returns>The byte read</returns>
-        public sbyte ReadSByte()
-        {
-            this.ReadInternal(this.buffer, 1);
-            return unchecked((sbyte)this.buffer[0]);
-        }
-
-        /// <summary>
-        /// Reads a boolean from the stream. 1 byte is read.
-        /// </summary>
-        /// <returns>The boolean read</returns>
-        public bool ReadBoolean()
-        {
-            this.ReadInternal(this.buffer, 1);
-            return this.BitConverter.ToBoolean(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 16-bit signed integer from the stream, using the bit converter
-        /// for this reader. 2 bytes are read.
-        /// </summary>
-        /// <returns>The 16-bit integer read</returns>
-        public short ReadInt16()
-        {
-            this.ReadInternal(this.buffer, 2);
-            return this.BitConverter.ToInt16(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 32-bit signed integer from the stream, using the bit converter
-        /// for this reader. 4 bytes are read.
-        /// </summary>
-        /// <returns>The 32-bit integer read</returns>
-        public int ReadInt32()
-        {
-            this.ReadInternal(this.buffer, 4);
-            return this.BitConverter.ToInt32(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 64-bit signed integer from the stream, using the bit converter
-        /// for this reader. 8 bytes are read.
-        /// </summary>
-        /// <returns>The 64-bit integer read</returns>
-        public long ReadInt64()
-        {
-            this.ReadInternal(this.buffer, 8);
-            return this.BitConverter.ToInt64(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 16-bit unsigned integer from the stream, using the bit converter
-        /// for this reader. 2 bytes are read.
-        /// </summary>
-        /// <returns>The 16-bit unsigned integer read</returns>
-        public ushort ReadUInt16()
-        {
-            this.ReadInternal(this.buffer, 2);
-            return this.BitConverter.ToUInt16(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 32-bit unsigned integer from the stream, using the bit converter
-        /// for this reader. 4 bytes are read.
-        /// </summary>
-        /// <returns>The 32-bit unsigned integer read</returns>
-        public uint ReadUInt32()
-        {
-            this.ReadInternal(this.buffer, 4);
-            return this.BitConverter.ToUInt32(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a 64-bit unsigned integer from the stream, using the bit converter
-        /// for this reader. 8 bytes are read.
-        /// </summary>
-        /// <returns>The 64-bit unsigned integer read</returns>
-        public ulong ReadUInt64()
-        {
-            this.ReadInternal(this.buffer, 8);
-            return this.BitConverter.ToUInt64(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a single-precision floating-point value from the stream, using the bit converter
-        /// for this reader. 4 bytes are read.
-        /// </summary>
-        /// <returns>The floating point value read</returns>
-        public float ReadSingle()
-        {
-            this.ReadInternal(this.buffer, 4);
-            return this.BitConverter.ToSingle(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a double-precision floating-point value from the stream, using the bit converter
-        /// for this reader. 8 bytes are read.
-        /// </summary>
-        /// <returns>The floating point value read</returns>
-        public double ReadDouble()
-        {
-            this.ReadInternal(this.buffer, 8);
-            return this.BitConverter.ToDouble(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a decimal value from the stream, using the bit converter
-        /// for this reader. 16 bytes are read.
-        /// </summary>
-        /// <returns>The decimal value read</returns>
-        public decimal ReadDecimal()
-        {
-            this.ReadInternal(this.buffer, 16);
-            return this.BitConverter.ToDecimal(this.buffer, 0);
-        }
-
-        /// <summary>
-        /// Reads a single character from the stream, using the character encoding for
-        /// this reader. If no characters have been fully read by the time the stream ends,
-        /// -1 is returned.
-        /// </summary>
-        /// <returns>The character read, or -1 for end of stream.</returns>
-        public int Read()
-        {
-            int charsRead = this.Read(this.charBuffer, 0, 1);
-            if (charsRead == 0)
-            {
-                return -1;
-            }
-            else
-            {
-                return this.charBuffer[0];
-            }
-        }
-
-        /// <summary>
-        /// Reads the specified number of characters into the given buffer, starting at
-        /// the given index.
-        /// </summary>
-        /// <param name="data">The buffer to copy data into</param>
-        /// <param name="index">The first index to copy data into</param>
-        /// <param name="count">The number of characters to read</param>
-        /// <returns>The number of characters actually read. This will only be less than
-        /// the requested number of characters if the end of the stream is reached.
-        /// </returns>
-        public int Read(char[] data, int index, int count)
-        {
-            this.CheckDisposed();
-
-            // TODO: Use Guard
-            if (this.buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (index < 0)
-            {
-                throw new ArgumentOutOfRangeException("index");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("index");
-            }
-
-            if (count + index > data.Length)
-            {
-                throw new ArgumentException("Not enough space in buffer for specified number of characters starting at specified index");
-            }
-
-            int read = 0;
-            bool firstTime = true;
-
-            // Use the normal buffer if we're only reading a small amount, otherwise
-            // use at most 4K at a time.
-            byte[] byteBuffer = this.buffer;
-
-            if (byteBuffer.Length < count * this.minBytesPerChar)
-            {
-                byteBuffer = new byte[4096];
-            }
-
-            while (read < count)
-            {
-                int amountToRead;
-
-                // First time through we know we haven't previously read any data
-                if (firstTime)
-                {
-                    amountToRead = count * this.minBytesPerChar;
-                    firstTime = false;
-                }
-
-                // After that we can only assume we need to fully read 'chars left -1' characters
-                // and a single byte of the character we may be in the middle of
-                else
-                {
-                    amountToRead = ((count - read - 1) * this.minBytesPerChar) + 1;
-                }
-
-                if (amountToRead > byteBuffer.Length)
-                {
-                    amountToRead = byteBuffer.Length;
-                }
-
-                int bytesRead = this.TryReadInternal(byteBuffer, amountToRead);
-                if (bytesRead == 0)
-                {
-                    return read;
-                }
-
-                int decoded = this.decoder.GetChars(byteBuffer, 0, bytesRead, data, index);
-                read += decoded;
-                index += decoded;
-            }
-
-            return read;
-        }
-
-        /// <summary>
-        /// Reads the specified number of bytes into the given buffer, starting at
-        /// the given index.
-        /// </summary>
-        /// <param name="buffer">The buffer to copy data into</param>
-        /// <param name="index">The first index to copy data into</param>
-        /// <param name="count">The number of bytes to read</param>
-        /// <returns>The number of bytes actually read. This will only be less than
-        /// the requested number of bytes if the end of the stream is reached.
-        /// </returns>
-        public int Read(byte[] buffer, int index, int count)
-        {
-            this.CheckDisposed();
-            if (buffer == null)
-            {
-                throw new ArgumentNullException("buffer");
-            }
-
-            if (index < 0)
-            {
-                throw new ArgumentOutOfRangeException("index");
-            }
-
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("index");
-            }
-
-            if (count + index > buffer.Length)
-            {
-                throw new ArgumentException("Not enough space in buffer for specified number of bytes starting at specified index");
-            }
-
-            int read = 0;
-            while (count > 0)
-            {
-                int block = this.BaseStream.Read(buffer, index, count);
-                if (block == 0)
-                {
-                    return read;
-                }
-
-                index += block;
-                read += block;
-                count -= block;
-            }
-
-            return read;
-        }
-
-        /// <summary>
-        /// Reads the specified number of bytes, returning them in a new byte array.
-        /// If not enough bytes are available before the end of the stream, this
-        /// method will return what is available.
-        /// </summary>
-        /// <param name="count">The number of bytes to read</param>
-        /// <returns>The bytes read</returns>
-        public byte[] ReadBytes(int count)
-        {
-            this.CheckDisposed();
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException("count");
-            }
-
-            byte[] ret = new byte[count];
-            int index = 0;
-            while (index < count)
-            {
-                int read = this.BaseStream.Read(ret, index, count - index);
-
-                // Stream has finished half way through. That's fine, return what we've got.
-                if (read == 0)
-                {
-                    byte[] copy = new byte[index];
-                    Buffer.BlockCopy(ret, 0, copy, 0, index);
-                    return copy;
-                }
-
-                index += read;
-            }
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Reads the specified number of bytes, returning them in a new byte array.
-        /// If not enough bytes are available before the end of the stream, this
-        /// method will throw an IOException.
-        /// </summary>
-        /// <param name="count">The number of bytes to read</param>
-        /// <returns>The bytes read</returns>
-        public byte[] ReadBytesOrThrow(int count)
-        {
-            byte[] ret = new byte[count];
-            this.ReadInternal(ret, count);
-            return ret;
-        }
-
-        /// <summary>
-        /// Reads a 7-bit encoded integer from the stream. This is stored with the least significant
-        /// information first, with 7 bits of information per byte of value, and the top
-        /// bit as a continuation flag. This method is not affected by the endianness
-        /// of the bit converter.
-        /// </summary>
-        /// <returns>The 7-bit encoded integer read from the stream.</returns>
-        public int Read7BitEncodedInt()
-        {
-            this.CheckDisposed();
-
-            int ret = 0;
-            for (int shift = 0; shift < 35; shift += 7)
-            {
-                int b = this.BaseStream.ReadByte();
-                if (b == -1)
-                {
-                    throw new EndOfStreamException();
-                }
-
-                ret = ret | ((b & 0x7f) << shift);
-                if ((b & 0x80) == 0)
-                {
-                    return ret;
-                }
-            }
-
-            // Still haven't seen a byte with the high bit unset? Dodgy data.
-            throw new IOException("Invalid 7-bit encoded integer in stream.");
-        }
-
-        /// <summary>
-        /// Reads a 7-bit encoded integer from the stream. This is stored with the most significant
-        /// information first, with 7 bits of information per byte of value, and the top
-        /// bit as a continuation flag. This method is not affected by the endianness
-        /// of the bit converter.
-        /// </summary>
-        /// <returns>The 7-bit encoded integer read from the stream.</returns>
-        public int ReadBigEndian7BitEncodedInt()
-        {
-            this.CheckDisposed();
-
-            int ret = 0;
-            for (int i = 0; i < 5; i++)
-            {
-                int b = this.BaseStream.ReadByte();
-                if (b == -1)
-                {
-                    throw new EndOfStreamException();
-                }
-
-                ret = (ret << 7) | (b & 0x7f);
-                if ((b & 0x80) == 0)
-                {
-                    return ret;
-                }
-            }
-
-            // Still haven't seen a byte with the high bit unset? Dodgy data.
-            throw new IOException("Invalid 7-bit encoded integer in stream.");
-        }
-
-        /// <summary>
-        /// Reads a length-prefixed string from the stream, using the encoding for this reader.
-        /// A 7-bit encoded integer is first read, which specifies the number of bytes
-        /// to read from the stream. These bytes are then converted into a string with
-        /// the encoding for this reader.
-        /// </summary>
-        /// <returns>The string read from the stream.</returns>
-        public string ReadString()
-        {
-            int bytesToRead = this.Read7BitEncodedInt();
-
-            byte[] data = new byte[bytesToRead];
-            this.ReadInternal(data, bytesToRead);
-            return this.Encoding.GetString(data, 0, data.Length);
-        }
-
-        /// <summary>
-        /// Disposes of the underlying stream.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                this.disposed = true;
-                ((IDisposable)this.BaseStream).Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Checks whether or not the reader has been disposed, throwing an exception if so.
-        /// </summary>
-        private void CheckDisposed()
-        {
-            if (this.disposed)
-            {
-                throw new ObjectDisposedException("EndianBinaryReader");
-            }
-        }
-
-        /// <summary>
-        /// Reads the given number of bytes from the stream, throwing an exception
-        /// if they can't all be read.
-        /// </summary>
-        /// <param name="data">Buffer to read into</param>
-        /// <param name="size">Number of bytes to read</param>
-        private void ReadInternal(byte[] data, int size)
-        {
-            this.CheckDisposed();
-            int index = 0;
-            while (index < size)
-            {
-                int read = this.BaseStream.Read(data, index, size - index);
-                if (read == 0)
-                {
-                    throw new EndOfStreamException(
-                        string.Format(
-                            "End of stream reached with {0} byte{1} left to read.",
-                            size - index,
-                            size - index == 1 ? "s" : string.Empty));
-                }
-
-                index += read;
-            }
-        }
-
-        /// <summary>
-        /// Reads the given number of bytes from the stream if possible, returning
-        /// the number of bytes actually read, which may be less than requested if
-        /// (and only if) the end of the stream is reached.
-        /// </summary>
-        /// <param name="data">Buffer to read into</param>
-        /// <param name="size">Number of bytes to read</param>
-        /// <returns>Number of bytes actually read</returns>
-        private int TryReadInternal(byte[] data, int size)
-        {
-            this.CheckDisposed();
-            int index = 0;
-            while (index < size)
-            {
-                int read = this.BaseStream.Read(data, index, size - index);
-                if (read == 0)
-                {
-                    return index;
-                }
-
-                index += read;
-            }
-
-            return index;
-        }
-    }
-}
diff --git a/src/ImageSharp46/IO/EndianBinaryWriter.cs b/src/ImageSharp46/IO/EndianBinaryWriter.cs
deleted file mode 100644
index b10ae79b4..000000000
--- a/src/ImageSharp46/IO/EndianBinaryWriter.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-// <copyright file="EndianBinaryWriter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    using System;
-    using System.IO;
-    using System.Text;
-
-    /// <summary>
-    /// Equivalent of <see cref="BinaryWriter"/>, but with either endianness, depending on
-    /// the <see cref="EndianBitConverter"/> it is constructed with.
-    /// </summary>
-    internal class EndianBinaryWriter : IDisposable
-    {
-        /// <summary>
-        /// Buffer used for temporary storage during conversion from primitives
-        /// </summary>
-        private readonly byte[] buffer = new byte[16];
-
-        /// <summary>
-        /// Buffer used for Write(char)
-        /// </summary>
-        private readonly char[] charBuffer = new char[1];
-
-        /// <summary>
-        /// Whether or not this writer has been disposed yet.
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EndianBinaryWriter"/> class
-        /// with the given bit converter, writing to the given stream, using UTF-8 encoding.
-        /// </summary>
-        /// <param name="bitConverter">Converter to use when writing data</param>
-        /// <param name="stream">Stream to write data to</param>
-        public EndianBinaryWriter(EndianBitConverter bitConverter, Stream stream)
-            : this(bitConverter, stream, Encoding.UTF8)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EndianBinaryWriter"/> class
-        /// with the given bit converter, writing to the given stream, using the given encoding.
-        /// </summary>
-        /// <param name="bitConverter">Converter to use when writing data</param>
-        /// <param name="stream">Stream to write data to</param>
-        /// <param name="encoding">
-        /// Encoding to use when writing character data
-        /// </param>
-        public EndianBinaryWriter(EndianBitConverter bitConverter, Stream stream, Encoding encoding)
-        {
-            // TODO: Use Guard
-            if (bitConverter == null)
-            {
-                throw new ArgumentNullException("bitConverter");
-            }
-
-            if (stream == null)
-            {
-                throw new ArgumentNullException("stream");
-            }
-
-            if (encoding == null)
-            {
-                throw new ArgumentNullException("encoding");
-            }
-
-            if (!stream.CanWrite)
-            {
-                throw new ArgumentException("Stream isn't writable", "stream");
-            }
-
-            this.BaseStream = stream;
-            this.BitConverter = bitConverter;
-            this.Encoding = encoding;
-        }
-
-        /// <summary>
-        /// Gets the bit converter used to write values to the stream
-        /// </summary>
-        public EndianBitConverter BitConverter { get; }
-
-        /// <summary>
-        /// Gets the encoding used to write strings
-        /// </summary>
-        public Encoding Encoding { get; }
-
-        /// <summary>
-        /// Gets the underlying stream of the EndianBinaryWriter.
-        /// </summary>
-        public Stream BaseStream { get; }
-
-        /// <summary>
-        /// Closes the writer, including the underlying stream.
-        /// </summary>
-        public void Close()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Flushes the underlying stream.
-        /// </summary>
-        public void Flush()
-        {
-            this.CheckDisposed();
-            this.BaseStream.Flush();
-        }
-
-        /// <summary>
-        /// Seeks within the stream.
-        /// </summary>
-        /// <param name="offset">Offset to seek to.</param>
-        /// <param name="origin">Origin of seek operation.</param>
-        public void Seek(int offset, SeekOrigin origin)
-        {
-            this.CheckDisposed();
-            this.BaseStream.Seek(offset, origin);
-        }
-
-        /// <summary>
-        /// Writes a boolean value to the stream. 1 byte is written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(bool value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 1);
-        }
-
-        /// <summary>
-        /// Writes a 16-bit signed integer to the stream, using the bit converter
-        /// for this writer. 2 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(short value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 2);
-        }
-
-        /// <summary>
-        /// Writes a 32-bit signed integer to the stream, using the bit converter
-        /// for this writer. 4 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(int value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 4);
-        }
-
-        /// <summary>
-        /// Writes a 64-bit signed integer to the stream, using the bit converter
-        /// for this writer. 8 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(long value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 8);
-        }
-
-        /// <summary>
-        /// Writes a 16-bit unsigned integer to the stream, using the bit converter
-        /// for this writer. 2 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(ushort value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 2);
-        }
-
-        /// <summary>
-        /// Writes a 32-bit unsigned integer to the stream, using the bit converter
-        /// for this writer. 4 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(uint value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 4);
-        }
-
-        /// <summary>
-        /// Writes a 64-bit unsigned integer to the stream, using the bit converter
-        /// for this writer. 8 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(ulong value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 8);
-        }
-
-        /// <summary>
-        /// Writes a single-precision floating-point value to the stream, using the bit converter
-        /// for this writer. 4 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(float value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 4);
-        }
-
-        /// <summary>
-        /// Writes a double-precision floating-point value to the stream, using the bit converter
-        /// for this writer. 8 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(double value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 8);
-        }
-
-        /// <summary>
-        /// Writes a decimal value to the stream, using the bit converter for this writer.
-        /// 16 bytes are written.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(decimal value)
-        {
-            this.BitConverter.CopyBytes(value, this.buffer, 0);
-            this.WriteInternal(this.buffer, 16);
-        }
-
-        /// <summary>
-        /// Writes a signed byte to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(byte value)
-        {
-            this.buffer[0] = value;
-            this.WriteInternal(this.buffer, 1);
-        }
-
-        /// <summary>
-        /// Writes an unsigned byte to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(sbyte value)
-        {
-            this.buffer[0] = unchecked((byte)value);
-            this.WriteInternal(this.buffer, 1);
-        }
-
-        /// <summary>
-        /// Writes an array of bytes to the stream.
-        /// </summary>
-        /// <param name="value">The values to write</param>
-        public void Write(byte[] value)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            this.WriteInternal(value, value.Length);
-        }
-
-        /// <summary>
-        /// Writes a portion of an array of bytes to the stream.
-        /// </summary>
-        /// <param name="value">An array containing the bytes to write</param>
-        /// <param name="offset">The index of the first byte to write within the array</param>
-        /// <param name="count">The number of bytes to write</param>
-        public void Write(byte[] value, int offset, int count)
-        {
-            this.CheckDisposed();
-            this.BaseStream.Write(value, offset, count);
-        }
-
-        /// <summary>
-        /// Writes a single character to the stream, using the encoding for this writer.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void Write(char value)
-        {
-            this.charBuffer[0] = value;
-            this.Write(this.charBuffer);
-        }
-
-        /// <summary>
-        /// Writes an array of characters to the stream, using the encoding for this writer.
-        /// </summary>
-        /// <param name="value">An array containing the characters to write</param>
-        public void Write(char[] value)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            this.CheckDisposed();
-            byte[] data = this.Encoding.GetBytes(value, 0, value.Length);
-            this.WriteInternal(data, data.Length);
-        }
-
-        /// <summary>
-        /// Writes a string to the stream, using the encoding for this writer.
-        /// </summary>
-        /// <param name="value">The value to write. Must not be null.</param>
-        /// <exception cref="System.ArgumentNullException">value is null</exception>
-        public void Write(string value)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            this.CheckDisposed();
-            byte[] data = this.Encoding.GetBytes(value);
-            this.Write7BitEncodedInt(data.Length);
-            this.WriteInternal(data, data.Length);
-        }
-
-        /// <summary>
-        /// Writes a 7-bit encoded integer from the stream. This is stored with the least significant
-        /// information first, with 7 bits of information per byte of value, and the top
-        /// bit as a continuation flag.
-        /// </summary>
-        /// <param name="value">The 7-bit encoded integer to write to the stream</param>
-        public void Write7BitEncodedInt(int value)
-        {
-            this.CheckDisposed();
-            if (value < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(value), "Value must be greater than or equal to 0.");
-            }
-
-            int index = 0;
-            while (value >= 128)
-            {
-                this.buffer[index++] = (byte)((value & 0x7f) | 0x80);
-                value = value >> 7;
-                index++;
-            }
-
-            this.buffer[index++] = (byte)value;
-            this.BaseStream.Write(this.buffer, 0, index);
-        }
-
-        /// <summary>
-        /// Checks whether or not the writer has been disposed, throwing an exception if so.
-        /// </summary>
-        private void CheckDisposed()
-        {
-            if (this.disposed)
-            {
-                throw new ObjectDisposedException("EndianBinaryWriter");
-            }
-        }
-
-        /// <summary>
-        /// Writes the specified number of bytes from the start of the given byte array,
-        /// after checking whether or not the writer has been disposed.
-        /// </summary>
-        /// <param name="bytes">The array of bytes to write from</param>
-        /// <param name="length">The number of bytes to write</param>
-        private void WriteInternal(byte[] bytes, int length)
-        {
-            this.CheckDisposed();
-            this.BaseStream.Write(bytes, 0, length);
-        }
-
-        /// <summary>
-        /// Disposes of the underlying stream.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                this.Flush();
-                this.disposed = true;
-                ((IDisposable)this.BaseStream).Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/IO/EndianBitConverter.cs b/src/ImageSharp46/IO/EndianBitConverter.cs
deleted file mode 100644
index d7a8d91fa..000000000
--- a/src/ImageSharp46/IO/EndianBitConverter.cs
+++ /dev/null
@@ -1,724 +0,0 @@
-// <copyright file="EndianBitConverter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Equivalent of <see cref="System.BitConverter"/>, but with either endianness.
-    /// <remarks>
-    /// Adapted from Miscellaneous Utility Library <see href="http://jonskeet.uk/csharp/miscutil/"/>
-    /// This product includes software developed by Jon Skeet and Marc Gravell. Contact <see href="mailto:skeet@pobox.com"/>, or see
-    /// <see href="http://www.pobox.com/~skeet/"/>.
-    /// </remarks>
-    /// </summary>
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "Reviewed. Suppression is OK here. Better readability.")]
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:ElementsMustBeOrderedByAccess", Justification = "Reviewed. Suppression is OK here. Better readability.")]
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:StaticElementsMustAppearBeforeInstanceElements", Justification = "Reviewed. Suppression is OK here. Better readability.")]
-    internal abstract class EndianBitConverter
-    {
-        #region Endianness of this converter
-        /// <summary>
-        /// Indicates the byte order ("endianness") in which data is converted using this class.
-        /// </summary>
-        /// <remarks>
-        /// Different computer architectures store data using different byte orders. "Big-endian"
-        /// means the most significant byte is on the left end of a word. "Little-endian" means the
-        /// most significant byte is on the right end of a word.
-        /// </remarks>
-        /// <returns>true if this converter is little-endian, false otherwise.</returns>
-        public abstract bool IsLittleEndian();
-
-        /// <summary>
-        /// Gets the byte order ("endianness") in which data is converted using this class.
-        /// </summary>
-        public abstract Endianness Endianness { get; }
-        #endregion
-
-        #region Factory properties
-        /// <summary>
-        /// The little-endian bit converter.
-        /// </summary>
-        private static readonly LittleEndianBitConverter LittleConverter = new LittleEndianBitConverter();
-
-        /// <summary>
-        /// Gets a little-endian bit converter instance. The same instance is
-        /// always returned.
-        /// </summary>
-        public static LittleEndianBitConverter Little => LittleConverter;
-
-        /// <summary>
-        /// The big-endian bit converter.
-        /// </summary>
-        private static readonly BigEndianBitConverter BigConverter = new BigEndianBitConverter();
-
-        /// <summary>
-        /// Gets a big-endian bit converter instance. The same instance is
-        /// always returned.
-        /// </summary>
-        public static BigEndianBitConverter Big => BigConverter;
-        #endregion
-
-        #region Double/primitive conversions
-        /// <summary>
-        /// Converts the specified double-precision floating point number to a
-        /// 64-bit signed integer. Note: the endianness of this converter does not
-        /// affect the returned value.
-        /// </summary>
-        /// <param name="value">The number to convert. </param>
-        /// <returns>A 64-bit signed integer whose value is equivalent to value.</returns>
-        public long DoubleToInt64Bits(double value)
-        {
-            return BitConverter.DoubleToInt64Bits(value);
-        }
-
-        /// <summary>
-        /// Converts the specified 64-bit signed integer to a double-precision
-        /// floating point number. Note: the endianness of this converter does not
-        /// affect the returned value.
-        /// </summary>
-        /// <param name="value">The number to convert. </param>
-        /// <returns>A double-precision floating point number whose value is equivalent to value.</returns>
-        public double Int64BitsToDouble(long value)
-        {
-            return BitConverter.Int64BitsToDouble(value);
-        }
-
-        /// <summary>
-        /// Converts the specified single-precision floating point number to a
-        /// 32-bit signed integer. Note: the endianness of this converter does not
-        /// affect the returned value.
-        /// </summary>
-        /// <param name="value">The number to convert. </param>
-        /// <returns>A 32-bit signed integer whose value is equivalent to value.</returns>
-        public int SingleToInt32Bits(float value)
-        {
-            return new Int32SingleUnion(value).AsInt32;
-        }
-
-        /// <summary>
-        /// Converts the specified 32-bit signed integer to a single-precision floating point
-        /// number. Note: the endianness of this converter does not
-        /// affect the returned value.
-        /// </summary>
-        /// <param name="value">The number to convert. </param>
-        /// <returns>A single-precision floating point number whose value is equivalent to value.</returns>
-        public float Int32BitsToSingle(int value)
-        {
-            return new Int32SingleUnion(value).AsSingle;
-        }
-        #endregion
-
-        #region To(PrimitiveType) conversions
-        /// <summary>
-        /// Returns a Boolean value converted from one byte at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>true if the byte at startIndex in value is nonzero; otherwise, false.</returns>
-        public bool ToBoolean(byte[] value, int startIndex)
-        {
-            CheckByteArgument(value, startIndex, 1);
-            return BitConverter.ToBoolean(value, startIndex);
-        }
-
-        /// <summary>
-        /// Returns a Unicode character converted from two bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A character formed by two bytes beginning at startIndex.</returns>
-        public char ToChar(byte[] value, int startIndex)
-        {
-            return unchecked((char)this.CheckedFromBytes(value, startIndex, 2));
-        }
-
-        /// <summary>
-        /// Returns a double-precision floating point number converted from eight bytes
-        /// at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A double precision floating point number formed by eight bytes beginning at startIndex.</returns>
-        public double ToDouble(byte[] value, int startIndex)
-        {
-            return this.Int64BitsToDouble(this.ToInt64(value, startIndex));
-        }
-
-        /// <summary>
-        /// Returns a single-precision floating point number converted from four bytes
-        /// at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A single precision floating point number formed by four bytes beginning at startIndex.</returns>
-        public float ToSingle(byte[] value, int startIndex)
-        {
-            return this.Int32BitsToSingle(this.ToInt32(value, startIndex));
-        }
-
-        /// <summary>
-        /// Returns a 16-bit signed integer converted from two bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 16-bit signed integer formed by two bytes beginning at startIndex.</returns>
-        public short ToInt16(byte[] value, int startIndex)
-        {
-            return unchecked((short)this.CheckedFromBytes(value, startIndex, 2));
-        }
-
-        /// <summary>
-        /// Returns a 32-bit signed integer converted from four bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 32-bit signed integer formed by four bytes beginning at startIndex.</returns>
-        public int ToInt32(byte[] value, int startIndex)
-        {
-            return unchecked((int)this.CheckedFromBytes(value, startIndex, 4));
-        }
-
-        /// <summary>
-        /// Returns a 64-bit signed integer converted from eight bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 64-bit signed integer formed by eight bytes beginning at startIndex.</returns>
-        public long ToInt64(byte[] value, int startIndex)
-        {
-            return this.CheckedFromBytes(value, startIndex, 8);
-        }
-
-        /// <summary>
-        /// Returns a 16-bit unsigned integer converted from two bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 16-bit unsigned integer formed by two bytes beginning at startIndex.</returns>
-        public ushort ToUInt16(byte[] value, int startIndex)
-        {
-            return unchecked((ushort)this.CheckedFromBytes(value, startIndex, 2));
-        }
-
-        /// <summary>
-        /// Returns a 32-bit unsigned integer converted from four bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 32-bit unsigned integer formed by four bytes beginning at startIndex.</returns>
-        public uint ToUInt32(byte[] value, int startIndex)
-        {
-            return unchecked((uint)this.CheckedFromBytes(value, startIndex, 4));
-        }
-
-        /// <summary>
-        /// Returns a 64-bit unsigned integer converted from eight bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A 64-bit unsigned integer formed by eight bytes beginning at startIndex.</returns>
-        public ulong ToUInt64(byte[] value, int startIndex)
-        {
-            return unchecked((ulong)this.CheckedFromBytes(value, startIndex, 8));
-        }
-
-        /// <summary>
-        /// Convert the given number of bytes from the given array, from the given start
-        /// position, into a long, using the bytes as the least significant part of the long.
-        /// By the time this is called, the arguments have been checked for validity.
-        /// </summary>
-        /// <param name="value">The bytes to convert</param>
-        /// <param name="startIndex">The index of the first byte to convert</param>
-        /// <param name="bytesToConvert">The number of bytes to use in the conversion</param>
-        /// <returns>The converted number</returns>
-        protected internal abstract long FromBytes(byte[] value, int startIndex, int bytesToConvert);
-
-        /// <summary>
-        /// Checks the given argument for validity.
-        /// </summary>
-        /// <param name="value">The byte array passed in</param>
-        /// <param name="startIndex">The start index passed in</param>
-        /// <param name="bytesRequired">The number of bytes required</param>
-        /// <exception cref="System.ArgumentNullException">value is a null reference</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// startIndex is less than zero or greater than the length of value minus bytesRequired.
-        /// </exception>
-        [SuppressMessage("ReSharper", "UnusedParameter.Local", Justification = "Keeps code DRY")]
-        private static void CheckByteArgument(byte[] value, int startIndex, int bytesRequired)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(nameof(value));
-            }
-
-            if (startIndex < 0 || startIndex > value.Length - bytesRequired)
-            {
-                throw new ArgumentOutOfRangeException(nameof(startIndex));
-            }
-        }
-
-        /// <summary>
-        /// Checks the arguments for validity before calling FromBytes
-        /// (which can therefore assume the arguments are valid).
-        /// </summary>
-        /// <param name="value">The bytes to convert after checking</param>
-        /// <param name="startIndex">The index of the first byte to convert</param>
-        /// <param name="bytesToConvert">The number of bytes to convert</param>
-        /// <returns>The <see cref="long"/></returns>
-        private long CheckedFromBytes(byte[] value, int startIndex, int bytesToConvert)
-        {
-            CheckByteArgument(value, startIndex, bytesToConvert);
-            return this.FromBytes(value, startIndex, bytesToConvert);
-        }
-        #endregion
-
-        #region ToString conversions
-        /// <summary>
-        /// Returns a String converted from the elements of a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <remarks>All the elements of value are converted.</remarks>
-        /// <returns>
-        /// A String of hexadecimal pairs separated by hyphens, where each pair
-        /// represents the corresponding element in value; for example, "7F-2C-4A".
-        /// </returns>
-        public static string ToString(byte[] value)
-        {
-            return BitConverter.ToString(value);
-        }
-
-        /// <summary>
-        /// Returns a String converted from the elements of a byte array starting at a specified array position.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <remarks>The elements from array position startIndex to the end of the array are converted.</remarks>
-        /// <returns>
-        /// A String of hexadecimal pairs separated by hyphens, where each pair
-        /// represents the corresponding element in value; for example, "7F-2C-4A".
-        /// </returns>
-        public static string ToString(byte[] value, int startIndex)
-        {
-            return BitConverter.ToString(value, startIndex);
-        }
-
-        /// <summary>
-        /// Returns a String converted from a specified number of bytes at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <param name="length">The number of bytes to convert.</param>
-        /// <remarks>The length elements from array position startIndex are converted.</remarks>
-        /// <returns>
-        /// A String of hexadecimal pairs separated by hyphens, where each pair
-        /// represents the corresponding element in value; for example, "7F-2C-4A".
-        /// </returns>
-        public static string ToString(byte[] value, int startIndex, int length)
-        {
-            return BitConverter.ToString(value, startIndex, length);
-        }
-        #endregion
-
-        #region Decimal conversions
-        /// <summary>
-        /// Returns a decimal value converted from sixteen bytes
-        /// at a specified position in a byte array.
-        /// </summary>
-        /// <param name="value">An array of bytes.</param>
-        /// <param name="startIndex">The starting position within value.</param>
-        /// <returns>A decimal  formed by sixteen bytes beginning at startIndex.</returns>
-        public decimal ToDecimal(byte[] value, int startIndex)
-        {
-            // HACK: This always assumes four parts, each in their own endianness,
-            // starting with the first part at the start of the byte array.
-            // On the other hand, there's no real format specified...
-            int[] parts = new int[4];
-            for (int i = 0; i < 4; i++)
-            {
-                parts[i] = this.ToInt32(value, startIndex + (i * 4));
-            }
-
-            return new decimal(parts);
-        }
-
-        /// <summary>
-        /// Returns the specified decimal value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 16.</returns>
-        public byte[] GetBytes(decimal value)
-        {
-            byte[] bytes = new byte[16];
-            int[] parts = decimal.GetBits(value);
-            for (int i = 0; i < 4; i++)
-            {
-                this.CopyBytesImpl(parts[i], 4, bytes, i * 4);
-            }
-
-            return bytes;
-        }
-
-        /// <summary>
-        /// Copies the specified decimal value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">A character to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(decimal value, byte[] buffer, int index)
-        {
-            int[] parts = decimal.GetBits(value);
-            for (int i = 0; i < 4; i++)
-            {
-                this.CopyBytesImpl(parts[i], 4, buffer, (i * 4) + index);
-            }
-        }
-        #endregion
-
-        #region GetBytes conversions
-        /// <summary>
-        /// Returns an array with the given number of bytes formed
-        /// from the least significant bytes of the specified value.
-        /// This is used to implement the other GetBytes methods.
-        /// </summary>
-        /// <param name="value">The value to get bytes for</param>
-        /// <param name="bytes">The number of significant bytes to return</param>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>.
-        /// </returns>
-        private byte[] GetBytes(long value, int bytes)
-        {
-            byte[] buffer = new byte[bytes];
-            this.CopyBytes(value, bytes, buffer, 0);
-            return buffer;
-        }
-
-        /// <summary>
-        /// Returns the specified Boolean value as an array of bytes.
-        /// </summary>
-        /// <param name="value">A Boolean value.</param>
-        /// <returns>An array of bytes with length 1.</returns>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>.
-        /// </returns>
-        public byte[] GetBytes(bool value)
-        {
-            return BitConverter.GetBytes(value);
-        }
-
-        /// <summary>
-        /// Returns the specified Unicode character value as an array of bytes.
-        /// </summary>
-        /// <param name="value">A character to convert.</param>
-        /// <returns>An array of bytes with length 2.</returns>
-        /// <returns>
-        /// The <see cref="T:byte[]"/>.
-        /// </returns>
-        public byte[] GetBytes(char value)
-        {
-            return this.GetBytes(value, 2);
-        }
-
-        /// <summary>
-        /// Returns the specified double-precision floating point value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 8.</returns>
-        public byte[] GetBytes(double value)
-        {
-            return this.GetBytes(this.DoubleToInt64Bits(value), 8);
-        }
-
-        /// <summary>
-        /// Returns the specified 16-bit signed integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 2.</returns>
-        public byte[] GetBytes(short value)
-        {
-            return this.GetBytes(value, 2);
-        }
-
-        /// <summary>
-        /// Returns the specified 32-bit signed integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 4.</returns>
-        public byte[] GetBytes(int value)
-        {
-            return this.GetBytes(value, 4);
-        }
-
-        /// <summary>
-        /// Returns the specified 64-bit signed integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 8.</returns>
-        public byte[] GetBytes(long value)
-        {
-            return this.GetBytes(value, 8);
-        }
-
-        /// <summary>
-        /// Returns the specified single-precision floating point value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 4.</returns>
-        public byte[] GetBytes(float value)
-        {
-            return this.GetBytes(this.SingleToInt32Bits(value), 4);
-        }
-
-        /// <summary>
-        /// Returns the specified 16-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 2.</returns>
-        public byte[] GetBytes(ushort value)
-        {
-            return this.GetBytes(value, 2);
-        }
-
-        /// <summary>
-        /// Returns the specified 32-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 4.</returns>
-        public byte[] GetBytes(uint value)
-        {
-            return this.GetBytes(value, 4);
-        }
-
-        /// <summary>
-        /// Returns the specified 64-bit unsigned integer value as an array of bytes.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <returns>An array of bytes with length 8.</returns>
-        public byte[] GetBytes(ulong value)
-        {
-            return this.GetBytes(unchecked((long)value), 8);
-        }
-
-        #endregion
-
-        #region CopyBytes conversions
-        /// <summary>
-        /// Copies the given number of bytes from the least-specific
-        /// end of the specified value into the specified byte array, beginning
-        /// at the specified index.
-        /// This is used to implement the other CopyBytes methods.
-        /// </summary>
-        /// <param name="value">The value to copy bytes for</param>
-        /// <param name="bytes">The number of significant bytes to copy</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        private void CopyBytes(long value, int bytes, byte[] buffer, int index)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer), "Byte array must not be null");
-            }
-
-            if (buffer.Length < index + bytes)
-            {
-                throw new ArgumentOutOfRangeException(nameof(buffer), "Buffer not big enough for value");
-            }
-
-            this.CopyBytesImpl(value, bytes, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the given number of bytes from the least-specific
-        /// end of the specified value into the specified byte array, beginning
-        /// at the specified index.
-        /// This must be implemented in concrete derived classes, but the implementation
-        /// may assume that the value will fit into the buffer.
-        /// </summary>
-        /// <param name="value">The value to copy bytes for</param>
-        /// <param name="bytes">The number of significant bytes to copy</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        protected internal abstract void CopyBytesImpl(long value, int bytes, byte[] buffer, int index);
-
-        /// <summary>
-        /// Copies the specified Boolean value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">A Boolean value.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(bool value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value ? 1 : 0, 1, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified Unicode character value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">A character to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(char value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 2, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified double-precision floating point value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(double value, byte[] buffer, int index)
-        {
-            this.CopyBytes(this.DoubleToInt64Bits(value), 8, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 16-bit signed integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(short value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 2, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 32-bit signed integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(int value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 4, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 64-bit signed integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(long value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 8, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified single-precision floating point value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(float value, byte[] buffer, int index)
-        {
-            this.CopyBytes(this.SingleToInt32Bits(value), 4, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 16-bit unsigned integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(ushort value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 2, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 32-bit unsigned integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(uint value, byte[] buffer, int index)
-        {
-            this.CopyBytes(value, 4, buffer, index);
-        }
-
-        /// <summary>
-        /// Copies the specified 64-bit unsigned integer value into the specified byte array,
-        /// beginning at the specified index.
-        /// </summary>
-        /// <param name="value">The number to convert.</param>
-        /// <param name="buffer">The byte array to copy the bytes into</param>
-        /// <param name="index">The first index into the array to copy the bytes into</param>
-        public void CopyBytes(ulong value, byte[] buffer, int index)
-        {
-            this.CopyBytes(unchecked((long)value), 8, buffer, index);
-        }
-
-        #endregion
-
-        #region Private struct used for Single/Int32 conversions
-        /// <summary>
-        /// Union used solely for the equivalent of DoubleToInt64Bits and vice versa.
-        /// </summary>
-        [StructLayout(LayoutKind.Explicit)]
-        private struct Int32SingleUnion
-        {
-            /// <summary>
-            /// Int32 version of the value.
-            /// </summary>
-            [FieldOffset(0)]
-            private readonly int i;
-
-            /// <summary>
-            /// Single version of the value.
-            /// </summary>
-            [FieldOffset(0)]
-            private readonly float f;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Int32SingleUnion"/> struct.
-            /// </summary>
-            /// <param name="i">The integer value of the new instance.</param>
-            internal Int32SingleUnion(int i)
-            {
-                this.f = 0; // Just to keep the compiler happy
-                this.i = i;
-            }
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Int32SingleUnion"/> struct.
-            /// </summary>
-            /// <param name="f">
-            /// The floating point value of the new instance.
-            /// </param>
-            internal Int32SingleUnion(float f)
-            {
-                this.i = 0; // Just to keep the compiler happy
-                this.f = f;
-            }
-
-            /// <summary>
-            /// Gets the value of the instance as an integer.
-            /// </summary>
-            internal int AsInt32 => this.i;
-
-            /// <summary>
-            /// Gets the value of the instance as a floating point number.
-            /// </summary>
-            internal float AsSingle => this.f;
-        }
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/IO/Endianness.cs b/src/ImageSharp46/IO/Endianness.cs
deleted file mode 100644
index aefda6dc4..000000000
--- a/src/ImageSharp46/IO/Endianness.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="Endianness.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    /// <summary>
-    /// Endianness of a converter
-    /// </summary>
-    internal enum Endianness
-    {
-        /// <summary>
-        /// Little endian - least significant byte first
-        /// </summary>
-        LittleEndian,
-
-        /// <summary>
-        /// Big endian - most significant byte first
-        /// </summary>
-        BigEndian
-    }
-}
diff --git a/src/ImageSharp46/IO/LittleEndianBitConverter.cs b/src/ImageSharp46/IO/LittleEndianBitConverter.cs
deleted file mode 100644
index 63ebe18a3..000000000
--- a/src/ImageSharp46/IO/LittleEndianBitConverter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="LittleEndianBitConverter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.IO
-{
-    /// <summary>
-    /// Implementation of EndianBitConverter which converts to/from little-endian
-    /// byte arrays.
-    /// <remarks>
-    /// Adapted from Miscellaneous Utility Library <see href="http://jonskeet.uk/csharp/miscutil/"/>
-    /// This product includes software developed by Jon Skeet and Marc Gravell. Contact <see href="mailto:skeet@pobox.com"/>, or see
-    /// <see href="http://www.pobox.com/~skeet/"/>.
-    /// </remarks>
-    /// </summary>
-    internal sealed class LittleEndianBitConverter : EndianBitConverter
-    {
-        /// <inheritdoc/>
-        public override Endianness Endianness => Endianness.LittleEndian;
-
-        /// <inheritdoc/>
-        public override bool IsLittleEndian() => true;
-
-        /// <inheritdoc/>
-        protected internal override void CopyBytesImpl(long value, int bytes, byte[] buffer, int index)
-        {
-            for (int i = 0; i < bytes; i++)
-            {
-                buffer[i + index] = unchecked((byte)(value & 0xff));
-                value = value >> 8;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected internal override long FromBytes(byte[] buffer, int startIndex, int bytesToConvert)
-        {
-            long ret = 0;
-            for (int i = 0; i < bytesToConvert; i++)
-            {
-                ret = unchecked((ret << 8) | buffer[startIndex + bytesToConvert - 1 - i]);
-            }
-
-            return ret;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Image.cs b/src/ImageSharp46/Image.cs
deleted file mode 100644
index 83a4b9dff..000000000
--- a/src/ImageSharp46/Image.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// <copyright file="Image.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.Diagnostics;
-    using System.IO;
-
-    /// <summary>
-    /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
-    /// packed into a single unsigned integer value.
-    /// </summary>
-    [DebuggerDisplay("Image: {Width}x{Height}")]
-    public class Image : Image<Color, uint>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image"/> class
-        /// with the height and the width of the image.
-        /// </summary>
-        public Image()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image"/> class
-        /// with the height and the width of the image.
-        /// </summary>
-        /// <param name="width">The width of the image in pixels.</param>
-        /// <param name="height">The height of the image in pixels.</param>
-        public Image(int width, int height)
-          : base(width, height)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image"/> class.
-        /// </summary>
-        /// <param name="stream">
-        /// The stream containing image information.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="stream"/> is null.</exception>
-        public Image(Stream stream)
-            : base(stream)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image"/> class
-        /// by making a copy from another image.
-        /// </summary>
-        /// <param name="other">The other image, where the clone should be made from.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public Image(Image other)
-            : base(other)
-        {
-        }
-
-        /// <inheritdoc />
-        public override PixelAccessor<Color, uint> Lock()
-        {
-            return new PixelAccessor(this);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/IImageBase.cs b/src/ImageSharp46/Image/IImageBase.cs
deleted file mode 100644
index 3168b4bb5..000000000
--- a/src/ImageSharp46/Image/IImageBase.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// <copyright file="IImageBase.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Encapsulates the basic properties and methods required to manipulate images in varying formats.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IImageBase<TColor, TPacked> : IImageBase
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Gets the pixels as an array of the given packed pixel format.
-        /// </summary>
-        TColor[] Pixels { get; }
-
-        /// <summary>
-        /// Sets the size of the pixel array of the image to the given width and height.
-        /// </summary>
-        /// <param name="width">The new width of the image. Must be greater than zero.</param>
-        /// <param name="height">The new height of the image. Must be greater than zero.</param>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// Thrown if either <paramref name="width"/> or <paramref name="height"/> are less than or equal to 0.
-        /// </exception>
-        void InitPixels(int width, int height);
-
-        /// <summary>
-        /// Sets the pixel array of the image to the given value.
-        /// </summary>
-        /// <param name="width">The new width of the image. Must be greater than zero.</param>
-        /// <param name="height">The new height of the image. Must be greater than zero.</param>
-        /// <param name="pixels">The array with pixels. Must be a multiple of the width and height.</param>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// Thrown if either <paramref name="width"/> or <paramref name="height"/> are less than or equal to 0.
-        /// </exception>
-        /// <exception cref="System.ArgumentException">
-        /// Thrown if the <paramref name="pixels"/> length is not equal to Width * Height.
-        /// </exception>
-        void SetPixels(int width, int height, TColor[] pixels);
-
-        /// <summary>
-        /// Sets the pixel array of the image to the given value, creating a copy of
-        /// the original pixels.
-        /// </summary>
-        /// <param name="width">The new width of the image. Must be greater than zero.</param>
-        /// <param name="height">The new height of the image. Must be greater than zero.</param>
-        /// <param name="pixels">The array with pixels. Must be a multiple of four times the width and height.</param>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// Thrown if either <paramref name="width"/> or <paramref name="height"/> are less than or equal to 0.
-        /// </exception>
-        /// <exception cref="System.ArgumentException">
-        /// Thrown if the <paramref name="pixels"/> length is not equal to Width * Height.
-        /// </exception>
-        void ClonePixels(int width, int height, TColor[] pixels);
-
-        /// <summary>
-        /// Locks the image providing access to the pixels.
-        /// <remarks>
-        /// It is imperative that the accessor is correctly disposed off after use.
-        /// </remarks>
-        /// </summary>
-        /// <returns>The <see cref="PixelAccessor{TColor,TPacked}"/></returns>
-        PixelAccessor<TColor, TPacked> Lock();
-    }
-
-    /// <summary>
-    /// Encapsulates the basic properties and methods required to manipulate images.
-    /// </summary>
-    public interface IImageBase
-    {
-        /// <summary>
-        /// Gets the <see cref="Rectangle"/> representing the bounds of the image.
-        /// </summary>
-        Rectangle Bounds { get; }
-
-        /// <summary>
-        /// Gets or sets the quality of the image. This affects the output quality of lossy image formats.
-        /// </summary>
-        int Quality { get; set; }
-
-        /// <summary>
-        /// Gets or sets the frame delay for animated images.
-        /// If not 0, this field specifies the number of hundredths (1/100) of a second to
-        /// wait before continuing with the processing of the Data Stream.
-        /// The clock starts ticking immediately after the graphic is rendered.
-        /// </summary>
-        int FrameDelay { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum allowable width in pixels.
-        /// </summary>
-        int MaxWidth { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum allowable height in pixels.
-        /// </summary>
-        int MaxHeight { get; set; }
-
-        /// <summary>
-        /// Gets the width in pixels.
-        /// </summary>
-        int Width { get; }
-
-        /// <summary>
-        /// Gets the height in pixels.
-        /// </summary>
-        int Height { get; }
-
-        /// <summary>
-        /// Gets the pixel ratio made up of the width and height.
-        /// </summary>
-        double PixelRatio { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Image/IImageFrame.cs b/src/ImageSharp46/Image/IImageFrame.cs
deleted file mode 100644
index f6f856b22..000000000
--- a/src/ImageSharp46/Image/IImageFrame.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// <copyright file="IImageFrame.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Represents a single frame in a animation.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IImageFrame<TColor, TPacked> : IImageBase<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-    }
-}
diff --git a/src/ImageSharp46/Image/IImageProcessor.cs b/src/ImageSharp46/Image/IImageProcessor.cs
deleted file mode 100644
index 145e83136..000000000
--- a/src/ImageSharp46/Image/IImageProcessor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <copyright file="IImageProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Encapsulates methods to alter the pixels of an image.
-    /// </summary>
-    public interface IImageProcessor
-    {
-        /// <summary>
-        /// Gets or sets the parallel options for processing tasks in parallel.
-        /// </summary>
-        ParallelOptions ParallelOptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to compress
-        /// or expand individual pixel colors the value on processing.
-        /// </summary>
-        bool Compand { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Image/Image.cs b/src/ImageSharp46/Image/Image.cs
deleted file mode 100644
index 337f38fcf..000000000
--- a/src/ImageSharp46/Image/Image.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-// <copyright file="Image.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-
-    using Formats;
-
-    /// <summary>
-    /// Encapsulates an image, which consists of the pixel data for a graphics image and its attributes.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [DebuggerDisplay("Image: {Width}x{Height}")]
-    public class Image<TColor, TPacked> : ImageBase<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The default horizontal resolution value (dots per inch) in x direction.
-        /// <remarks>The default value is 96 dots per inch.</remarks>
-        /// </summary>
-        public const double DefaultHorizontalResolution = 96;
-
-        /// <summary>
-        /// The default vertical resolution value (dots per inch) in y direction.
-        /// <remarks>The default value is 96 dots per inch.</remarks>
-        /// </summary>
-        public const double DefaultVerticalResolution = 96;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor, TPacked}"/> class.
-        /// </summary>
-        public Image()
-        {
-            this.CurrentImageFormat = Bootstrapper.Instance.ImageFormats.First(f => f.GetType() == typeof(PngFormat));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor, TPacked}"/> class
-        /// with the height and the width of the image.
-        /// </summary>
-        /// <param name="width">The width of the image in pixels.</param>
-        /// <param name="height">The height of the image in pixels.</param>
-        public Image(int width, int height)
-            : base(width, height)
-        {
-            this.CurrentImageFormat = Bootstrapper.Instance.ImageFormats.First(f => f.GetType() == typeof(PngFormat));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="stream">
-        /// The stream containing image information.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="stream"/> is null.</exception>
-        public Image(Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-            this.Load(stream);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor, TPacked}"/> class
-        /// by making a copy from another image.
-        /// </summary>
-        /// <param name="other">The other image, where the clone should be made from.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public Image(Image<TColor, TPacked> other)
-            : base(other)
-        {
-            foreach (ImageFrame<TColor, TPacked> frame in other.Frames)
-            {
-                if (frame != null)
-                {
-                    this.Frames.Add(new ImageFrame<TColor, TPacked>(frame));
-                }
-            }
-
-            this.CopyProperties(other);
-        }
-
-        /// <summary>
-        /// Gets a list of supported image formats.
-        /// </summary>
-        public IReadOnlyCollection<IImageFormat> Formats { get; } = Bootstrapper.Instance.ImageFormats;
-
-        /// <summary>
-        /// Gets or sets the resolution of the image in x- direction. It is defined as
-        ///  number of dots per inch and should be an positive value.
-        /// </summary>
-        /// <value>The density of the image in x- direction.</value>
-        public double HorizontalResolution { get; set; } = DefaultHorizontalResolution;
-
-        /// <summary>
-        /// Gets or sets the resolution of the image in y- direction. It is defined as
-        /// number of dots per inch and should be an positive value.
-        /// </summary>
-        /// <value>The density of the image in y- direction.</value>
-        public double VerticalResolution { get; set; } = DefaultVerticalResolution;
-
-        /// <summary>
-        /// Gets the width of the image in inches. It is calculated as the width of the image
-        /// in pixels multiplied with the density. When the density is equals or less than zero
-        /// the default value is used.
-        /// </summary>
-        /// <value>The width of the image in inches.</value>
-        public double InchWidth
-        {
-            get
-            {
-                double resolution = this.HorizontalResolution;
-
-                if (resolution <= 0)
-                {
-                    resolution = DefaultHorizontalResolution;
-                }
-
-                return this.Width / resolution;
-            }
-        }
-
-        /// <summary>
-        /// Gets the height of the image in inches. It is calculated as the height of the image
-        /// in pixels multiplied with the density. When the density is equals or less than zero
-        /// the default value is used.
-        /// </summary>
-        /// <value>The height of the image in inches.</value>
-        public double InchHeight
-        {
-            get
-            {
-                double resolution = this.VerticalResolution;
-
-                if (resolution <= 0)
-                {
-                    resolution = DefaultVerticalResolution;
-                }
-
-                return this.Height / resolution;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this image is animated.
-        /// </summary>
-        /// <value>
-        /// <c>True</c> if this image is animated; otherwise, <c>false</c>.
-        /// </value>
-        public bool IsAnimated => this.Frames.Count > 0;
-
-        /// <summary>
-        /// Gets or sets the number of times any animation is repeated.
-        /// <remarks>0 means to repeat indefinitely.</remarks>
-        /// </summary>
-        public ushort RepeatCount { get; set; }
-
-        /// <summary>
-        /// Gets the other frames for the animation.
-        /// </summary>
-        /// <value>The list of frame images.</value>
-        public IList<ImageFrame<TColor, TPacked>> Frames { get; } = new List<ImageFrame<TColor, TPacked>>();
-
-        /// <summary>
-        /// Gets the list of properties for storing meta information about this image.
-        /// </summary>
-        /// <value>A list of image properties.</value>
-        public IList<ImageProperty> Properties { get; } = new List<ImageProperty>();
-
-        /// <summary>
-        /// Gets the currently loaded image format.
-        /// </summary>
-        public IImageFormat CurrentImageFormat { get; internal set; }
-
-        /// <summary>
-        /// Gets or sets the Exif profile.
-        /// </summary>
-        public ExifProfile ExifProfile { get; set; }
-
-        /// <summary>
-        /// Saves the image to the given stream using the currently loaded image format.
-        /// </summary>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        public Image<TColor, TPacked> Save(Stream stream)
-        {
-            Guard.NotNull(stream, nameof(stream));
-            this.CurrentImageFormat.Encoder.Encode(this, stream);
-            return this;
-        }
-
-        /// <summary>
-        /// Saves the image to the given stream using the given image format.
-        /// </summary>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <param name="format">The format to save the image as.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        public Image<TColor, TPacked> Save(Stream stream, IImageFormat format)
-        {
-            Guard.NotNull(stream, nameof(stream));
-            format.Encoder.Encode(this, stream);
-            return this;
-        }
-
-        /// <summary>
-        /// Saves the image to the given stream using the given image encoder.
-        /// </summary>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <param name="encoder">The encoder to save the image with.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>
-        /// The <see cref="Image{TColor,TPacked}"/>.
-        /// </returns>
-        public Image<TColor, TPacked> Save(Stream stream, IImageEncoder encoder)
-        {
-            Guard.NotNull(stream, nameof(stream));
-            encoder.Encode(this, stream);
-
-            // Reset to the start of the stream.
-            if (stream.CanSeek)
-            {
-                stream.Position = 0;
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"Image: {this.Width}x{this.Height}";
-        }
-
-        /// <summary>
-        /// Returns a Base64 encoded string from the given image.
-        /// </summary>
-        /// <example>data:image/gif;base64,R0lGODlhAQABAIABAEdJRgAAACwAAAAAAQABAAACAkQBAA==</example>
-        /// <returns>The <see cref="string"/></returns>
-        public string ToBase64String()
-        {
-            using (MemoryStream stream = new MemoryStream())
-            {
-                this.Save(stream);
-                stream.Flush();
-                return $"data:{this.CurrentImageFormat.Encoder.MimeType};base64,{Convert.ToBase64String(stream.ToArray())}";
-            }
-        }
-
-        /// <summary>
-        /// Copies the properties from the other <see cref="Image{TColor, TPacked}"/>.
-        /// </summary>
-        /// <param name="other">
-        /// The other <see cref="Image{TColor, TPacked}"/> to copy the properties from.
-        /// </param>
-        internal void CopyProperties(Image<TColor, TPacked> other)
-        {
-            base.CopyProperties(other);
-
-            this.HorizontalResolution = other.HorizontalResolution;
-            this.VerticalResolution = other.VerticalResolution;
-            this.CurrentImageFormat = other.CurrentImageFormat;
-            this.RepeatCount = other.RepeatCount;
-
-            if (other.ExifProfile != null)
-            {
-                this.ExifProfile = new ExifProfile(other.ExifProfile);
-            }
-        }
-
-        /// <summary>
-        /// Loads the image from the given stream.
-        /// </summary>
-        /// <param name="stream">The stream containing image information.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown if the stream is not readable nor seekable.
-        /// </exception>
-        private void Load(Stream stream)
-        {
-            if (!this.Formats.Any())
-            {
-                return;
-            }
-
-            if (!stream.CanRead)
-            {
-                throw new NotSupportedException("Cannot read from the stream.");
-            }
-
-            if (stream.CanSeek)
-            {
-                if (this.Decode(stream))
-                {
-                    return;
-                }
-            }
-            else
-            {
-                // We want to be able to load images from things like HttpContext.Request.Body
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    stream.CopyTo(ms);
-                    ms.Position = 0;
-
-                    if (this.Decode(ms))
-                    {
-                        return;
-                    }
-                }
-            }
-
-            StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.AppendLine("Image cannot be loaded. Available formats:");
-
-            foreach (IImageFormat format in this.Formats)
-            {
-                stringBuilder.AppendLine("-" + format);
-            }
-
-            throw new NotSupportedException(stringBuilder.ToString());
-        }
-
-        /// <summary>
-        /// Decodes the image stream to the current image.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <returns>
-        /// The <see cref="bool"/>.
-        /// </returns>
-        private bool Decode(Stream stream)
-        {
-            int maxHeaderSize = this.Formats.Max(x => x.Decoder.HeaderSize);
-            if (maxHeaderSize > 0)
-            {
-                byte[] header = new byte[maxHeaderSize];
-
-                stream.Position = 0;
-                stream.Read(header, 0, maxHeaderSize);
-                stream.Position = 0;
-
-                IImageFormat format = this.Formats.FirstOrDefault(x => x.Decoder.IsSupportedFileFormat(header));
-                if (format != null)
-                {
-                    format.Decoder.Decode(this, stream);
-                    this.CurrentImageFormat = format;
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/ImageBase.cs b/src/ImageSharp46/Image/ImageBase.cs
deleted file mode 100644
index 7e9ca2701..000000000
--- a/src/ImageSharp46/Image/ImageBase.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// <copyright file="ImageBase.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Diagnostics;
-
-    /// <summary>
-    /// The base class of all images. Encapsulates the basic properties and methods required to manipulate
-    /// images in different pixel formats.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [DebuggerDisplay("Image: {Width}x{Height}")]
-    public abstract class ImageBase<TColor, TPacked> : IImageBase<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The image pixels
-        /// </summary>
-        private TColor[] pixelBuffer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor, TPacked}"/> class.
-        /// </summary>
-        protected ImageBase()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="width">The width of the image in pixels.</param>
-        /// <param name="height">The height of the image in pixels.</param>
-        /// <exception cref="System.ArgumentOutOfRangeException">
-        /// Thrown if either <paramref name="width"/> or <paramref name="height"/> are less than or equal to 0.
-        /// </exception>
-        protected ImageBase(int width, int height)
-        {
-            this.InitPixels(width, height);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="other">
-        /// The other <see cref="ImageBase{TColor, TPacked}"/> to create this instance from.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown if the given <see cref="ImageBase{TColor, TPacked}"/> is null.
-        /// </exception>
-        protected ImageBase(ImageBase<TColor, TPacked> other)
-        {
-            Guard.NotNull(other, nameof(other), "Other image cannot be null.");
-
-            this.Width = other.Width;
-            this.Height = other.Height;
-            this.CopyProperties(other);
-
-            // Copy the pixels. Unsafe.CopyBlock gives us a nice speed boost here.
-            this.pixelBuffer = new TColor[this.Width * this.Height];
-            using (PixelAccessor<TColor, TPacked> sourcePixels = other.Lock())
-            using (PixelAccessor<TColor, TPacked> target = this.Lock())
-            {
-                sourcePixels.CopyImage(target);
-            }
-        }
-
-        /// <inheritdoc/>
-        public int MaxWidth { get; set; } = int.MaxValue;
-
-        /// <inheritdoc/>
-        public int MaxHeight { get; set; } = int.MaxValue;
-
-        /// <inheritdoc/>
-        public TColor[] Pixels => this.pixelBuffer;
-
-        /// <inheritdoc/>
-        public int Width { get; private set; }
-
-        /// <inheritdoc/>
-        public int Height { get; private set; }
-
-        /// <inheritdoc/>
-        public double PixelRatio => (double)this.Width / this.Height;
-
-        /// <inheritdoc/>
-        public Rectangle Bounds => new Rectangle(0, 0, this.Width, this.Height);
-
-        /// <inheritdoc/>
-        public int Quality { get; set; }
-
-        /// <inheritdoc/>
-        public int FrameDelay { get; set; }
-
-        /// <inheritdoc/>
-        public void InitPixels(int width, int height)
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-
-            this.Width = width;
-            this.Height = height;
-            this.pixelBuffer = new TColor[width * height];
-        }
-
-        /// <inheritdoc/>
-        public void SetPixels(int width, int height, TColor[] pixels)
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-            Guard.NotNull(pixels, nameof(pixels));
-
-            if (pixels.Length != width * height)
-            {
-                throw new ArgumentException("Pixel array must have the length of Width * Height.");
-            }
-
-            this.Width = width;
-            this.Height = height;
-            this.pixelBuffer = pixels;
-        }
-
-        /// <inheritdoc/>
-        public void ClonePixels(int width, int height, TColor[] pixels)
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-            Guard.NotNull(pixels, nameof(pixels));
-
-            if (pixels.Length != width * height)
-            {
-                throw new ArgumentException("Pixel array must have the length of Width * Height.");
-            }
-
-            this.Width = width;
-            this.Height = height;
-
-            // Copy the pixels. TODO: use Unsafe.Copy.
-            this.pixelBuffer = new TColor[pixels.Length];
-            Array.Copy(pixels, this.pixelBuffer, pixels.Length);
-        }
-
-        /// <inheritdoc/>
-        public virtual PixelAccessor<TColor, TPacked> Lock()
-        {
-            return new PixelAccessor<TColor, TPacked>(this);
-        }
-
-        /// <summary>
-        /// Copies the properties from the other <see cref="ImageBase{TColor, TPacked}"/>.
-        /// </summary>
-        /// <param name="other">
-        /// The other <see cref="ImageBase{TColor, TPacked}"/> to copy the properties from.
-        /// </param>
-        protected void CopyProperties(ImageBase<TColor, TPacked> other)
-        {
-            this.Quality = other.Quality;
-            this.FrameDelay = other.FrameDelay;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/ImageFrame.cs b/src/ImageSharp46/Image/ImageFrame.cs
deleted file mode 100644
index fa576c4eb..000000000
--- a/src/ImageSharp46/Image/ImageFrame.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <copyright file="ImageFrame.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Represents a single frame in a animation.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class ImageFrame<TColor, TPacked> : ImageBase<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFrame{TColor, TPacked}"/> class.
-        /// </summary>
-        public ImageFrame()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFrame{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="frame">
-        /// The frame to create the frame from.
-        /// </param>
-        public ImageFrame(ImageFrame<TColor, TPacked> frame)
-            : base(frame)
-        {
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"ImageFrame: {this.Width}x{this.Height}";
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/ImageIOExtensions.cs b/src/ImageSharp46/Image/ImageIOExtensions.cs
deleted file mode 100644
index bb0369d8a..000000000
--- a/src/ImageSharp46/Image/ImageIOExtensions.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// <copyright file="ImageIOExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.IO;
-
-    using Formats;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Saves the image to the given stream with the bmp format.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>
-        /// The <see cref="Image{TColor,TPacked}"/>.
-        /// </returns>
-        public static Image<TColor, TPacked> SaveAsBmp<TColor, TPacked>(this Image<TColor, TPacked> source, Stream stream)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-            => source.Save(stream, new BmpEncoder());
-
-        /// <summary>
-        /// Saves the image to the given stream with the png format.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <param name="quality">The quality to save the image to representing the number of colors.
-        /// Anything equal to 256 and below will cause the encoder to save the image in an indexed format.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>
-        /// The <see cref="Image{TColor,TPacked}"/>.
-        /// </returns>
-        public static Image<TColor, TPacked> SaveAsPng<TColor, TPacked>(this Image<TColor, TPacked> source, Stream stream, int quality = int.MaxValue)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-            => source.Save(stream, new PngEncoder { Quality = quality });
-
-        /// <summary>
-        /// Saves the image to the given stream with the jpeg format.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <param name="quality">The quality to save the image to. Between 1 and 100.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>
-        /// The <see cref="Image{TColor,TPacked}"/>.
-        /// </returns>
-        public static Image<TColor, TPacked> SaveAsJpeg<TColor, TPacked>(this Image<TColor, TPacked> source, Stream stream, int quality = 75)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-            => source.Save(stream, new JpegEncoder { Quality = quality });
-
-        /// <summary>
-        /// Saves the image to the given stream with the gif format.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="stream">The stream to save the image to.</param>
-        /// <param name="quality">The quality to save the image to representing the number of colors. Between 1 and 256.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>
-        /// The <see cref="Image{TColor,TPacked}"/>.
-        /// </returns>
-        public static Image<TColor, TPacked> SaveAsGif<TColor, TPacked>(this Image<TColor, TPacked> source, Stream stream, int quality = 256)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-            => source.Save(stream, new GifEncoder { Quality = quality });
-    }
-}
diff --git a/src/ImageSharp46/Image/ImageProcessingExtensions.cs b/src/ImageSharp46/Image/ImageProcessingExtensions.cs
deleted file mode 100644
index e4b9ff3fd..000000000
--- a/src/ImageSharp46/Image/ImageProcessingExtensions.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-// <copyright file="ImageProcessingExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>This method does not resize the target image.</remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="processor">The processor to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, IImageFilter<TColor, TPacked> processor)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Process(source, source.Bounds, processor);
-        }
-
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>This method does not resize the target image.</remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="processor">The processors to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle sourceRectangle, IImageFilter<TColor, TPacked> processor)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return PerformAction(source, (sourceImage) => processor.Apply(sourceImage, sourceRectangle));
-        }
-
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>This method does not resize the target image.</remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="processor">The processor to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, IImageSampler<TColor, TPacked> processor)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Process(source, source.Bounds, processor);
-        }
-
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>This method does not resize the target image.</remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="processor">The processors to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle sourceRectangle, IImageSampler<TColor, TPacked> processor)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return PerformAction(source, true, (sourceImage, targetImage) => processor.Apply(targetImage, sourceImage, sourceRectangle));
-        }
-
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>
-        /// This method resizes the image.
-        /// </remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sampler">The processor to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, IImageSampler<TColor, TPacked> sampler)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Process(source, width, height, source.Bounds, default(Rectangle), sampler);
-        }
-
-        /// <summary>
-        /// Applies the processor to the image.
-        /// <remarks>
-        /// This method does will resize the target image if the source and target rectangles are different.
-        /// </remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the location and size of the drawn image.
-        /// The image is scaled to fit the rectangle.
-        /// </param>
-        /// <param name="sampler">The processor to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        internal static Image<TColor, TPacked> Process<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, Rectangle sourceRectangle, Rectangle targetRectangle, IImageSampler<TColor, TPacked> sampler)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return PerformAction(source, false, (sourceImage, targetImage) => sampler.Apply(targetImage, sourceImage, width, height, targetRectangle, sourceRectangle));
-        }
-
-        /// <summary>
-        /// Performs the given action on the source image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The image to perform the action against.</param>
-        /// <param name="action">The <see cref="Action"/> to perform against the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        private static Image<TColor, TPacked> PerformAction<TColor, TPacked>(Image<TColor, TPacked> source, Action<ImageBase<TColor, TPacked>> action)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            action(source);
-
-            foreach (ImageFrame<TColor, TPacked> sourceFrame in source.Frames)
-            {
-                action(sourceFrame);
-            }
-
-            return source;
-        }
-
-        /// <summary>
-        /// Performs the given action on the source image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The image to perform the action against.</param>
-        /// <param name="clone">Whether to clone the image.</param>
-        /// <param name="action">The <see cref="Action"/> to perform against the image.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        private static Image<TColor, TPacked> PerformAction<TColor, TPacked>(Image<TColor, TPacked> source, bool clone, Action<ImageBase<TColor, TPacked>, ImageBase<TColor, TPacked>> action)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Image<TColor, TPacked> transformedImage = clone
-                ? new Image<TColor, TPacked>(source)
-                : new Image<TColor, TPacked>();
-
-            // Several properties still require copying
-            if (!clone)
-            {
-                transformedImage.CopyProperties(source);
-            }
-
-            action(source, transformedImage);
-
-            for (int i = 0; i < source.Frames.Count; i++)
-            {
-                ImageFrame<TColor, TPacked> sourceFrame = source.Frames[i];
-                ImageFrame<TColor, TPacked> tranformedFrame = clone
-                    ? new ImageFrame<TColor, TPacked>(sourceFrame)
-                    : new ImageFrame<TColor, TPacked> { FrameDelay = sourceFrame.FrameDelay };
-
-                action(sourceFrame, tranformedFrame);
-
-                if (!clone)
-                {
-                    transformedImage.Frames.Add(tranformedFrame);
-                }
-                else
-                {
-                    transformedImage.Frames[i] = tranformedFrame;
-                }
-            }
-
-            source = transformedImage;
-            return source;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/ImageProperty.cs b/src/ImageSharp46/Image/ImageProperty.cs
deleted file mode 100644
index 7fda749e9..000000000
--- a/src/ImageSharp46/Image/ImageProperty.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// <copyright file="ImageProperty.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// Stores meta information about a image, like the name of the author,
-    /// the copyright information, the date, where the image was created
-    /// or some other information.
-    /// </summary>
-    public class ImageProperty : IEquatable<ImageProperty>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageProperty"/> class.
-        /// </summary>
-        /// <param name="name">The name of the property.</param>
-        /// <param name="value">The value of the property.</param>
-        public ImageProperty(string name, string value)
-        {
-            Guard.NotNullOrEmpty(name, nameof(name));
-
-            this.Name = name;
-            this.Value = value;
-        }
-
-        /// <summary>
-        /// Gets the name of this <see cref="ImageProperty"/> indicating which kind of
-        /// information this property stores.
-        /// </summary>
-        /// <example>
-        /// Typical properties are the author, copyright
-        /// information or other meta information.
-        /// </example>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the value of this <see cref="ImageProperty"/>.
-        /// </summary>
-        public string Value { get; }
-
-        /// <summary>
-        /// Compares two <see cref="ImageProperty"/> objects. The result specifies whether the values
-        /// of the <see cref="ImageProperty.Name"/> or <see cref="ImageProperty.Value"/> properties of the two
-        /// <see cref="ImageProperty"/> objects are equal.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="ImageProperty"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="ImageProperty"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(ImageProperty left, ImageProperty right)
-        {
-            return Equals(left, right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="ImageProperty"/> objects. The result specifies whether the values
-        /// of the <see cref="ImageProperty.Name"/> or <see cref="ImageProperty.Value"/> properties of the two
-        /// <see cref="ImageProperty"/> objects are unequal.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="ImageProperty"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="ImageProperty"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(ImageProperty left, ImageProperty right)
-        {
-            return !Equals(left, right);
-        }
-
-        /// <summary>
-        /// Indicates whether this instance and a specified object are equal.
-        /// </summary>
-        /// <param name="obj">
-        /// The object to compare with the current instance.
-        /// </param>
-        /// <returns>
-        /// true if <paramref name="obj"/> and this instance are the same type and represent the
-        /// same value; otherwise, false.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            ImageProperty other = obj as ImageProperty;
-
-            return this.Equals(other);
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = this.Name.GetHashCode();
-                if (this.Value != null)
-                {
-                    hashCode = (hashCode * 397) ^ this.Value.GetHashCode();
-                }
-
-                return hashCode;
-            }
-        }
-
-        /// <summary>
-        /// Returns the fully qualified type name of this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="T:System.String"/> containing a fully qualified type name.
-        /// </returns>
-        public override string ToString()
-        {
-            return $"ImageProperty [ Name={this.Name}, Value={this.Value} ]";
-        }
-
-        /// <summary>
-        /// Indicates whether the current object is equal to another object of the same type.
-        /// </summary>
-        /// <returns>
-        /// True if the current object is equal to the <paramref name="other"/> parameter; otherwise, false.
-        /// </returns>
-        /// <param name="other">An object to compare with this object.</param>
-        public bool Equals(ImageProperty other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            return this.Name.Equals(other.Name) && Equals(this.Value, other.Value);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Image/PixelAccessor.cs b/src/ImageSharp46/Image/PixelAccessor.cs
deleted file mode 100644
index fec50b972..000000000
--- a/src/ImageSharp46/Image/PixelAccessor.cs
+++ /dev/null
@@ -1,398 +0,0 @@
-// <copyright file="PixelAccessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Provides per-pixel access to generic <see cref="Image{TColor,TPacked}"/> pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public unsafe class PixelAccessor<TColor, TPacked> : IDisposable
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The pointer to the pixel buffer.
-        /// </summary>
-        private IntPtr dataPointer;
-
-        /// <summary>
-        /// The position of the first pixel in the image.
-        /// </summary>
-        private byte* pixelsBase;
-
-        /// <summary>
-        /// Provides a way to access the pixels from unmanaged memory.
-        /// </summary>
-        private GCHandle pixelsHandle;
-
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose() method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="image">The image to provide pixel access for.</param>
-        public PixelAccessor(ImageBase<TColor, TPacked> image)
-        {
-            Guard.NotNull(image, nameof(image));
-            Guard.MustBeGreaterThan(image.Width, 0, "image width");
-            Guard.MustBeGreaterThan(image.Height, 0, "image height");
-
-            this.Width = image.Width;
-            this.Height = image.Height;
-            this.pixelsHandle = GCHandle.Alloc(image.Pixels, GCHandleType.Pinned);
-            this.dataPointer = this.pixelsHandle.AddrOfPinnedObject();
-            this.pixelsBase = (byte*)this.dataPointer.ToPointer();
-            this.PixelSize = Unsafe.SizeOf<TPacked>();
-            this.RowStride = this.Width * this.PixelSize;
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="PixelAccessor{TColor,TPacked}"/> class.
-        /// </summary>
-        ~PixelAccessor()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Gets the pointer to the pixel buffer.
-        /// </summary>
-        public IntPtr DataPointer => this.dataPointer;
-
-        /// <summary>
-        /// Gets the size of a single pixel in the number of bytes.
-        /// </summary>
-        public int PixelSize { get; }
-
-        /// <summary>
-        /// Gets the width of one row in the number of bytes.
-        /// </summary>
-        public int RowStride { get; }
-
-        /// <summary>
-        /// Gets the width of the image.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Gets the height of the image.
-        /// </summary>
-        public int Height { get; }
-
-        /// <summary>
-        /// Gets or sets the pixel at the specified position.
-        /// </summary>
-        /// <param name="x">The x-coordinate of the pixel. Must be greater than zero and smaller than the width of the pixel.</param>
-        /// <param name="y">The y-coordinate of the pixel. Must be greater than zero and smaller than the width of the pixel.</param>
-        /// <returns>The <see typeparam="TColor"/> at the specified position.</returns>
-        public TColor this[int x, int y]
-        {
-            get { return Unsafe.Read<TColor>(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>())); }
-            set { Unsafe.Write(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()), value); }
-        }
-
-        /// <summary>
-        /// Copies a block of pixels at the specified position.
-        /// </summary>
-        /// <param name="sourceX">The x-coordinate of the source image.</param>
-        /// <param name="sourceY">The y-coordinate of the source image.</param>
-        /// <param name="target">The target pixel buffer accessor.</param>
-        /// <param name="targetX">The x-coordinate of the target image.</param>
-        /// <param name="targetY">The y-coordinate of the target image.</param>
-        /// <param name="pixelCount">The number of pixels to copy</param>
-        public void CopyBlock(int sourceX, int sourceY, PixelAccessor<TColor, TPacked> target, int targetX, int targetY, int pixelCount)
-        {
-            int size = Unsafe.SizeOf<TColor>();
-            byte* sourcePtr = this.pixelsBase + (((sourceY * this.Width) + sourceX) * size);
-            byte* targetPtr = target.pixelsBase + (((targetY * target.Width) + targetX) * size);
-            uint byteCount = (uint)(pixelCount * size);
-
-            Unsafe.CopyBlock(targetPtr, sourcePtr, byteCount);
-        }
-
-        /// <summary>
-        /// Copies an entire image.
-        /// </summary>
-        /// <param name="target">The target pixel buffer accessor.</param>
-        public void CopyImage(PixelAccessor<TColor, TPacked> target)
-        {
-            this.CopyBlock(0, 0, target, 0, 0, target.Width * target.Height);
-        }
-
-        /// <summary>
-        /// Copied a row of pixels from the image.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        public void CopyFrom(PixelRow<TColor, TPacked> row, int targetY)
-        {
-            switch (row.ComponentOrder)
-            {
-                case ComponentOrder.ZYX:
-                    this.CopyFromZYX(row, targetY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.ZYXW:
-                    this.CopyFromZYXW(row, targetY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.XYZ:
-                    this.CopyFromXYZ(row, targetY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.XYZW:
-                    this.CopyFromXYZW(row, targetY, Math.Min(row.Width, this.Width));
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Copied a row of pixels to the image.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="sourceY">The source row index.</param>
-        /// <exception cref="NotSupportedException">
-        /// Thrown when an unsupported component order value is passed.
-        /// </exception>
-        public void CopyTo(PixelRow<TColor, TPacked> row, int sourceY)
-        {
-            switch (row.ComponentOrder)
-            {
-                case ComponentOrder.ZYX:
-                    this.CopyToZYX(row, sourceY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.ZYXW:
-                    this.CopyToZYXW(row, sourceY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.XYZ:
-                    this.CopyToXYZ(row, sourceY, Math.Min(row.Width, this.Width));
-                    break;
-                case ComponentOrder.XYZW:
-                    this.CopyToXYZW(row, sourceY, Math.Min(row.Width, this.Width));
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-
-            if (this.pixelsHandle.IsAllocated)
-            {
-                this.pixelsHandle.Free();
-            }
-
-            this.dataPointer = IntPtr.Zero;
-            this.pixelsBase = null;
-
-            // Note disposing is done.
-            this.isDisposed = true;
-
-            // This object will be cleaned up by the Dispose method.
-            // Therefore, you should call GC.SuppressFinalize to
-            // take this object off the finalization queue
-            // and prevent finalization code for this object
-            // from executing a second time.
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Copies from a row in <see cref="ComponentOrder.ZYX"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyFromZYX(PixelRow<TColor, TPacked> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            TColor packed = default(TColor);
-            int size = Unsafe.SizeOf<TColor>();
-
-            for (int x = 0; x < width; x++)
-            {
-                packed.PackFromBytes(*(source + 2), *(source + 1), *source, 255);
-                Unsafe.Write(destination, packed);
-
-                source += 3;
-                destination += size;
-            }
-        }
-
-        /// <summary>
-        /// Copies from a row in <see cref="ComponentOrder.ZYXW"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyFromZYXW(PixelRow<TColor, TPacked> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            TColor packed = default(TColor);
-            int size = Unsafe.SizeOf<TColor>();
-
-            for (int x = 0; x < width; x++)
-            {
-                packed.PackFromBytes(*(source + 2), *(source + 1), *source, *(source + 3));
-                Unsafe.Write(destination, packed);
-
-                source += 4;
-                destination += size;
-            }
-        }
-
-        /// <summary>
-        /// Copies from a row in <see cref="ComponentOrder.XYZ"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyFromXYZ(PixelRow<TColor, TPacked> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            TColor packed = default(TColor);
-            int size = Unsafe.SizeOf<TColor>();
-
-            for (int x = 0; x < width; x++)
-            {
-                packed.PackFromBytes(*source, *(source + 1), *(source + 2), 255);
-                Unsafe.Write(destination, packed);
-
-                source += 3;
-                destination += size;
-            }
-        }
-
-        /// <summary>
-        /// Copies from a row in <see cref="ComponentOrder.XYZW"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="targetY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyFromXYZW(PixelRow<TColor, TPacked> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            TColor packed = default(TColor);
-            int size = Unsafe.SizeOf<TColor>();
-
-            for (int x = 0; x < width; x++)
-            {
-                packed.PackFromBytes(*source, *(source + 1), *(source + 2), *(source + 3));
-                Unsafe.Write(destination, packed);
-
-                source += 4;
-                destination += size;
-            }
-        }
-
-        /// <summary>
-        /// Copies to a row in <see cref="ComponentOrder.ZYX"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="sourceY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyToZYX(PixelRow<TColor, TPacked> row, int sourceY, int width)
-        {
-            int offset = 0;
-            for (int x = 0; x < width; x++)
-            {
-                this[x, sourceY].ToBytes(row.Bytes, offset, ComponentOrder.ZYX);
-                offset += 3;
-            }
-        }
-
-        /// <summary>
-        /// Copies to a row in <see cref="ComponentOrder.ZYXW"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="sourceY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyToZYXW(PixelRow<TColor, TPacked> row, int sourceY, int width)
-        {
-            int offset = 0;
-            for (int x = 0; x < width; x++)
-            {
-                this[x, sourceY].ToBytes(row.Bytes, offset, ComponentOrder.ZYXW);
-                offset += 4;
-            }
-        }
-
-        /// <summary>
-        /// Copies to a row in <see cref="ComponentOrder.XYZ"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="sourceY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyToXYZ(PixelRow<TColor, TPacked> row, int sourceY, int width)
-        {
-            int offset = 0;
-            for (int x = 0; x < width; x++)
-            {
-                this[x, sourceY].ToBytes(row.Bytes, offset, ComponentOrder.XYZ);
-                offset += 3;
-            }
-        }
-
-        /// <summary>
-        /// Copies to a row in <see cref="ComponentOrder.XYZW"/> format.
-        /// </summary>
-        /// <param name="row">The row.</param>
-        /// <param name="sourceY">The target row index.</param>
-        /// <param name="width">The width.</param>
-        protected virtual void CopyToXYZW(PixelRow<TColor, TPacked> row, int sourceY, int width)
-        {
-            int offset = 0;
-            for (int x = 0; x < width; x++)
-            {
-                this[x, sourceY].ToBytes(row.Bytes, offset, ComponentOrder.XYZW);
-                offset += 4;
-            }
-        }
-
-        /// <summary>
-        /// Gets the pointer at the specified row.
-        /// </summary>
-        /// <param name="targetY">The target row index.</param>
-        /// <returns>
-        /// The <see cref="T:byte*"/>.
-        /// </returns>
-        protected byte* GetRowPointer(int targetY)
-        {
-            return this.pixelsBase + ((targetY * this.Width) * Unsafe.SizeOf<TColor>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Image/PixelRow.cs b/src/ImageSharp46/Image/PixelRow.cs
deleted file mode 100644
index 4682aaaac..000000000
--- a/src/ImageSharp46/Image/PixelRow.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// <copyright file="PixelRow.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.IO;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Represents a row of generic <see cref="Image{TColor,TPacked}"/> pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public sealed unsafe class PixelRow<TColor, TPacked> : IDisposable
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Provides a way to access the pixels from unmanaged memory.
-        /// </summary>
-        private readonly GCHandle pixelsHandle;
-
-        /// <summary>
-        /// The pointer to the pixel buffer.
-        /// </summary>
-        private IntPtr dataPointer;
-
-        /// <summary>
-        /// A value indicating whether this instance of the given entity has been disposed.
-        /// </summary>
-        /// <value><see langword="true"/> if this instance has been disposed; otherwise, <see langword="false"/>.</value>
-        /// <remarks>
-        /// If the entity is disposed, it must not be disposed a second time. The isDisposed field is set the first time the entity
-        /// is disposed. If the isDisposed field is true, then the Dispose() method will not dispose again. This help not to prolong the entity's
-        /// life in the Garbage Collector.
-        /// </remarks>
-        private bool isDisposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRow{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="width">The width. </param>
-        /// <param name="componentOrder">The component order.</param>
-        public PixelRow(int width, ComponentOrder componentOrder)
-          : this(width, componentOrder, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelRow{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="width">The width. </param>
-        /// <param name="componentOrder">The component order.</param>
-        /// <param name="padding">The number of bytes to pad each row.</param>
-        public PixelRow(int width, ComponentOrder componentOrder, int padding)
-        {
-            this.Width = width;
-            this.ComponentOrder = componentOrder;
-            this.Bytes = new byte[(width * GetComponentCount(componentOrder)) + padding];
-            this.pixelsHandle = GCHandle.Alloc(this.Bytes, GCHandleType.Pinned);
-
-            // TODO: Why is Resharper warning us about an impure method call?
-            this.dataPointer = this.pixelsHandle.AddrOfPinnedObject();
-            this.PixelBase = (byte*)this.dataPointer.ToPointer();
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="PixelRow{TColor,TPacked}"/> class.
-        /// </summary>
-        ~PixelRow()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Gets the data in bytes.
-        /// </summary>
-        public byte[] Bytes { get; }
-
-        /// <summary>
-        /// Gets the pointer to the pixel buffer.
-        /// </summary>
-        public IntPtr DataPointer => this.dataPointer;
-
-        /// <summary>
-        /// Gets the data pointer.
-        /// </summary>
-        public byte* PixelBase { get; private set; }
-
-        /// <summary>
-        /// Gets the component order.
-        /// </summary>
-        public ComponentOrder ComponentOrder { get; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Reads the stream to the row.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Read(Stream stream)
-        {
-            stream.Read(this.Bytes, 0, this.Bytes.Length);
-        }
-
-        /// <summary>
-        /// Writes the row to the stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        public void Write(Stream stream)
-        {
-            stream.Write(this.Bytes, 0, this.Bytes.Length);
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-
-            if (this.PixelBase == null)
-            {
-                return;
-            }
-
-            if (this.pixelsHandle.IsAllocated)
-            {
-                this.pixelsHandle.Free();
-            }
-
-            this.dataPointer = IntPtr.Zero;
-            this.PixelBase = null;
-
-            this.isDisposed = true;
-
-            // This object will be cleaned up by the Dispose method.
-            // Therefore, you should call GC.SuppressFinalize to
-            // take this object off the finalization queue
-            // and prevent finalization code for this object
-            // from executing a second time.
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Gets component count for the given order.
-        /// </summary>
-        /// <param name="componentOrder">The component order.</param>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
-        /// <exception cref="NotSupportedException">
-        /// Thrown if an invalid order is given.
-        /// </exception>
-        private static int GetComponentCount(ComponentOrder componentOrder)
-        {
-            switch (componentOrder)
-            {
-                case ComponentOrder.ZYX:
-                case ComponentOrder.XYZ:
-                    return 3;
-                case ComponentOrder.ZYXW:
-                case ComponentOrder.XYZW:
-                    return 4;
-            }
-
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/src/ImageSharp46/ImageProcessor.cs b/src/ImageSharp46/ImageProcessor.cs
deleted file mode 100644
index 17395218d..000000000
--- a/src/ImageSharp46/ImageProcessor.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// <copyright file="ImageProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Allows the application of processors to images.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class ImageProcessor<TColor, TPacked> : IImageProcessor
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public virtual ParallelOptions ParallelOptions { get; set; } = Bootstrapper.Instance.ParallelOptions;
-
-        /// <inheritdoc/>
-        public virtual bool Compand { get; set; } = false;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/ImageSharp46.csproj b/src/ImageSharp46/ImageSharp46.csproj
deleted file mode 100644
index fdb1b7293..000000000
--- a/src/ImageSharp46/ImageSharp46.csproj
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FBA0B5F6-09C2-4317-8EF6-6ADB9B20E6B1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ImageSharp</RootNamespace>
-    <AssemblyName>ImageSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Buffers, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.0.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Globalization.Calendars, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.1.1\lib\net46\System.Numerics.Vectors.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.0.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Bootstrapper.cs" />
-    <Compile Include="Colors\Color.cs" />
-    <Compile Include="Colors\ColorConstants.cs" />
-    <Compile Include="Colors\ColorDefinitions.cs" />
-    <Compile Include="Colors\Colorspaces\Bgra32.cs" />
-    <Compile Include="Colors\Colorspaces\CieLab.cs" />
-    <Compile Include="Colors\Colorspaces\CieXyz.cs" />
-    <Compile Include="Colors\Colorspaces\Cmyk.cs" />
-    <Compile Include="Colors\Colorspaces\Hsl.cs" />
-    <Compile Include="Colors\Colorspaces\Hsv.cs" />
-    <Compile Include="Colors\Colorspaces\IAlmostEquatable.cs" />
-    <Compile Include="Colors\Colorspaces\YCbCr.cs" />
-    <Compile Include="Colors\ColorspaceTransforms.cs" />
-    <Compile Include="Colors\ColorTransforms.cs" />
-    <Compile Include="Colors\ComponentOrder.cs" />
-    <Compile Include="Colors\PackedPixel\IPackedBytes.cs" />
-    <Compile Include="Colors\PackedPixel\IPackedPixel.cs" />
-    <Compile Include="Colors\PackedPixel\IPackedVector.cs" />
-    <Compile Include="Colors\RgbaComponent.cs" />
-    <Compile Include="Common\Exceptions\ImageFormatException.cs" />
-    <Compile Include="Common\Exceptions\ImageProcessingException.cs" />
-    <Compile Include="Common\Extensions\ByteExtensions.cs" />
-    <Compile Include="Common\Extensions\ComparableExtensions.cs" />
-    <Compile Include="Common\Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Common\Extensions\StreamExtensions.cs" />
-    <Compile Include="Common\Extensions\Vector4Extensions.cs" />
-    <Compile Include="Common\Helpers\Guard.cs" />
-    <Compile Include="Common\Helpers\ImageMaths.cs" />
-    <Compile Include="Filters\Alpha.cs" />
-    <Compile Include="Filters\BackgroundColor.cs" />
-    <Compile Include="Filters\BinaryThreshold.cs" />
-    <Compile Include="Filters\BlackWhite.cs" />
-    <Compile Include="Filters\Blend.cs" />
-    <Compile Include="Filters\Brightness.cs" />
-    <Compile Include="Filters\ColorBlindness.cs" />
-    <Compile Include="Filters\Contrast.cs" />
-    <Compile Include="Filters\Glow.cs" />
-    <Compile Include="Filters\Grayscale.cs" />
-    <Compile Include="Filters\Hue.cs" />
-    <Compile Include="Filters\Invert.cs" />
-    <Compile Include="Filters\Kodachrome.cs" />
-    <Compile Include="Filters\Lomograph.cs" />
-    <Compile Include="Filters\Options\ColorBlindness.cs" />
-    <Compile Include="Filters\Options\EdgeDetection.cs" />
-    <Compile Include="Filters\Options\GrayscaleMode.cs" />
-    <Compile Include="Filters\Polaroid.cs" />
-    <Compile Include="Filters\Processors\AlphaProcessor.cs" />
-    <Compile Include="Filters\Processors\BackgroundColorProcessor.cs" />
-    <Compile Include="Filters\Processors\Binarization\BinaryThresholdProcessor.cs" />
-    <Compile Include="Filters\Processors\BlendProcessor.cs" />
-    <Compile Include="Filters\Processors\BrightnessProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\BlackWhiteProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\AchromatomalyProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\AchromatopsiaProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\DeuteranomalyProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\DeuteranopiaProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\ProtanomalyProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\ProtanopiaProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\TritanomalyProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorBlindness\TritanopiaProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\ColorMatrixFilter.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\GrayscaleBt601Processor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\GrayscaleBt709Processor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\HueProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\IColorMatrixFilter.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\KodachromeProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\LomographProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\PolaroidProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\SaturationProcessor.cs" />
-    <Compile Include="Filters\Processors\ColorMatrix\SepiaProcessor.cs" />
-    <Compile Include="Filters\Processors\ContrastProcessor.cs" />
-    <Compile Include="Filters\Processors\GlowProcessor.cs" />
-    <Compile Include="Filters\Processors\IImageFilter.cs" />
-    <Compile Include="Filters\Processors\ImageFilter.cs" />
-    <Compile Include="Filters\Processors\InvertProcessor.cs" />
-    <Compile Include="Filters\Processors\VignetteProcessor.cs" />
-    <Compile Include="Filters\Saturation.cs" />
-    <Compile Include="Filters\Sepia.cs" />
-    <Compile Include="Filters\Vignette.cs" />
-    <Compile Include="Formats\Bmp\BmpBitsPerPixel.cs" />
-    <Compile Include="Formats\Bmp\BmpCompression.cs" />
-    <Compile Include="Formats\Bmp\BmpDecoder.cs" />
-    <Compile Include="Formats\Bmp\BmpDecoderCore.cs" />
-    <Compile Include="Formats\Bmp\BmpEncoder.cs" />
-    <Compile Include="Formats\Bmp\BmpEncoderCore.cs" />
-    <Compile Include="Formats\Bmp\BmpFileHeader.cs" />
-    <Compile Include="Formats\Bmp\BmpFormat.cs" />
-    <Compile Include="Formats\Bmp\BmpInfoHeader.cs" />
-    <Compile Include="Formats\Gif\DisposalMethod.cs" />
-    <Compile Include="Formats\Gif\GifConstants.cs" />
-    <Compile Include="Formats\Gif\GifDecoder.cs" />
-    <Compile Include="Formats\Gif\GifDecoderCore.cs" />
-    <Compile Include="Formats\Gif\GifEncoder.cs" />
-    <Compile Include="Formats\Gif\GifEncoderCore.cs" />
-    <Compile Include="Formats\Gif\GifFormat.cs" />
-    <Compile Include="Formats\Gif\LzwDecoder.cs" />
-    <Compile Include="Formats\Gif\LzwEncoder.cs" />
-    <Compile Include="Formats\Gif\PackedField.cs" />
-    <Compile Include="Formats\Gif\Sections\GifGraphicsControlExtension.cs" />
-    <Compile Include="Formats\Gif\Sections\GifImageDescriptor.cs" />
-    <Compile Include="Formats\Gif\Sections\GifLogicalScreenDescriptor.cs" />
-    <Compile Include="Formats\IImageDecoder.cs" />
-    <Compile Include="Formats\IImageEncoder.cs" />
-    <Compile Include="Formats\IImageFormat.cs" />
-    <Compile Include="Formats\Jpg\Components\Bits.cs" />
-    <Compile Include="Formats\Jpg\Components\Block.cs" />
-    <Compile Include="Formats\Jpg\Components\Bytes.cs" />
-    <Compile Include="Formats\Jpg\Components\Component.cs" />
-    <Compile Include="Formats\Jpg\Components\FDCT.cs" />
-    <Compile Include="Formats\Jpg\Components\FloatIDCT.cs" />
-    <Compile Include="Formats\Jpg\Components\GrayImage.cs" />
-    <Compile Include="Formats\Jpg\Components\Huffman.cs" />
-    <Compile Include="Formats\Jpg\Components\IDCT.cs" />
-    <Compile Include="Formats\Jpg\Components\MagicDCT.cs" />
-    <Compile Include="Formats\Jpg\Components\YCbCrImage.cs" />
-    <Compile Include="Formats\Jpg\JpegConstants.cs" />
-    <Compile Include="Formats\Jpg\JpegDecoder.cs" />
-    <Compile Include="Formats\Jpg\JpegDecoderCore.cs" />
-    <Compile Include="Formats\Jpg\JpegEncoder.cs" />
-    <Compile Include="Formats\Jpg\JpegEncoderCore.cs" />
-    <Compile Include="Formats\Jpg\JpegFormat.cs" />
-    <Compile Include="Formats\Jpg\JpegSubsample.cs" />
-    <Compile Include="Formats\Png\Filters\AverageFilter.cs" />
-    <Compile Include="Formats\Png\Filters\FilterType.cs" />
-    <Compile Include="Formats\Png\Filters\NoneFilter.cs" />
-    <Compile Include="Formats\Png\Filters\PaethFilter.cs" />
-    <Compile Include="Formats\Png\Filters\SubFilter.cs" />
-    <Compile Include="Formats\Png\Filters\UpFilter.cs" />
-    <Compile Include="Formats\Png\PngChunk.cs" />
-    <Compile Include="Formats\Png\PngChunkTypes.cs" />
-    <Compile Include="Formats\Png\PngColorType.cs" />
-    <Compile Include="Formats\Png\PngDecoder.cs" />
-    <Compile Include="Formats\Png\PngDecoderCore.cs" />
-    <Compile Include="Formats\Png\PngEncoder.cs" />
-    <Compile Include="Formats\Png\PngEncoderCore.cs" />
-    <Compile Include="Formats\Png\PngFormat.cs" />
-    <Compile Include="Formats\Png\PngHeader.cs" />
-    <Compile Include="Formats\Png\Zlib\Adler32.cs" />
-    <Compile Include="Formats\Png\Zlib\Crc32.cs" />
-    <Compile Include="Formats\Png\Zlib\IChecksum.cs" />
-    <Compile Include="Formats\Png\Zlib\ZlibDeflateStream.cs" />
-    <Compile Include="Formats\Png\Zlib\ZlibInflateStream.cs" />
-    <Compile Include="Image.cs" />
-    <Compile Include="ImageProcessor.cs" />
-    <Compile Include="Image\IImageBase.cs" />
-    <Compile Include="Image\IImageFrame.cs" />
-    <Compile Include="Image\IImageProcessor.cs" />
-    <Compile Include="Image\Image.cs" />
-    <Compile Include="Image\ImageBase.cs" />
-    <Compile Include="Image\ImageFrame.cs" />
-    <Compile Include="Image\ImageIOExtensions.cs" />
-    <Compile Include="Image\ImageProcessingExtensions.cs" />
-    <Compile Include="Image\ImageProperty.cs" />
-    <Compile Include="Image\PixelAccessor.cs" />
-    <Compile Include="Image\PixelRow.cs" />
-    <Compile Include="IO\BigEndianBitConverter.cs" />
-    <Compile Include="IO\EndianBinaryReader.cs" />
-    <Compile Include="IO\EndianBinaryWriter.cs" />
-    <Compile Include="IO\EndianBitConverter.cs" />
-    <Compile Include="IO\Endianness.cs" />
-    <Compile Include="IO\LittleEndianBitConverter.cs" />
-    <Compile Include="Numerics\Ellipse.cs" />
-    <Compile Include="Numerics\LongRational.cs" />
-    <Compile Include="Numerics\Point.cs" />
-    <Compile Include="Numerics\Rational.cs" />
-    <Compile Include="Numerics\Rectangle.cs" />
-    <Compile Include="Numerics\SignedRational.cs" />
-    <Compile Include="Numerics\Size.cs" />
-    <Compile Include="PixelAccessor.cs" />
-    <Compile Include="Profiles\Exif\ExifDataType.cs" />
-    <Compile Include="Profiles\Exif\ExifParts.cs" />
-    <Compile Include="Profiles\Exif\ExifProfile.cs" />
-    <Compile Include="Profiles\Exif\ExifReader.cs" />
-    <Compile Include="Profiles\Exif\ExifTag.cs" />
-    <Compile Include="Profiles\Exif\ExifTagDescriptionAttribute.cs" />
-    <Compile Include="Profiles\Exif\ExifValue.cs" />
-    <Compile Include="Profiles\Exif\ExifWriter.cs" />
-    <Compile Include="ProgressEventArgs.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Quantizers\IQuantizer.cs" />
-    <Compile Include="Quantizers\Octree\OctreeQuantizer.cs" />
-    <Compile Include="Quantizers\Octree\Quantizer.cs" />
-    <Compile Include="Quantizers\Options\Quantization.cs" />
-    <Compile Include="Quantizers\Palette\PaletteQuantizer.cs" />
-    <Compile Include="Quantizers\Quantize.cs" />
-    <Compile Include="Quantizers\QuantizedImage.cs" />
-    <Compile Include="Quantizers\Wu\Box.cs" />
-    <Compile Include="Quantizers\Wu\WuQuantizer.cs" />
-    <Compile Include="Samplers\AutoOrient.cs" />
-    <Compile Include="Samplers\BoxBlur.cs" />
-    <Compile Include="Samplers\Crop.cs" />
-    <Compile Include="Samplers\DetectEdges.cs" />
-    <Compile Include="Samplers\EntropyCrop.cs" />
-    <Compile Include="Samplers\Flip.cs" />
-    <Compile Include="Samplers\GuassianBlur.cs" />
-    <Compile Include="Samplers\GuassianSharpen.cs" />
-    <Compile Include="Samplers\OilPainting.cs" />
-    <Compile Include="Samplers\Options\AnchorPosition.cs" />
-    <Compile Include="Samplers\Options\FlipType.cs" />
-    <Compile Include="Samplers\Options\Orientation.cs" />
-    <Compile Include="Samplers\Options\ResizeHelper.cs" />
-    <Compile Include="Samplers\Options\ResizeMode.cs" />
-    <Compile Include="Samplers\Options\ResizeOptions.cs" />
-    <Compile Include="Samplers\Options\RotateType.cs" />
-    <Compile Include="Samplers\Pad.cs" />
-    <Compile Include="Samplers\Pixelate.cs" />
-    <Compile Include="Samplers\Processors\CompandingResizeProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\BoxBlurProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\Convolution2DFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\Convolution2PassFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\ConvolutionFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\EdgeDetector2DFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\EdgeDetectorCompassFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\EdgeDetectorFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\IEdgeDetectorFilter.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\KayyaliProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\KirschProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\Laplacian3X3Processor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\Laplacian5X5Processor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\LaplacianOfGaussianProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\PrewittProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\RobertsCrossProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\RobinsonProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\ScharrProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\EdgeDetection\SobelProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\GuassianBlurProcessor.cs" />
-    <Compile Include="Samplers\Processors\Convolution\GuassianSharpenProcessor.cs" />
-    <Compile Include="Samplers\Processors\CropProcessor.cs" />
-    <Compile Include="Samplers\Processors\EntropyCropProcessor.cs" />
-    <Compile Include="Samplers\Processors\FlipProcessor.cs" />
-    <Compile Include="Samplers\Processors\IImageSampler.cs" />
-    <Compile Include="Samplers\Processors\ImageSampler.cs" />
-    <Compile Include="Samplers\Processors\Matrix3x2Processor.cs" />
-    <Compile Include="Samplers\Processors\OilPaintingProcessor.cs" />
-    <Compile Include="Samplers\Processors\PixelateProcessor.cs" />
-    <Compile Include="Samplers\Processors\ResamplingWeightedProcessor.cs" />
-    <Compile Include="Samplers\Processors\ResizeProcessor.cs" />
-    <Compile Include="Samplers\Processors\RotateProcessor.cs" />
-    <Compile Include="Samplers\Processors\SkewProcessor.cs" />
-    <Compile Include="Samplers\Resamplers\BicubicResampler.cs" />
-    <Compile Include="Samplers\Resamplers\BoxResampler.cs" />
-    <Compile Include="Samplers\Resamplers\CatmullRomResampler.cs" />
-    <Compile Include="Samplers\Resamplers\HermiteResampler.cs" />
-    <Compile Include="Samplers\Resamplers\IResampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos2Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos3Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos5Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\Lanczos8Resampler.cs" />
-    <Compile Include="Samplers\Resamplers\MitchellNetravaliResampler.cs" />
-    <Compile Include="Samplers\Resamplers\NearestNeighborResampler.cs" />
-    <Compile Include="Samplers\Resamplers\RobidouxResampler.cs" />
-    <Compile Include="Samplers\Resamplers\RobidouxSharpResampler.cs" />
-    <Compile Include="Samplers\Resamplers\SplineResampler.cs" />
-    <Compile Include="Samplers\Resamplers\TriangleResampler.cs" />
-    <Compile Include="Samplers\Resamplers\WelchResampler.cs" />
-    <Compile Include="Samplers\Resize.cs" />
-    <Compile Include="Samplers\Rotate.cs" />
-    <Compile Include="Samplers\RotateFlip.cs" />
-    <Compile Include="Samplers\Skew.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Filters\Processors\ColorMatrix\ColorBlindness\README.md" />
-    <None Include="Formats\Bmp\README.md" />
-    <None Include="Formats\Gif\README.md" />
-    <None Include="Formats\Jpg\README.md" />
-    <None Include="Formats\Png\README.md" />
-    <None Include="Formats\Png\Zlib\README.md" />
-    <None Include="packages.config" />
-    <None Include="Profiles\Exif\README.md" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/src/ImageSharp46/Numerics/Ellipse.cs b/src/ImageSharp46/Numerics/Ellipse.cs
deleted file mode 100644
index f464c4b26..000000000
--- a/src/ImageSharp46/Numerics/Ellipse.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// <copyright file="Ellipse.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    public struct Ellipse : IEquatable<Ellipse>
-    {
-        /// <summary>
-        /// The center point.
-        /// </summary>
-        private Point center;
-
-        /// <summary>
-        /// Represents a <see cref="Ellipse"/> that has X and Y values set to zero.
-        /// </summary>
-        public static readonly Ellipse Empty = default(Ellipse);
-
-        public Ellipse(Point center, float radiusX, float radiusY)
-        {
-            this.center = center;
-            this.RadiusX = radiusX;
-            this.RadiusY = radiusY;
-        }
-
-        /// <summary>
-        /// Gets the x-radius of this <see cref="Ellipse"/>.
-        /// </summary>
-        public float RadiusX { get; }
-
-        /// <summary>
-        /// Gets the y-radius of this <see cref="Ellipse"/>.
-        /// </summary>
-        public float RadiusY { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Ellipse"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Compares two <see cref="Ellipse"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Ellipse"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Ellipse"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Ellipse left, Ellipse right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Ellipse"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Ellipse"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Ellipse"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Ellipse left, Ellipse right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <summary>
-        /// Returns the center point of the given <see cref="Ellipse"/>
-        /// </summary>
-        /// <param name="ellipse">The ellipse</param>
-        /// <returns><see cref="Vector2"/></returns>
-        public static Vector2 Center(Ellipse ellipse)
-        {
-            return new Vector2(ellipse.center.X, ellipse.center.Y);
-        }
-
-        /// <summary>
-        /// Determines if the specfied point is contained within the rectangular region defined by
-        /// this <see cref="Ellipse"/>.
-        /// </summary>
-        /// <param name="x">The x-coordinate of the given point.</param>
-        /// <param name="y">The y-coordinate of the given point.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public bool Contains(int x, int y)
-        {
-            if (this.RadiusX <= 0 || this.RadiusY <= 0)
-            {
-                return false;
-            }
-
-            // TODO: SIMD?
-            // This is a more general form of the circle equation
-            // X^2/a^2 + Y^2/b^2 <= 1
-            Point normalized = new Point(x - this.center.X, y - this.center.Y);
-            int nX = normalized.X;
-            int nY = normalized.Y;
-
-            return ((double)(nX * nX) / (this.RadiusX * this.RadiusX))
-                 + ((double)(nY * nY) / (this.RadiusY * this.RadiusY))
-                 <= 1.0;
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Ellipse [ Empty ]";
-            }
-
-            return
-                $"Ellipse [ RadiusX={this.RadiusX}, RadiusY={this.RadiusX}, Centre={this.center.X},{this.center.Y} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Ellipse)
-            {
-                return this.Equals((Ellipse)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Ellipse other)
-        {
-            return this.center.Equals(other.center)
-                && this.RadiusX.Equals(other.RadiusX)
-                && this.RadiusY.Equals(other.RadiusY);
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="ellipse">
-        /// The instance of <see cref="Point"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(Ellipse ellipse)
-        {
-            unchecked
-            {
-                int hashCode = ellipse.center.GetHashCode();
-                hashCode = (hashCode * 397) ^ ellipse.RadiusX.GetHashCode();
-                hashCode = (hashCode * 397) ^ ellipse.RadiusY.GetHashCode();
-                return hashCode;
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Numerics/LongRational.cs b/src/ImageSharp46/Numerics/LongRational.cs
deleted file mode 100644
index f56abc289..000000000
--- a/src/ImageSharp46/Numerics/LongRational.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-// <copyright file="LongRational.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-
-    /// <summary>
-    /// Represents a number that can be expressed as a fraction
-    /// </summary>
-    /// <remarks>
-    /// This is a very simplified implementation of a rational number designed for use with metadata only.
-    /// </remarks>
-    internal struct LongRational : IEquatable<LongRational>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LongRational"/> struct.
-        /// </summary>
-        /// <param name="numerator">
-        /// The number above the line in a vulgar fraction showing how many of the parts
-        /// indicated by the denominator are taken.
-        /// </param>
-        /// <param name="denominator">
-        /// The number below the line in a vulgar fraction; a divisor.
-        /// </param>
-        public LongRational(long numerator, long denominator)
-          : this(numerator, denominator, false)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LongRational"/> struct.
-        /// </summary>
-        /// <param name="numerator">
-        /// The number above the line in a vulgar fraction showing how many of the parts
-        /// indicated by the denominator are taken.
-        /// </param>
-        /// <param name="denominator">
-        /// The number below the line in a vulgar fraction; a divisor.
-        /// </param>
-        /// <param name="simplify">
-        /// Whether to attempt to simplify the fractional parts.
-        /// </param>
-        public LongRational(long numerator, long denominator, bool simplify)
-            : this()
-        {
-            this.Numerator = numerator;
-            this.Denominator = denominator;
-
-            if (simplify)
-            {
-                this.Simplify();
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LongRational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to create the instance from.</param>
-        /// <param name="bestPrecision">Whether to use the best possible precision when parsing the value.</param>
-        public LongRational(double value, bool bestPrecision)
-            : this()
-        {
-            if (double.IsNaN(value))
-            {
-                this.Numerator = this.Denominator = 0;
-                return;
-            }
-
-            if (double.IsPositiveInfinity(value))
-            {
-                this.Numerator = 1;
-                this.Denominator = 0;
-                return;
-            }
-
-            if (double.IsNegativeInfinity(value))
-            {
-                this.Numerator = -1;
-                this.Denominator = 0;
-                return;
-            }
-
-            this.Numerator = 1;
-            this.Denominator = 1;
-
-            double val = Math.Abs(value);
-            double df = this.Numerator / (double)this.Denominator;
-            double epsilon = bestPrecision ? double.Epsilon : .000001;
-
-            while (Math.Abs(df - val) > epsilon)
-            {
-                if (df < val)
-                {
-                    this.Numerator++;
-                }
-                else
-                {
-                    this.Denominator++;
-                    this.Numerator = (int)(val * this.Denominator);
-                }
-
-                df = this.Numerator / (double)this.Denominator;
-            }
-
-            if (value < 0.0)
-            {
-                this.Numerator *= -1;
-            }
-
-            this.Simplify();
-        }
-
-        /// <summary>
-        /// Gets the numerator of a number.
-        /// </summary>
-        public long Numerator
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the denominator of a number.
-        /// </summary>
-        public long Denominator
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is indeterminate.
-        /// </summary>
-        public bool IsIndeterminate
-        {
-            get
-            {
-                if (this.Denominator != 0)
-                {
-                    return false;
-                }
-
-                return this.Numerator == 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is an integer (n, 1)
-        /// </summary>
-        public bool IsInteger => this.Denominator == 1;
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is equal to negative infinity (-1, 0)
-        /// </summary>
-        public bool IsNegativeInfinity
-        {
-            get
-            {
-                if (this.Denominator != 0)
-                {
-                    return false;
-                }
-
-                return this.Numerator == -1;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is equal to positive infinity (1, 0)
-        /// </summary>
-        public bool IsPositiveInfinity
-        {
-            get
-            {
-                if (this.Denominator != 0)
-                {
-                    return false;
-                }
-
-                return this.Numerator == 1;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is equal to 0 (0, 1)
-        /// </summary>
-        public bool IsZero
-        {
-            get
-            {
-                if (this.Denominator != 1)
-                {
-                    return false;
-                }
-
-                return this.Numerator == 0;
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(LongRational other)
-        {
-            if (this.Denominator == other.Denominator)
-            {
-                return this.Numerator == other.Numerator;
-            }
-
-            if (this.Numerator == 0 && this.Denominator == 0)
-            {
-                return other.Numerator == 0 && other.Denominator == 0;
-            }
-
-            if (other.Numerator == 0 && other.Denominator == 0)
-            {
-                return this.Numerator == 0 && this.Denominator == 0;
-            }
-
-            return (this.Numerator * other.Denominator) == (this.Denominator * other.Numerator);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return this.ToString(CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Converts the numeric value of this instance to its equivalent string representation using
-        /// the specified culture-specific format information.
-        /// </summary>
-        /// <param name="provider">
-        /// An object that supplies culture-specific formatting information.
-        /// </param>
-        /// <returns>The <see cref="string"/></returns>
-        public string ToString(IFormatProvider provider)
-        {
-            if (this.IsIndeterminate)
-            {
-                return "[ Indeterminate ]";
-            }
-
-            if (this.IsPositiveInfinity)
-            {
-                return "[ PositiveInfinity ]";
-            }
-
-            if (this.IsNegativeInfinity)
-            {
-                return "[ NegativeInfinity ]";
-            }
-
-            if (this.IsZero)
-            {
-                return "0";
-            }
-
-            if (this.IsInteger)
-            {
-                return this.Numerator.ToString(provider);
-            }
-
-            StringBuilder sb = new StringBuilder();
-            sb.Append(this.Numerator.ToString(provider));
-            sb.Append("/");
-            sb.Append(this.Denominator.ToString(provider));
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Finds the greatest common divisor of two <see cref="long"/> values.
-        /// </summary>
-        /// <param name="left">The first value</param>
-        /// <param name="right">The second value</param>
-        /// <returns>The <see cref="long"/></returns>
-        private static long GreatestCommonDivisor(long left, long right)
-        {
-            return right == 0 ? left : GreatestCommonDivisor(right, left % right);
-        }
-
-        /// <summary>
-        /// Simplifies the <see cref="LongRational"/>
-        /// </summary>
-        private void Simplify()
-        {
-            if (this.IsIndeterminate)
-            {
-                return;
-            }
-
-            if (this.IsNegativeInfinity)
-            {
-                return;
-            }
-
-            if (this.IsPositiveInfinity)
-            {
-                return;
-            }
-
-            if (this.IsInteger)
-            {
-                return;
-            }
-
-            if (this.IsZero)
-            {
-                return;
-            }
-
-            if (this.Numerator == 0)
-            {
-                this.Denominator = 0;
-                return;
-            }
-
-            if (this.Numerator == this.Denominator)
-            {
-                this.Numerator = 1;
-                this.Denominator = 1;
-            }
-
-            long gcd = GreatestCommonDivisor(Math.Abs(this.Numerator), Math.Abs(this.Denominator));
-            if (gcd > 1)
-            {
-                this.Numerator = this.Numerator / gcd;
-                this.Denominator = this.Denominator / gcd;
-            }
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="rational">
-        /// The instance of <see cref="LongRational"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(LongRational rational)
-        {
-            return ((rational.Numerator * 397) ^ rational.Denominator).GetHashCode();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Numerics/Point.cs b/src/ImageSharp46/Numerics/Point.cs
deleted file mode 100644
index 3cd47659c..000000000
--- a/src/ImageSharp46/Numerics/Point.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-// <copyright file="Point.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-    using System.Runtime.CompilerServices;
-
-    /// <summary>
-    /// Represents an ordered pair of integer x- and y-coordinates that defines a point in
-    /// a two-dimensional plane.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public struct Point : IEquatable<Point>
-    {
-        /// <summary>
-        /// Represents a <see cref="Point"/> that has X and Y values set to zero.
-        /// </summary>
-        public static readonly Point Empty = default(Point);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> struct.
-        /// </summary>
-        /// <param name="x">The horizontal position of the point.</param>
-        /// <param name="y">The vertical position of the point.</param>
-        public Point(int x, int y)
-            : this()
-        {
-            this.X = x;
-            this.Y = y;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Point"/> struct.
-        /// </summary>
-        /// <param name="vector">
-        /// The vector representing the width and height.
-        /// </param>
-        public Point(Vector2 vector)
-        {
-            this.X = (int)Math.Round(vector.X);
-            this.Y = (int)Math.Round(vector.Y);
-        }
-
-        /// <summary>
-        /// Gets or sets the x-coordinate of this <see cref="Point"/>.
-        /// </summary>
-        public int X { get; set; }
-
-        /// <summary>
-        /// Gets or sets the y-coordinate of this <see cref="Point"/>.
-        /// </summary>
-        public int Y { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Point"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Computes the sum of adding two points.
-        /// </summary>
-        /// <param name="left">The point on the left hand of the operand.</param>
-        /// <param name="right">The point on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Point"/>
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Point operator +(Point left, Point right)
-        {
-            return new Point(left.X + right.X, left.Y + right.Y);
-        }
-
-        /// <summary>
-        /// Computes the difference left by subtracting one point from another.
-        /// </summary>
-        /// <param name="left">The point on the left hand of the operand.</param>
-        /// <param name="right">The point on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Point"/>
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Point operator -(Point left, Point right)
-        {
-            return new Point(left.X - right.X, left.Y - right.Y);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Point"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Point"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Point"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(Point left, Point right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Point"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Point"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Point"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(Point left, Point right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <summary>
-        /// Creates a rotation matrix for the given point and angle.
-        /// </summary>
-        /// <param name="origin">The origin point to rotate around</param>
-        /// <param name="degrees">Rotation in degrees</param>
-        /// <returns>The rotation <see cref="Matrix3x2"/></returns>
-        public static Matrix3x2 CreateRotation(Point origin, float degrees)
-        {
-            float radians = ImageMaths.DegreesToRadians(degrees);
-            return Matrix3x2.CreateRotation(radians, new Vector2(origin.X, origin.Y));
-        }
-
-        /// <summary>
-        /// Rotates a point around a given a rotation matrix.
-        /// </summary>
-        /// <param name="point">The point to rotate</param>
-        /// <param name="rotation">Rotation matrix used</param>
-        /// <returns>The rotated <see cref="Point"/></returns>
-        public static Point Rotate(Point point, Matrix3x2 rotation)
-        {
-            return new Point(Vector2.Transform(new Vector2(point.X, point.Y), rotation));
-        }
-
-        /// <summary>
-        /// Rotates a point around a given origin by the specified angle in degrees.
-        /// </summary>
-        /// <param name="point">The point to rotate</param>
-        /// <param name="origin">The center point to rotate around.</param>
-        /// <param name="degrees">The angle in degrees.</param>
-        /// <returns>The rotated <see cref="Point"/></returns>
-        public static Point Rotate(Point point, Point origin, float degrees)
-        {
-            return new Point(Vector2.Transform(new Vector2(point.X, point.Y), CreateRotation(origin, degrees)));
-        }
-
-        /// <summary>
-        /// Creates a skew matrix for the given point and angle.
-        /// </summary>
-        /// <param name="origin">The origin point to rotate around</param>
-        /// <param name="degreesX">The x-angle in degrees.</param>
-        /// <param name="degreesY">The y-angle in degrees.</param>
-        /// <returns>The rotation <see cref="Matrix3x2"/></returns>
-        public static Matrix3x2 CreateSkew(Point origin, float degreesX, float degreesY)
-        {
-            float radiansX = ImageMaths.DegreesToRadians(degreesX);
-            float radiansY = ImageMaths.DegreesToRadians(degreesY);
-            return Matrix3x2.CreateSkew(radiansX, radiansY, new Vector2(origin.X, origin.Y));
-        }
-
-        /// <summary>
-        /// Skews a point using a given a skew matrix.
-        /// </summary>
-        /// <param name="point">The point to rotate</param>
-        /// <param name="skew">Rotation matrix used</param>
-        /// <returns>The rotated <see cref="Point"/></returns>
-        public static Point Skew(Point point, Matrix3x2 skew)
-        {
-            return new Point(Vector2.Transform(new Vector2(point.X, point.Y), skew));
-        }
-
-        /// <summary>
-        /// Skews a point around a given origin by the specified angles in degrees.
-        /// </summary>
-        /// <param name="point">The point to skew.</param>
-        /// <param name="origin">The center point to rotate around.</param>
-        /// <param name="degreesX">The x-angle in degrees.</param>
-        /// <param name="degreesY">The y-angle in degrees.</param>
-        /// <returns>The skewed <see cref="Point"/></returns>
-        public static Point Skew(Point point, Point origin, float degreesX, float degreesY)
-        {
-            return new Point(Vector2.Transform(new Vector2(point.X, point.Y), CreateSkew(origin, degreesX, degreesY)));
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Vector2"/> representation for this <see cref="Point"/>.
-        /// </summary>
-        /// <returns>A <see cref="Vector2"/> representation for this object.</returns>
-        public Vector2 ToVector2()
-        {
-            return new Vector2(this.X, this.Y);
-        }
-
-        /// <summary>
-        /// Translates this <see cref="Point"/> by the specified amount.
-        /// </summary>
-        /// <param name="dx">The amount to offset the x-coordinate.</param>
-        /// <param name="dy">The amount to offset the y-coordinate.</param>
-        public void Offset(int dx, int dy)
-        {
-            this.X += dx;
-            this.Y += dy;
-        }
-
-        /// <summary>
-        /// Translates this <see cref="Point"/> by the specified amount.
-        /// </summary>
-        /// <param name="p">The <see cref="Point"/> used offset this <see cref="Point"/>.</param>
-        public void Offset(Point p)
-        {
-            this.Offset(p.X, p.Y);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Point [ Empty ]";
-            }
-
-            return $"Point [ X={this.X}, Y={this.Y} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Point)
-            {
-                return this.Equals((Point)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Point other)
-        {
-            return this.X == other.X && this.Y == other.Y;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="point">
-        /// The instance of <see cref="Point"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(Point point)
-        {
-            return point.X ^ point.Y;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Numerics/Rational.cs b/src/ImageSharp46/Numerics/Rational.cs
deleted file mode 100644
index d219a5469..000000000
--- a/src/ImageSharp46/Numerics/Rational.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// <copyright file="Rational.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Represents a number that can be expressed as a fraction.
-    /// </summary>
-    /// <remarks>
-    /// This is a very simplified implementation of a rational number designed for use with metadata only.
-    /// </remarks>
-    public struct Rational : IEquatable<Rational>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="uint"/> to create the rational from.</param>
-        public Rational(uint value)
-          : this(value, 1)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rational"/> struct.
-        /// </summary>
-        /// <param name="numerator">The number above the line in a vulgar fraction showing how many of the parts indicated by the denominator are taken.</param>
-        /// <param name="denominator">The number below the line in a vulgar fraction; a divisor.</param>
-        public Rational(uint numerator, uint denominator)
-          : this(numerator, denominator, true)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rational"/> struct.
-        /// </summary>
-        /// <param name="numerator">The number above the line in a vulgar fraction showing how many of the parts indicated by the denominator are taken.</param>
-        /// <param name="denominator">The number below the line in a vulgar fraction; a divisor.</param>
-        /// <param name="simplify">Specified if the rational should be simplified.</param>
-        public Rational(uint numerator, uint denominator, bool simplify)
-        {
-            LongRational rational = new LongRational(numerator, denominator, simplify);
-
-            this.Numerator = (uint)rational.Numerator;
-            this.Denominator = (uint)rational.Denominator;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to create the instance from.</param>
-        public Rational(double value)
-          : this(value, false)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to create the instance from.</param>
-        /// <param name="bestPrecision">Whether to use the best possible precision when parsing the value.</param>
-        public Rational(double value, bool bestPrecision)
-        {
-            LongRational rational = new LongRational(Math.Abs(value), bestPrecision);
-
-            this.Numerator = (uint)rational.Numerator;
-            this.Denominator = (uint)rational.Denominator;
-        }
-
-        /// <summary>
-        /// Gets the numerator of a number.
-        /// </summary>
-        public uint Numerator { get; }
-
-        /// <summary>
-        /// Gets the denominator of a number.
-        /// </summary>
-        public uint Denominator { get; }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="Rational"/> instances are considered equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="Rational"/>  to compare.</param>
-        /// <param name="right"> The second <see cref="Rational"/>  to compare.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public static bool operator ==(Rational left, Rational right)
-        {
-            return Rational.Equals(left, right);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="Rational"/> instances are not considered equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="Rational"/> to compare.</param>
-        /// <param name="right"> The second <see cref="Rational"/> to compare.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public static bool operator !=(Rational left, Rational right)
-        {
-            return !Rational.Equals(left, right);
-        }
-
-        /// <summary>
-        /// Converts the specified <see cref="double"/> to an instance of this type.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to convert to an instance of this type.</param>
-        /// <returns>
-        /// The <see cref="Rational"/>.
-        /// </returns>
-        public static Rational FromDouble(double value)
-        {
-            return new Rational(value, false);
-        }
-
-        /// <summary>
-        /// Converts the specified <see cref="double"/> to an instance of this type.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to convert to an instance of this type.</param>
-        /// <param name="bestPrecision">Whether to use the best possible precision when parsing the value.</param>
-        /// <returns>
-        /// The <see cref="Rational"/>.
-        /// </returns>
-        public static Rational FromDouble(double value, bool bestPrecision)
-        {
-            return new Rational(value, bestPrecision);
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Rational)
-            {
-                return this.Equals((Rational)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Rational other)
-        {
-            LongRational left = new LongRational(this.Numerator, this.Denominator);
-            LongRational right = new LongRational(other.Numerator, other.Denominator);
-
-            return left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            LongRational self = new LongRational(this.Numerator, this.Denominator);
-            return self.GetHashCode();
-        }
-
-        /// <summary>
-        /// Converts a rational number to the nearest <see cref="double"/>.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public double ToDouble()
-        {
-            return this.Numerator / (double)this.Denominator;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return this.ToString(CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Converts the numeric value of this instance to its equivalent string representation using
-        /// the specified culture-specific format information.
-        /// </summary>
-        /// <param name="provider">
-        /// An object that supplies culture-specific formatting information.
-        /// </param>
-        /// <returns>The <see cref="string"/></returns>
-        public string ToString(IFormatProvider provider)
-        {
-            LongRational rational = new LongRational(this.Numerator, this.Denominator);
-            return rational.ToString(provider);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Numerics/Rectangle.cs b/src/ImageSharp46/Numerics/Rectangle.cs
deleted file mode 100644
index fb623c2eb..000000000
--- a/src/ImageSharp46/Numerics/Rectangle.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-// <copyright file="Rectangle.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Numerics;
-
-    /// <summary>
-    /// Stores a set of four integers that represent the location and size of a rectangle.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public struct Rectangle : IEquatable<Rectangle>
-    {
-        /// <summary>
-        /// Represents a <see cref="Rectangle"/> that has X, Y, Width, and Height values set to zero.
-        /// </summary>
-        public static readonly Rectangle Empty = default(Rectangle);
-
-        /// <summary>
-        /// The backing vector for SIMD support.
-        /// </summary>
-        private Vector4 backingVector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rectangle"/> struct.
-        /// </summary>
-        /// <param name="x">The horizontal position of the rectangle.</param>
-        /// <param name="y">The vertical position of the rectangle.</param>
-        /// <param name="width">The width of the rectangle.</param>
-        /// <param name="height">The height of the rectangle.</param>
-        public Rectangle(int x, int y, int width, int height)
-        {
-            this.backingVector = new Vector4(x, y, width, height);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rectangle"/> struct.
-        /// </summary>
-        /// <param name="point">
-        /// The <see cref="Point"/> which specifies the rectangles point in a two-dimensional plane.
-        /// </param>
-        /// <param name="size">
-        /// The <see cref="Size"/> which specifies the rectangles height and width.
-        /// </param>
-        public Rectangle(Point point, Size size)
-        {
-            this.backingVector = new Vector4(point.X, point.Y, size.Width, size.Height);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Rectangle"/> struct.
-        /// </summary>
-        /// <param name="vector">The vector.</param>
-        public Rectangle(Vector4 vector)
-        {
-            this.backingVector = vector;
-        }
-
-        /// <summary>
-        /// Gets or sets the x-coordinate of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int X
-        {
-            get
-            {
-                return (int)this.backingVector.X;
-            }
-
-            set
-            {
-                this.backingVector.X = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the y-coordinate of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Y
-        {
-            get
-            {
-                return (int)this.backingVector.Y;
-            }
-
-            set
-            {
-                this.backingVector.Y = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the width of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Width
-        {
-            get
-            {
-                return (int)this.backingVector.Z;
-            }
-
-            set
-            {
-                this.backingVector.Z = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the height of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Height
-        {
-            get
-            {
-                return (int)this.backingVector.W;
-            }
-
-            set
-            {
-                this.backingVector.W = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Rectangle"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Gets the y-coordinate of the top edge of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Top => this.Y;
-
-        /// <summary>
-        /// Gets the x-coordinate of the right edge of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Right => this.X + this.Width;
-
-        /// <summary>
-        /// Gets the y-coordinate of the bottom edge of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Bottom => this.Y + this.Height;
-
-        /// <summary>
-        /// Gets the x-coordinate of the left edge of this <see cref="Rectangle"/>.
-        /// </summary>
-        public int Left => this.X;
-
-        /// <summary>
-        /// Computes the sum of adding two rectangles.
-        /// </summary>
-        /// <param name="left">The rectangle on the left hand of the operand.</param>
-        /// <param name="right">The rectangle on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>
-        /// </returns>
-        public static Rectangle operator +(Rectangle left, Rectangle right)
-        {
-            return new Rectangle(left.backingVector + right.backingVector);
-        }
-
-        /// <summary>
-        /// Computes the difference left by subtracting one rectangle from another.
-        /// </summary>
-        /// <param name="left">The rectangle on the left hand of the operand.</param>
-        /// <param name="right">The rectangle on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>
-        /// </returns>
-        public static Rectangle operator -(Rectangle left, Rectangle right)
-        {
-            return new Rectangle(left.backingVector - right.backingVector);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Rectangle"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Rectangle"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Rectangle"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator ==(Rectangle left, Rectangle right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Rectangle"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Rectangle"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Rectangle"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        public static bool operator !=(Rectangle left, Rectangle right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <summary>
-        /// Determines if the specfied point is contained within the rectangular region defined by
-        /// this <see cref="Rectangle"/>.
-        /// </summary>
-        /// <param name="x">The x-coordinate of the given point.</param>
-        /// <param name="y">The y-coordinate of the given point.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public bool Contains(int x, int y)
-        {
-            // TODO: SIMD?
-            return this.X <= x
-                   && x < this.Right
-                   && this.Y <= y
-                   && y < this.Bottom;
-        }
-
-        /// <summary>
-        /// Returns the center point of the given <see cref="Rectangle"/>
-        /// </summary>
-        /// <param name="rectangle">The rectangle</param>
-        /// <returns><see cref="Point"/></returns>
-        public static Point Center(Rectangle rectangle)
-        {
-            return new Point(rectangle.Left + (rectangle.Width / 2), rectangle.Top + (rectangle.Height / 2));
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Rectangle [ Empty ]";
-            }
-
-            return
-                $"Rectangle [ X={this.X}, Y={this.Y}, Width={this.Width}, Height={this.Height} ]";
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is Rectangle)
-            {
-                return this.Equals((Rectangle)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Rectangle other)
-        {
-            return this.backingVector.Equals(other.backingVector);
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="rectangle">
-        /// The instance of <see cref="Rectangle"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(Rectangle rectangle)
-        {
-            return rectangle.backingVector.GetHashCode();
-        }
-    }
-}
diff --git a/src/ImageSharp46/Numerics/SignedRational.cs b/src/ImageSharp46/Numerics/SignedRational.cs
deleted file mode 100644
index bd2213dce..000000000
--- a/src/ImageSharp46/Numerics/SignedRational.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// <copyright file="SignedRational.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Represents a number that can be expressed as a fraction.
-    /// </summary>
-    /// <remarks>
-    /// This is a very simplified implementation of a rational number designed for use with metadata only.
-    /// </remarks>
-    public struct SignedRational : IEquatable<SignedRational>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignedRational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="int"/> to create the rational from.</param>
-        public SignedRational(int value)
-          : this(value, 1)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignedRational"/> struct.
-        /// </summary>
-        /// <param name="numerator">The number above the line in a vulgar fraction showing how many of the parts indicated by the denominator are taken.</param>
-        /// <param name="denominator">The number below the line in a vulgar fraction; a divisor.</param>
-        public SignedRational(int numerator, int denominator)
-          : this(numerator, denominator, true)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignedRational"/> struct.
-        /// </summary>
-        /// <param name="numerator">The number above the line in a vulgar fraction showing how many of the parts indicated by the denominator are taken.</param>
-        /// <param name="denominator">The number below the line in a vulgar fraction; a divisor.</param>
-        /// <param name="simplify">Specified if the rational should be simplified.</param>
-        public SignedRational(int numerator, int denominator, bool simplify)
-        {
-            LongRational rational = new LongRational(numerator, denominator, simplify);
-
-            this.Numerator = (int)rational.Numerator;
-            this.Denominator = (int)rational.Denominator;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignedRational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to create the instance from.</param>
-        public SignedRational(double value)
-          : this(value, false)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignedRational"/> struct.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to create the instance from.</param>
-        /// <param name="bestPrecision">Whether to use the best possible precision when parsing the value.</param>
-        public SignedRational(double value, bool bestPrecision)
-        {
-            LongRational rational = new LongRational(value, bestPrecision);
-
-            this.Numerator = (int)rational.Numerator;
-            this.Denominator = (int)rational.Denominator;
-        }
-
-        /// <summary>
-        /// Gets the numerator of a number.
-        /// </summary>
-        public int Numerator { get; }
-
-        /// <summary>
-        /// Gets the denominator of a number.
-        /// </summary>
-        public int Denominator { get; }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="SignedRational"/> instances are considered equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="SignedRational"/>  to compare.</param>
-        /// <param name="right"> The second <see cref="SignedRational"/>  to compare.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public static bool operator ==(SignedRational left, SignedRational right)
-        {
-            return SignedRational.Equals(left, right);
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="SignedRational"/> instances are not considered equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="SignedRational"/> to compare.</param>
-        /// <param name="right"> The second <see cref="SignedRational"/> to compare.</param>
-        /// <returns>The <see cref="bool"/></returns>
-        public static bool operator !=(SignedRational left, SignedRational right)
-        {
-            return !SignedRational.Equals(left, right);
-        }
-
-        /// <summary>
-        /// Converts the specified <see cref="double"/> to an instance of this type.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to convert to an instance of this type.</param>
-        /// <returns>
-        /// The <see cref="SignedRational"/>.
-        /// </returns>
-        public static SignedRational FromDouble(double value)
-        {
-            return new SignedRational(value, false);
-        }
-
-        /// <summary>
-        /// Converts the specified <see cref="double"/> to an instance of this type.
-        /// </summary>
-        /// <param name="value">The <see cref="double"/> to convert to an instance of this type.</param>
-        /// <param name="bestPrecision">Whether to use the best possible precision when parsing the value.</param>
-        /// <returns>
-        /// The <see cref="SignedRational"/>.
-        /// </returns>
-        public static SignedRational FromDouble(double value, bool bestPrecision)
-        {
-            return new SignedRational(value, bestPrecision);
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is SignedRational)
-            {
-                return this.Equals((SignedRational)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(SignedRational other)
-        {
-            LongRational left = new LongRational(this.Numerator, this.Denominator);
-            LongRational right = new LongRational(other.Numerator, other.Denominator);
-
-            return left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            LongRational self = new LongRational(this.Numerator, this.Denominator);
-            return self.GetHashCode();
-        }
-
-        /// <summary>
-        /// Converts a rational number to the nearest <see cref="double"/>.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="double"/>.
-        /// </returns>
-        public double ToDouble()
-        {
-            return this.Numerator / (double)this.Denominator;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return this.ToString(CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Converts the numeric value of this instance to its equivalent string representation using
-        /// the specified culture-specific format information.
-        /// </summary>
-        /// <param name="provider">
-        /// An object that supplies culture-specific formatting information.
-        /// </param>
-        /// <returns>The <see cref="string"/></returns>
-        public string ToString(IFormatProvider provider)
-        {
-            LongRational rational = new LongRational(this.Numerator, this.Denominator);
-            return rational.ToString(provider);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Numerics/Size.cs b/src/ImageSharp46/Numerics/Size.cs
deleted file mode 100644
index bae645ac8..000000000
--- a/src/ImageSharp46/Numerics/Size.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// <copyright file="Size.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.ComponentModel;
-    using System.Runtime.CompilerServices;
-
-    /// <summary>
-    /// Stores an ordered pair of integers, which specify a height and width.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public struct Size : IEquatable<Size>
-    {
-        /// <summary>
-        /// Represents a <see cref="Size"/> that has Width and Height values set to zero.
-        /// </summary>
-        public static readonly Size Empty = default(Size);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Size"/> struct.
-        /// </summary>
-        /// <param name="width">The width of the size.</param>
-        /// <param name="height">The height of the size.</param>
-        public Size(int width, int height)
-        {
-            this.Width = width;
-            this.Height = height;
-        }
-
-        /// <summary>
-        /// Gets or sets the width of this <see cref="Size"/>.
-        /// </summary>
-        public int Width { get; set; }
-
-        /// <summary>
-        /// Gets or sets the height of this <see cref="Size"/>.
-        /// </summary>
-        public int Height { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Size"/> is empty.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool IsEmpty => this.Equals(Empty);
-
-        /// <summary>
-        /// Computes the sum of adding two sizes.
-        /// </summary>
-        /// <param name="left">The size on the left hand of the operand.</param>
-        /// <param name="right">The size on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Size"/>
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Size operator +(Size left, Size right)
-        {
-            return new Size(left.Width + right.Width, left.Height + right.Height);
-        }
-
-        /// <summary>
-        /// Computes the difference left by subtracting one size from another.
-        /// </summary>
-        /// <param name="left">The size on the left hand of the operand.</param>
-        /// <param name="right">The size on the right hand of the operand.</param>
-        /// <returns>
-        /// The <see cref="Size"/>
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Size operator -(Size left, Size right)
-        {
-            return new Size(left.Width - right.Width, left.Height - right.Height);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Size"/> objects for equality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Size"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Size"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(Size left, Size right)
-        {
-            return left.Equals(right);
-        }
-
-        /// <summary>
-        /// Compares two <see cref="Size"/> objects for inequality.
-        /// </summary>
-        /// <param name="left">
-        /// The <see cref="Size"/> on the left side of the operand.
-        /// </param>
-        /// <param name="right">
-        /// The <see cref="Size"/> on the right side of the operand.
-        /// </param>
-        /// <returns>
-        /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
-        /// </returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(Size left, Size right)
-        {
-            return !left.Equals(right);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.IsEmpty)
-            {
-                return "Size [ Empty ]";
-            }
-
-            return $"Size [ Width={this.Width}, Height={this.Height} ]";
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override bool Equals(object obj)
-        {
-            if (obj is Size)
-            {
-                return this.Equals((Size)obj);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Size other)
-        {
-            return this.Width == other.Width && this.Height == other.Height;
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="size">
-        /// The instance of <see cref="Size"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(Size size)
-        {
-            return size.Width ^ size.Height;
-        }
-    }
-}
diff --git a/src/ImageSharp46/PixelAccessor.cs b/src/ImageSharp46/PixelAccessor.cs
deleted file mode 100644
index 5c2ec5065..000000000
--- a/src/ImageSharp46/PixelAccessor.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <copyright file="PixelAccessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Runtime.CompilerServices;
-
-    /// <summary>
-    /// An optimized pixel accessor for the <see cref="Image"/> class.
-    /// </summary>
-    public sealed unsafe class PixelAccessor : PixelAccessor<Color, uint>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor"/> class.
-        /// </summary>
-        /// <param name="image">The image to provide pixel access for.</param>
-        public PixelAccessor(ImageBase<Color, uint> image)
-          : base(image)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override void CopyFromZYX(PixelRow<Color, uint> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            for (int x = 0; x < width; x++)
-            {
-                Unsafe.Write(destination, (uint)(*(source + 2) << 0 | *(source + 1) << 8 | *source << 16 | 255 << 24));
-
-                source += 3;
-                destination += 4;
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void CopyFromZYXW(PixelRow<Color, uint> row, int targetY, int width)
-        {
-            byte* source = row.PixelBase;
-            byte* destination = this.GetRowPointer(targetY);
-
-            for (int x = 0; x < width; x++)
-            {
-                Unsafe.Write(destination, (uint)(*(source + 2) << 0 | *(source + 1) << 8 | *source << 16 | *(source + 3) << 24));
-
-                source += 4;
-                destination += 4;
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void CopyToZYX(PixelRow<Color, uint> row, int sourceY, int width)
-        {
-            byte* source = this.GetRowPointer(sourceY);
-            byte* destination = row.PixelBase;
-
-            for (int x = 0; x < width; x++)
-            {
-                *destination = *(source + 2);
-                *(destination + 1) = *(source + 1);
-                *(destination + 2) = *(source + 0);
-
-                source += 4;
-                destination += 3;
-            }
-        }
-
-        /// <inheritdoc />
-        protected override void CopyToZYXW(PixelRow<Color, uint> row, int sourceY, int width)
-        {
-            byte* source = this.GetRowPointer(sourceY);
-            byte* destination = row.PixelBase;
-
-            for (int x = 0; x < width; x++)
-            {
-                *destination = *(source + 2);
-                *(destination + 1) = *(source + 1);
-                *(destination + 2) = *(source + 0);
-                *(destination + 3) = *(source + 3);
-
-                source += 4;
-                destination += 4;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifDataType.cs b/src/ImageSharp46/Profiles/Exif/ExifDataType.cs
deleted file mode 100644
index f2d012c6c..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifDataType.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <copyright file="ExifDataType.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Specifies exif data types.
-    /// </summary>
-    public enum ExifDataType
-    {
-        /// <summary>
-        /// Unknown
-        /// </summary>
-        Unknown,
-
-        /// <summary>
-        /// Byte
-        /// </summary>
-        Byte,
-
-        /// <summary>
-        /// Ascii
-        /// </summary>
-        Ascii,
-
-        /// <summary>
-        /// Short
-        /// </summary>
-        Short,
-
-        /// <summary>
-        /// Long
-        /// </summary>
-        Long,
-
-        /// <summary>
-        /// Rational
-        /// </summary>
-        Rational,
-
-        /// <summary>
-        /// SignedByte
-        /// </summary>
-        SignedByte,
-
-        /// <summary>
-        /// Undefined
-        /// </summary>
-        Undefined,
-
-        /// <summary>
-        /// SignedShort
-        /// </summary>
-        SignedShort,
-
-        /// <summary>
-        /// SignedLong
-        /// </summary>
-        SignedLong,
-
-        /// <summary>
-        /// SignedRational
-        /// </summary>
-        SignedRational,
-
-        /// <summary>
-        /// SingleFloat
-        /// </summary>
-        SingleFloat,
-
-        /// <summary>
-        /// DoubleFloat
-        /// </summary>
-        DoubleFloat
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifParts.cs b/src/ImageSharp46/Profiles/Exif/ExifParts.cs
deleted file mode 100644
index 880a43453..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifParts.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <copyright file="ExifParts.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// Specifies which parts will be written when the profile is added to an image.
-    /// </summary>
-    [Flags]
-    public enum ExifParts
-    {
-        /// <summary>
-        /// None
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// IfdTags
-        /// </summary>
-        IfdTags = 1,
-
-        /// <summary>
-        /// ExifTags
-        /// </summary>
-        ExifTags = 4,
-
-        /// <summary>
-        /// GPSTags
-        /// </summary>
-        GPSTags = 8,
-
-        /// <summary>
-        /// All
-        /// </summary>
-        All = IfdTags | ExifTags | GPSTags
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifProfile.cs b/src/ImageSharp46/Profiles/Exif/ExifProfile.cs
deleted file mode 100644
index 7694ef7c6..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifProfile.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-// <copyright file="ExifProfile.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-
-    /// <summary>
-    /// Represents an EXIF profile providing access to the collection of values.
-    /// </summary>
-    public sealed class ExifProfile
-    {
-        /// <summary>
-        /// The byte array to read the EXIF profile from.
-        /// </summary>
-        private readonly byte[] data;
-
-        /// <summary>
-        /// The collection of EXIF values
-        /// </summary>
-        private Collection<ExifValue> values;
-
-        /// <summary>
-        /// The list of invalid EXIF tags
-        /// </summary>
-        private List<ExifTag> invalidTags;
-
-        /// <summary>
-        /// The thumbnail offset position in the byte stream
-        /// </summary>
-        private int thumbnailOffset;
-
-        /// <summary>
-        /// The thumbnail length in the byte stream
-        /// </summary>
-        private int thumbnailLength;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExifProfile"/> class.
-        /// </summary>
-        public ExifProfile()
-            : this((byte[])null)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExifProfile"/> class.
-        /// </summary>
-        /// <param name="data">The byte array to read the EXIF profile from.</param>
-        public ExifProfile(byte[] data)
-        {
-            this.Parts = ExifParts.All;
-            this.data = data;
-            this.invalidTags = new List<ExifTag>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExifProfile"/> class
-        /// by making a copy from another EXIF profile.
-        /// </summary>
-        /// <param name="other">The other EXIF profile, where the clone should be made from.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public ExifProfile(ExifProfile other)
-        {
-            Guard.NotNull(other, nameof(other));
-
-            this.Parts = other.Parts;
-            this.thumbnailLength = other.thumbnailLength;
-            this.thumbnailOffset = other.thumbnailOffset;
-            this.invalidTags = new List<ExifTag>(other.invalidTags);
-            if (other.values != null)
-            {
-                this.values = new Collection<ExifValue>();
-                foreach (ExifValue value in other.values)
-                {
-                    this.values.Add(new ExifValue(value));
-                }
-            }
-            else
-            {
-                this.data = other.data;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets which parts will be written when the profile is added to an image.
-        /// </summary>
-        public ExifParts Parts
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets the tags that where found but contained an invalid value.
-        /// </summary>
-        public IEnumerable<ExifTag> InvalidTags => this.invalidTags;
-
-        /// <summary>
-        /// Gets the values of this EXIF profile.
-        /// </summary>
-        public IEnumerable<ExifValue> Values
-        {
-            get
-            {
-                this.InitializeValues();
-                return this.values;
-            }
-        }
-
-        /// <summary>
-        /// Returns the thumbnail in the EXIF profile when available.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        public Image<TColor, TPacked> CreateThumbnail<TColor, TPacked>()
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            this.InitializeValues();
-
-            if (this.thumbnailOffset == 0 || this.thumbnailLength == 0)
-            {
-                return null;
-            }
-
-            if (this.data.Length < (this.thumbnailOffset + this.thumbnailLength))
-            {
-                return null;
-            }
-
-            using (MemoryStream memStream = new MemoryStream(this.data, this.thumbnailOffset, this.thumbnailLength))
-            {
-                return new Image<TColor, TPacked>(memStream);
-            }
-        }
-
-        /// <summary>
-        /// Returns the value with the specified tag.
-        /// </summary>
-        /// <param name="tag">The tag of the EXIF value.</param>
-        public ExifValue GetValue(ExifTag tag)
-        {
-            foreach (ExifValue exifValue in this.Values)
-            {
-                if (exifValue.Tag == tag)
-                {
-                    return exifValue;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Removes the value with the specified tag.
-        /// </summary>
-        /// <param name="tag">The tag of the EXIF value.</param>
-        public bool RemoveValue(ExifTag tag)
-        {
-            this.InitializeValues();
-
-            for (int i = 0; i < this.values.Count; i++)
-            {
-                if (this.values[i].Tag == tag)
-                {
-                    this.values.RemoveAt(i);
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Sets the value of the specified tag.
-        /// </summary>
-        /// <param name="tag">The tag of the EXIF value.</param>
-        /// <param name="value">The value.</param>
-        public void SetValue(ExifTag tag, object value)
-        {
-            foreach (ExifValue exifValue in this.Values)
-            {
-                if (exifValue.Tag == tag)
-                {
-                    exifValue.Value = value;
-                    return;
-                }
-            }
-
-            ExifValue newExifValue = ExifValue.Create(tag, value);
-            this.values.Add(newExifValue);
-        }
-
-        /// <summary>
-        /// Converts this instance to a byte array.
-        /// </summary>
-        /// <returns>The <see cref="T:byte[]"/></returns>
-        public byte[] ToByteArray()
-        {
-            if (this.values == null)
-            {
-                return this.data;
-            }
-
-            if (this.values.Count == 0)
-            {
-                return null;
-            }
-
-            ExifWriter writer = new ExifWriter(this.values, this.Parts);
-            return writer.GetData();
-        }
-
-        private void InitializeValues()
-        {
-            if (this.values != null)
-            {
-                return;
-            }
-
-            if (this.data == null)
-            {
-                this.values = new Collection<ExifValue>();
-                return;
-            }
-
-            ExifReader reader = new ExifReader();
-            this.values = reader.Read(this.data);
-            this.invalidTags = new List<ExifTag>(reader.InvalidTags);
-            this.thumbnailOffset = (int)reader.ThumbnailOffset;
-            this.thumbnailLength = (int)reader.ThumbnailLength;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifReader.cs b/src/ImageSharp46/Profiles/Exif/ExifReader.cs
deleted file mode 100644
index eef6f6f3a..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifReader.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-// <copyright file="ExifReader.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Linq;
-    using System.Text;
-
-    /// <summary>
-    /// Reads and parses EXIF data from a byte array
-    /// </summary>
-    internal sealed class ExifReader
-    {
-        private delegate TDataType ConverterMethod<TDataType>(byte[] data);
-
-        private readonly Collection<ExifTag> invalidTags = new Collection<ExifTag>();
-        private byte[] exifData;
-        private uint currentIndex;
-        private bool isLittleEndian;
-        private uint exifOffset;
-        private uint gpsOffset;
-        private uint startIndex;
-
-        /// <summary>
-        /// Gets the thumbnail length in the byte stream
-        /// </summary>
-        public uint ThumbnailLength
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the thumbnail offset position in the byte stream
-        /// </summary>
-        public uint ThumbnailOffset
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the remaining length.
-        /// </summary>
-        private int RemainingLength
-        {
-            get
-            {
-                if (this.currentIndex >= this.exifData.Length)
-                {
-                    return 0;
-                }
-
-                return this.exifData.Length - (int)this.currentIndex;
-            }
-        }
-
-        /// <summary>
-        /// Reads and returns the collection of EXIF values.
-        /// </summary>
-        /// <param name="data">The data.</param>
-        /// <returns>
-        /// The <see cref="Collection{ExifValue}"/>.
-        /// </returns>
-        public Collection<ExifValue> Read(byte[] data)
-        {
-            Collection<ExifValue> result = new Collection<ExifValue>();
-
-            this.exifData = data;
-
-            if (this.GetString(4) == "Exif")
-            {
-                if (this.GetShort() != 0)
-                {
-                    return result;
-                }
-
-                this.startIndex = 6;
-            }
-            else
-            {
-                this.currentIndex = 0;
-            }
-
-            this.isLittleEndian = this.GetString(2) == "II";
-
-            if (this.GetShort() != 0x002A)
-            {
-                return result;
-            }
-
-            uint ifdOffset = this.GetLong();
-            this.AddValues(result, ifdOffset);
-
-            uint thumbnailOffset = this.GetLong();
-            this.GetThumbnail(thumbnailOffset);
-
-            if (this.exifOffset != 0)
-            {
-                this.AddValues(result, this.exifOffset);
-            }
-
-            if (this.gpsOffset != 0)
-            {
-                this.AddValues(result, this.gpsOffset);
-            }
-
-            return result;
-        }
-
-        public IEnumerable<ExifTag> InvalidTags => this.invalidTags;
-
-        private void AddValues(Collection<ExifValue> values, uint index)
-        {
-            this.currentIndex = this.startIndex + index;
-            ushort count = this.GetShort();
-
-            for (ushort i = 0; i < count; i++)
-            {
-                ExifValue value = this.CreateValue();
-                if (value == null)
-                {
-                    continue;
-                }
-
-                bool duplicate = false;
-                foreach (ExifValue val in values)
-                {
-                    if (val.Tag == value.Tag)
-                    {
-                        duplicate = true;
-                        break;
-                    }
-                }
-
-                if (duplicate)
-                {
-                    continue;
-                }
-
-                if (value.Tag == ExifTag.SubIFDOffset)
-                {
-                    if (value.DataType == ExifDataType.Long)
-                    {
-                        this.exifOffset = (uint)value.Value;
-                    }
-                }
-                else if (value.Tag == ExifTag.GPSIFDOffset)
-                {
-                    if (value.DataType == ExifDataType.Long)
-                    {
-                        this.gpsOffset = (uint)value.Value;
-                    }
-                }
-                else
-                {
-                    values.Add(value);
-                }
-            }
-        }
-
-        private object ConvertValue(ExifDataType dataType, byte[] data, uint numberOfComponents)
-        {
-            if (data == null || data.Length == 0)
-            {
-                return null;
-            }
-
-            switch (dataType)
-            {
-                case ExifDataType.Unknown:
-                    return null;
-                case ExifDataType.Ascii:
-                    return ToString(data);
-                case ExifDataType.Byte:
-                    if (numberOfComponents == 1)
-                    {
-                        return ToByte(data);
-                    }
-
-                    return data;
-                case ExifDataType.DoubleFloat:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToDouble(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToDouble);
-                case ExifDataType.Long:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToLong(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToLong);
-                case ExifDataType.Rational:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToRational(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToRational);
-                case ExifDataType.Short:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToShort(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToShort);
-                case ExifDataType.SignedByte:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToSignedByte(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToSignedByte);
-                case ExifDataType.SignedLong:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToSignedLong(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToSignedLong);
-                case ExifDataType.SignedRational:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToSignedRational(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToSignedRational);
-                case ExifDataType.SignedShort:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToSignedShort(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToSignedShort);
-                case ExifDataType.SingleFloat:
-                    if (numberOfComponents == 1)
-                    {
-                        return this.ToSingle(data);
-                    }
-
-                    return ToArray(dataType, data, this.ToSingle);
-                case ExifDataType.Undefined:
-                    if (numberOfComponents == 1)
-                    {
-                        return ToByte(data);
-                    }
-
-                    return data;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        private ExifValue CreateValue()
-        {
-            if (this.RemainingLength < 12)
-            {
-                return null;
-            }
-
-            ExifTag tag = this.ToEnum(this.GetShort(), ExifTag.Unknown);
-            ExifDataType dataType = this.ToEnum(this.GetShort(), ExifDataType.Unknown);
-            object value;
-
-            if (dataType == ExifDataType.Unknown)
-            {
-                return new ExifValue(tag, dataType, null, false);
-            }
-
-            uint numberOfComponents = this.GetLong();
-
-            uint size = numberOfComponents * ExifValue.GetSize(dataType);
-            byte[] data = this.GetBytes(4);
-
-            if (size > 4)
-            {
-                uint oldIndex = this.currentIndex;
-                this.currentIndex = this.ToLong(data) + this.startIndex;
-                if (this.RemainingLength < size)
-                {
-                    this.invalidTags.Add(tag);
-                    this.currentIndex = oldIndex;
-                    return null;
-                }
-
-                value = this.ConvertValue(dataType, this.GetBytes(size), numberOfComponents);
-                this.currentIndex = oldIndex;
-            }
-            else
-            {
-                value = this.ConvertValue(dataType, data, numberOfComponents);
-            }
-
-            bool isArray = value != null && numberOfComponents > 1;
-            return new ExifValue(tag, dataType, value, isArray);
-        }
-
-        private TEnum ToEnum<TEnum>(int value, TEnum defaultValue)
-            where TEnum : struct
-        {
-            TEnum enumValue = (TEnum)(object)value;
-            if (Enum.GetValues(typeof(TEnum)).Cast<TEnum>().Any(v => v.Equals(enumValue)))
-            {
-                return enumValue;
-            }
-
-            return defaultValue;
-        }
-
-        private byte[] GetBytes(uint length)
-        {
-            if (this.currentIndex + length > (uint)this.exifData.Length)
-            {
-                return null;
-            }
-
-            byte[] data = new byte[length];
-            Array.Copy(this.exifData, (int)this.currentIndex, data, 0, (int)length);
-            this.currentIndex += length;
-
-            return data;
-        }
-
-        private uint GetLong()
-        {
-            return this.ToLong(this.GetBytes(4));
-        }
-
-        private ushort GetShort()
-        {
-            return this.ToShort(this.GetBytes(2));
-        }
-
-        private string GetString(uint length)
-        {
-            return ToString(this.GetBytes(length));
-        }
-
-        private void GetThumbnail(uint offset)
-        {
-            Collection<ExifValue> values = new Collection<ExifValue>();
-            this.AddValues(values, offset);
-
-            foreach (ExifValue value in values)
-            {
-                if (value.Tag == ExifTag.JPEGInterchangeFormat && (value.DataType == ExifDataType.Long))
-                {
-                    this.ThumbnailOffset = (uint)value.Value + this.startIndex;
-                }
-                else if (value.Tag == ExifTag.JPEGInterchangeFormatLength && value.DataType == ExifDataType.Long)
-                {
-                    this.ThumbnailLength = (uint)value.Value;
-                }
-            }
-        }
-
-        private static TDataType[] ToArray<TDataType>(ExifDataType dataType, byte[] data, ConverterMethod<TDataType> converter)
-        {
-            int dataTypeSize = (int)ExifValue.GetSize(dataType);
-            int length = data.Length / dataTypeSize;
-
-            TDataType[] result = new TDataType[length];
-            byte[] buffer = new byte[dataTypeSize];
-
-            for (int i = 0; i < length; i++)
-            {
-                Array.Copy(data, i * dataTypeSize, buffer, 0, dataTypeSize);
-
-                result.SetValue(converter(buffer), i);
-            }
-
-            return result;
-        }
-
-        private static byte ToByte(byte[] data)
-        {
-            return data[0];
-        }
-
-        private double ToDouble(byte[] data)
-        {
-            if (!this.ValidateArray(data, 8))
-            {
-                return default(double);
-            }
-
-            return BitConverter.ToDouble(data, 0);
-        }
-
-        private uint ToLong(byte[] data)
-        {
-            if (!this.ValidateArray(data, 4))
-            {
-                return default(uint);
-            }
-
-            return BitConverter.ToUInt32(data, 0);
-        }
-
-        private ushort ToShort(byte[] data)
-        {
-            if (!this.ValidateArray(data, 2))
-            {
-                return default(ushort);
-            }
-
-            return BitConverter.ToUInt16(data, 0);
-        }
-
-        private float ToSingle(byte[] data)
-        {
-            if (!this.ValidateArray(data, 4))
-            {
-                return default(float);
-            }
-
-            return BitConverter.ToSingle(data, 0);
-        }
-
-        private static string ToString(byte[] data)
-        {
-            string result = Encoding.UTF8.GetString(data, 0, data.Length);
-            int nullCharIndex = result.IndexOf('\0');
-            if (nullCharIndex != -1)
-            {
-                result = result.Substring(0, nullCharIndex);
-            }
-
-            return result;
-        }
-
-        private Rational ToRational(byte[] data)
-        {
-            if (!this.ValidateArray(data, 8, 4))
-            {
-                return default(Rational);
-            }
-
-            uint numerator = BitConverter.ToUInt32(data, 0);
-            uint denominator = BitConverter.ToUInt32(data, 4);
-
-            return new Rational(numerator, denominator, false);
-        }
-
-        private sbyte ToSignedByte(byte[] data)
-        {
-            return unchecked((sbyte)data[0]);
-        }
-
-        private int ToSignedLong(byte[] data)
-        {
-            if (!this.ValidateArray(data, 4))
-            {
-                return default(int);
-            }
-
-            return BitConverter.ToInt32(data, 0);
-        }
-
-        private SignedRational ToSignedRational(byte[] data)
-        {
-            if (!this.ValidateArray(data, 8, 4))
-            {
-                return default(SignedRational);
-            }
-
-            int numerator = BitConverter.ToInt32(data, 0);
-            int denominator = BitConverter.ToInt32(data, 4);
-
-            return new SignedRational(numerator, denominator, false);
-        }
-
-        private short ToSignedShort(byte[] data)
-        {
-            if (!this.ValidateArray(data, 2))
-            {
-                return default(short);
-            }
-
-            return BitConverter.ToInt16(data, 0);
-        }
-
-        private bool ValidateArray(byte[] data, int size)
-        {
-            return this.ValidateArray(data, size, size);
-        }
-
-        private bool ValidateArray(byte[] data, int size, int stepSize)
-        {
-            if (data == null || data.Length < size)
-            {
-                return false;
-            }
-
-            if (this.isLittleEndian == BitConverter.IsLittleEndian)
-            {
-                return true;
-            }
-
-            for (int i = 0; i < data.Length; i += stepSize)
-            {
-                Array.Reverse(data, i, stepSize);
-            }
-
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifTag.cs b/src/ImageSharp46/Profiles/Exif/ExifTag.cs
deleted file mode 100644
index 43f725f0c..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifTag.cs
+++ /dev/null
@@ -1,1547 +0,0 @@
-// <copyright file="ExifTag.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-// Descriptions from: http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// All exif tags from the Exif standard 2.2
-    /// </summary>
-    public enum ExifTag
-    {
-        /// <summary>
-        /// Unknown
-        /// </summary>
-        Unknown = 0xFFFF,
-
-        /// <summary>
-        /// SubIFDOffset
-        /// </summary>
-        SubIFDOffset = 0x8769,
-
-        /// <summary>
-        /// GPSIFDOffset
-        /// </summary>
-        GPSIFDOffset = 0x8825,
-
-        /// <summary>
-        /// SubfileType
-        /// </summary>
-        [ExifTagDescription((uint)0, "Full-resolution Image")]
-        [ExifTagDescription((uint)1, "Reduced-resolution image")]
-        [ExifTagDescription((uint)2, "Single page of multi-page image")]
-        [ExifTagDescription((uint)3, "Single page of multi-page reduced-resolution image")]
-        [ExifTagDescription((uint)4, "Transparency mask")]
-        [ExifTagDescription((uint)5, "Transparency mask of reduced-resolution image")]
-        [ExifTagDescription((uint)6, "Transparency mask of multi-page image")]
-        [ExifTagDescription((uint)7, "Transparency mask of reduced-resolution multi-page image")]
-        [ExifTagDescription((uint)0x10001, "Alternate reduced-resolution image ")]
-        SubfileType = 0x00FE,
-
-        /// <summary>
-        /// OldSubfileType
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Full-resolution Image")]
-        [ExifTagDescription((ushort)2, "Reduced-resolution image")]
-        [ExifTagDescription((ushort)3, "Single page of multi-page image")]
-        OldSubfileType = 0x00FF,
-
-        /// <summary>
-        /// ImageWidth
-        /// </summary>
-        ImageWidth = 0x0100,
-
-        /// <summary>
-        /// ImageLength
-        /// </summary>
-        ImageLength = 0x0101,
-
-        /// <summary>
-        /// BitsPerSample
-        /// </summary>
-        BitsPerSample = 0x0102,
-
-        /// <summary>
-        /// Compression
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Uncompressed")]
-        [ExifTagDescription((ushort)2, "CCITT 1D")]
-        [ExifTagDescription((ushort)3, "T4/Group 3 Fax")]
-        [ExifTagDescription((ushort)4, "T6/Group 4 Fax")]
-        [ExifTagDescription((ushort)5, "LZW")]
-        [ExifTagDescription((ushort)6, "JPEG (old-style)")]
-        [ExifTagDescription((ushort)7, "JPEG")]
-        [ExifTagDescription((ushort)8, "Adobe Deflate")]
-        [ExifTagDescription((ushort)9, "JBIG B&W")]
-        [ExifTagDescription((ushort)10, "JBIG Color")]
-        [ExifTagDescription((ushort)99, "JPEG")]
-        [ExifTagDescription((ushort)262, "Kodak 262")]
-        [ExifTagDescription((ushort)32766, "Next")]
-        [ExifTagDescription((ushort)32767, "Sony ARW Compressed")]
-        [ExifTagDescription((ushort)32769, "Packed RAW")]
-        [ExifTagDescription((ushort)32770, "Samsung SRW Compressed")]
-        [ExifTagDescription((ushort)32771, "CCIRLEW")]
-        [ExifTagDescription((ushort)32772, "Samsung SRW Compressed 2")]
-        [ExifTagDescription((ushort)32773, "PackBits")]
-        [ExifTagDescription((ushort)32809, "Thunderscan")]
-        [ExifTagDescription((ushort)32867, "Kodak KDC Compressed")]
-        [ExifTagDescription((ushort)32895, "IT8CTPAD")]
-        [ExifTagDescription((ushort)32896, "IT8LW")]
-        [ExifTagDescription((ushort)32897, "IT8MP")]
-        [ExifTagDescription((ushort)32898, "IT8BL")]
-        [ExifTagDescription((ushort)32908, "PixarFilm")]
-        [ExifTagDescription((ushort)32909, "PixarLog")]
-        [ExifTagDescription((ushort)32946, "Deflate")]
-        [ExifTagDescription((ushort)32947, "DCS")]
-        [ExifTagDescription((ushort)34661, "JBIG")]
-        [ExifTagDescription((ushort)34676, "SGILog")]
-        [ExifTagDescription((ushort)34677, "SGILog24")]
-        [ExifTagDescription((ushort)34712, "JPEG 2000")]
-        [ExifTagDescription((ushort)34713, "Nikon NEF Compressed")]
-        [ExifTagDescription((ushort)34715, "JBIG2 TIFF FX")]
-        [ExifTagDescription((ushort)34718, "Microsoft Document Imaging (MDI) Binary Level Codec")]
-        [ExifTagDescription((ushort)34719, "Microsoft Document Imaging (MDI) Progressive Transform Codec")]
-        [ExifTagDescription((ushort)34720, "Microsoft Document Imaging (MDI) Vector")]
-        [ExifTagDescription((ushort)34892, "Lossy JPEG")]
-        [ExifTagDescription((ushort)65000, "Kodak DCR Compressed")]
-        [ExifTagDescription((ushort)65535, "Pentax PEF Compressed")]
-        Compression = 0x0103,
-
-        /// <summary>
-        /// PhotometricInterpretation
-        /// </summary>
-        [ExifTagDescription((ushort)0, "WhiteIsZero")]
-        [ExifTagDescription((ushort)1, "BlackIsZero")]
-        [ExifTagDescription((ushort)2, "RGB")]
-        [ExifTagDescription((ushort)3, "RGB Palette")]
-        [ExifTagDescription((ushort)4, "Transparency Mask")]
-        [ExifTagDescription((ushort)5, "CMYK")]
-        [ExifTagDescription((ushort)6, "YCbCr")]
-        [ExifTagDescription((ushort)8, "CIELab")]
-        [ExifTagDescription((ushort)9, "ICCLab")]
-        [ExifTagDescription((ushort)10, "TULab")]
-        [ExifTagDescription((ushort)32803, "Color Filter Array")]
-        [ExifTagDescription((ushort)32844, "Pixar LogL")]
-        [ExifTagDescription((ushort)32845, "Pixar LogLuv")]
-        [ExifTagDescription((ushort)34892, "Linear Raw")]
-        PhotometricInterpretation = 0x0106,
-
-        /// <summary>
-        /// Thresholding
-        /// </summary>
-        [ExifTagDescription((ushort)1, "No dithering or halftoning")]
-        [ExifTagDescription((ushort)2, "Ordered dither or halftone")]
-        [ExifTagDescription((ushort)3, "Randomized dither")]
-        Thresholding = 0x0107,
-
-        /// <summary>
-        /// CellWidth
-        /// </summary>
-        CellWidth = 0x0108,
-
-        /// <summary>
-        /// CellLength
-        /// </summary>
-        CellLength = 0x0109,
-
-        /// <summary>
-        /// FillOrder
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Normal")]
-        [ExifTagDescription((ushort)2, "Reversed")]
-        FillOrder = 0x010A,
-
-        /// <summary>
-        /// DocumentName
-        /// </summary>
-        DocumentName = 0x010D,
-
-        /// <summary>
-        /// ImageDescription
-        /// </summary>
-        ImageDescription = 0x010E,
-
-        /// <summary>
-        /// Make
-        /// </summary>
-        Make = 0x010F,
-
-        /// <summary>
-        /// Model
-        /// </summary>
-        Model = 0x0110,
-
-        /// <summary>
-        /// StripOffsets
-        /// </summary>
-        StripOffsets = 0x0111,
-
-        /// <summary>
-        /// Orientation
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Horizontal (normal)")]
-        [ExifTagDescription((ushort)2, "Mirror horizontal")]
-        [ExifTagDescription((ushort)3, "Rotate 180")]
-        [ExifTagDescription((ushort)4, "Mirror vertical")]
-        [ExifTagDescription((ushort)5, "Mirror horizontal and rotate 270 CW")]
-        [ExifTagDescription((ushort)6, "Rotate 90 CW")]
-        [ExifTagDescription((ushort)7, "Mirror horizontal and rotate 90 CW")]
-        [ExifTagDescription((ushort)8, "Rotate 270 CW")]
-        Orientation = 0x0112,
-
-        /// <summary>
-        /// SamplesPerPixel
-        /// </summary>
-        SamplesPerPixel = 0x0115,
-
-        /// <summary>
-        /// RowsPerStrip
-        /// </summary>
-        RowsPerStrip = 0x0116,
-
-        /// <summary>
-        /// StripByteCounts
-        /// </summary>
-        StripByteCounts = 0x0117,
-
-        /// <summary>
-        /// MinSampleValue
-        /// </summary>
-        MinSampleValue = 0x0118,
-
-        /// <summary>
-        /// MaxSampleValue
-        /// </summary>
-        MaxSampleValue = 0x0119,
-
-        /// <summary>
-        /// XResolution
-        /// </summary>
-        XResolution = 0x011A,
-
-        /// <summary>
-        /// YResolution
-        /// </summary>
-        YResolution = 0x011B,
-
-        /// <summary>
-        /// PlanarConfiguration
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Chunky")]
-        [ExifTagDescription((ushort)2, "Planar")]
-        PlanarConfiguration = 0x011C,
-
-        /// <summary>
-        /// PageName
-        /// </summary>
-        PageName = 0x011D,
-
-        /// <summary>
-        /// XPosition
-        /// </summary>
-        XPosition = 0x011E,
-
-        /// <summary>
-        /// YPosition
-        /// </summary>
-        YPosition = 0x011F,
-
-        /// <summary>
-        /// FreeOffsets
-        /// </summary>
-        FreeOffsets = 0x0120,
-
-        /// <summary>
-        /// FreeByteCounts
-        /// </summary>
-        FreeByteCounts = 0x0121,
-
-        /// <summary>
-        /// GrayResponseUnit
-        /// </summary>
-        [ExifTagDescription((ushort)1, "0.1")]
-        [ExifTagDescription((ushort)2, "0.001")]
-        [ExifTagDescription((ushort)3, "0.0001")]
-        [ExifTagDescription((ushort)4, "1e-05")]
-        [ExifTagDescription((ushort)5, "1e-06")]
-        GrayResponseUnit = 0x0122,
-
-        /// <summary>
-        /// GrayResponseCurve
-        /// </summary>
-        GrayResponseCurve = 0x0123,
-
-        /// <summary>
-        /// T4Options
-        /// </summary>
-        [ExifTagDescription((uint)0, "2-Dimensional encoding")]
-        [ExifTagDescription((uint)1, "Uncompressed")]
-        [ExifTagDescription((uint)2, "Fill bits added")]
-        T4Options = 0x0124,
-
-        /// <summary>
-        /// T6Options
-        /// </summary>
-        [ExifTagDescription((uint)1, "Uncompressed")]
-        T6Options = 0x0125,
-
-        /// <summary>
-        /// ResolutionUnit
-        /// </summary>
-        [ExifTagDescription((ushort)1, "None")]
-        [ExifTagDescription((ushort)2, "Inches")]
-        [ExifTagDescription((ushort)3, "Centimeter")]
-        ResolutionUnit = 0x0128,
-
-        /// <summary>
-        /// PageNumber
-        /// </summary>
-        PageNumber = 0x0129,
-
-        /// <summary>
-        /// ColorResponseUnit
-        /// </summary>
-        ColorResponseUnit = 0x012C,
-
-        /// <summary>
-        /// TransferFunction
-        /// </summary>
-        TransferFunction = 0x012D,
-
-        /// <summary>
-        /// Software
-        /// </summary>
-        Software = 0x0131,
-
-        /// <summary>
-        /// DateTime
-        /// </summary>
-        DateTime = 0x0132,
-
-        /// <summary>
-        /// Artist
-        /// </summary>
-        Artist = 0x013B,
-
-        /// <summary>
-        /// HostComputer
-        /// </summary>
-        HostComputer = 0x013C,
-
-        /// <summary>
-        /// Predictor
-        /// </summary>
-        Predictor = 0x013D,
-
-        /// <summary>
-        /// WhitePoint
-        /// </summary>
-        WhitePoint = 0x013E,
-
-        /// <summary>
-        /// PrimaryChromaticities
-        /// </summary>
-        PrimaryChromaticities = 0x013F,
-
-        /// <summary>
-        /// ColorMap
-        /// </summary>
-        ColorMap = 0x0140,
-
-        /// <summary>
-        /// HalftoneHints
-        /// </summary>
-        HalftoneHints = 0x0141,
-
-        /// <summary>
-        /// TileWidth
-        /// </summary>
-        TileWidth = 0x0142,
-
-        /// <summary>
-        /// TileLength
-        /// </summary>
-        TileLength = 0x0143,
-
-        /// <summary>
-        /// TileOffsets
-        /// </summary>
-        TileOffsets = 0x0144,
-
-        /// <summary>
-        /// TileByteCounts
-        /// </summary>
-        TileByteCounts = 0x0145,
-
-        /// <summary>
-        /// BadFaxLines
-        /// </summary>
-        BadFaxLines = 0x0146,
-
-        /// <summary>
-        /// CleanFaxData
-        /// </summary>
-        [ExifTagDescription((uint)0, "Clean")]
-        [ExifTagDescription((uint)1, "Regenerated")]
-        [ExifTagDescription((uint)2, "Unclean")]
-        CleanFaxData = 0x0147,
-
-        /// <summary>
-        /// ConsecutiveBadFaxLines
-        /// </summary>
-        ConsecutiveBadFaxLines = 0x0148,
-
-        /// <summary>
-        /// InkSet
-        /// </summary>
-        [ExifTagDescription((ushort)1, "CMYK")]
-        [ExifTagDescription((ushort)2, "Not CMYK")]
-        InkSet = 0x014C,
-
-        /// <summary>
-        /// InkNames
-        /// </summary>
-        InkNames = 0x014D,
-
-        /// <summary>
-        /// NumberOfInks
-        /// </summary>
-        NumberOfInks = 0x014E,
-
-        /// <summary>
-        /// DotRange
-        /// </summary>
-        DotRange = 0x0150,
-
-        /// <summary>
-        /// TargetPrinter
-        /// </summary>
-        TargetPrinter = 0x0151,
-
-        /// <summary>
-        /// ExtraSamples
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Unspecified")]
-        [ExifTagDescription((ushort)1, "Associated Alpha")]
-        [ExifTagDescription((ushort)2, "Unassociated Alpha")]
-        ExtraSamples = 0x0152,
-
-        /// <summary>
-        /// SampleFormat
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Unsigned")]
-        [ExifTagDescription((ushort)2, "Signed")]
-        [ExifTagDescription((ushort)3, "Float")]
-        [ExifTagDescription((ushort)4, "Undefined")]
-        [ExifTagDescription((ushort)5, "Complex int")]
-        [ExifTagDescription((ushort)6, "Complex float")]
-        SampleFormat = 0x0153,
-
-        /// <summary>
-        /// SMinSampleValue
-        /// </summary>
-        SMinSampleValue = 0x0154,
-
-        /// <summary>
-        /// SMaxSampleValue
-        /// </summary>
-        SMaxSampleValue = 0x0155,
-
-        /// <summary>
-        /// TransferRange
-        /// </summary>
-        TransferRange = 0x0156,
-
-        /// <summary>
-        /// ClipPath
-        /// </summary>
-        ClipPath = 0x0157,
-
-        /// <summary>
-        /// XClipPathUnits
-        /// </summary>
-        XClipPathUnits = 0x0158,
-
-        /// <summary>
-        /// YClipPathUnits
-        /// </summary>
-        YClipPathUnits = 0x0159,
-
-        /// <summary>
-        /// Indexed
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Not indexed")]
-        [ExifTagDescription((ushort)1, "Indexed")]
-        Indexed = 0x015A,
-
-        /// <summary>
-        /// JPEGTables
-        /// </summary>
-        JPEGTables = 0x015B,
-
-        /// <summary>
-        /// OPIProxy
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Higher resolution image does not exist")]
-        [ExifTagDescription((ushort)1, "Higher resolution image exists")]
-        OPIProxy = 0x015F,
-
-        /// <summary>
-        /// ProfileType
-        /// </summary>
-        [ExifTagDescription((uint)0, "Unspecified")]
-        [ExifTagDescription((uint)1, "Group 3 FAX")]
-        ProfileType = 0x0191,
-
-        /// <summary>
-        /// FaxProfile
-        /// </summary>
-        [ExifTagDescription((byte)0, "Unknown")]
-        [ExifTagDescription((byte)1, "Minimal B&W lossless, S")]
-        [ExifTagDescription((byte)2, "Extended B&W lossless, F")]
-        [ExifTagDescription((byte)3, "Lossless JBIG B&W, J")]
-        [ExifTagDescription((byte)4, "Lossy color and grayscale, C")]
-        [ExifTagDescription((byte)5, "Lossless color and grayscale, L")]
-        [ExifTagDescription((byte)6, "Mixed raster content, M")]
-        [ExifTagDescription((byte)7, "Profile T")]
-        [ExifTagDescription((byte)255, "Multi Profiles")]
-        FaxProfile = 0x0192,
-
-        /// <summary>
-        /// CodingMethods
-        /// </summary>
-        [ExifTagDescription((ulong)0, "Unspecified compression")]
-        [ExifTagDescription((ulong)1, "Modified Huffman")]
-        [ExifTagDescription((ulong)2, "Modified Read")]
-        [ExifTagDescription((ulong)4, "Modified MR")]
-        [ExifTagDescription((ulong)8, "JBIG")]
-        [ExifTagDescription((ulong)16, "Baseline JPEG")]
-        [ExifTagDescription((ulong)32, "JBIG color")]
-        CodingMethods = 0x0193,
-
-        /// <summary>
-        /// VersionYear
-        /// </summary>
-        VersionYear = 0x0194,
-
-        /// <summary>
-        /// ModeNumber
-        /// </summary>
-        ModeNumber = 0x0195,
-
-        /// <summary>
-        /// Decode
-        /// </summary>
-        Decode = 0x01B1,
-
-        /// <summary>
-        /// DefaultImageColor
-        /// </summary>
-        DefaultImageColor = 0x01B2,
-
-        /// <summary>
-        /// T82ptions
-        /// </summary>
-        T82ptions = 0x01B3,
-
-        /// <summary>
-        /// JPEGProc
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Baseline")]
-        [ExifTagDescription((ushort)14, "Lossless")]
-        JPEGProc = 0x0200,
-
-        /// <summary>
-        /// JPEGInterchangeFormat
-        /// </summary>
-        JPEGInterchangeFormat = 0x0201,
-
-        /// <summary>
-        /// JPEGInterchangeFormatLength
-        /// </summary>
-        JPEGInterchangeFormatLength = 0x0202,
-
-        /// <summary>
-        /// JPEGRestartInterval
-        /// </summary>
-        JPEGRestartInterval = 0x0203,
-
-        /// <summary>
-        /// JPEGLosslessPredictors
-        /// </summary>
-        JPEGLosslessPredictors = 0x0205,
-
-        /// <summary>
-        /// JPEGPointTransforms
-        /// </summary>
-        JPEGPointTransforms = 0x0206,
-
-        /// <summary>
-        /// JPEGQTables
-        /// </summary>
-        JPEGQTables = 0x0207,
-
-        /// <summary>
-        /// JPEGDCTables
-        /// </summary>
-        JPEGDCTables = 0x0208,
-
-        /// <summary>
-        /// JPEGACTables
-        /// </summary>
-        JPEGACTables = 0x0209,
-
-        /// <summary>
-        /// YCbCrCoefficients
-        /// </summary>
-        YCbCrCoefficients = 0x0211,
-
-        /// <summary>
-        /// YCbCrSubsampling
-        /// </summary>
-        YCbCrSubsampling = 0x0212,
-
-        /// <summary>
-        /// YCbCrPositioning
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Centered")]
-        [ExifTagDescription((ushort)2, "Co-sited")]
-        YCbCrPositioning = 0x0213,
-
-        /// <summary>
-        /// ReferenceBlackWhite
-        /// </summary>
-        ReferenceBlackWhite = 0x0214,
-
-        /// <summary>
-        /// StripRowCounts
-        /// </summary>
-        StripRowCounts = 0x022F,
-
-        /// <summary>
-        /// XMP
-        /// </summary>
-        XMP = 0x02BC,
-
-        /// <summary>
-        /// Rating
-        /// </summary>
-        Rating = 0x4746,
-
-        /// <summary>
-        /// RatingPercent
-        /// </summary>
-        RatingPercent = 0x4749,
-
-        /// <summary>
-        /// ImageID
-        /// </summary>
-        ImageID = 0x800D,
-
-        /// <summary>
-        /// CFARepeatPatternDim
-        /// </summary>
-        CFARepeatPatternDim = 0x828D,
-
-        /// <summary>
-        /// CFAPattern2
-        /// </summary>
-        CFAPattern2 = 0x828E,
-
-        /// <summary>
-        /// BatteryLevel
-        /// </summary>
-        BatteryLevel = 0x828F,
-
-        /// <summary>
-        /// Copyright
-        /// </summary>
-        Copyright = 0x8298,
-
-        /// <summary>
-        /// ExposureTime
-        /// </summary>
-        ExposureTime = 0x829A,
-
-        /// <summary>
-        /// FNumber
-        /// </summary>
-        FNumber = 0x829D,
-
-        /// <summary>
-        /// MDFileTag
-        /// </summary>
-        MDFileTag = 0x82A5,
-
-        /// <summary>
-        /// MDScalePixel
-        /// </summary>
-        MDScalePixel = 0x82A6,
-
-        /// <summary>
-        /// MDLabName
-        /// </summary>
-        MDLabName = 0x82A8,
-
-        /// <summary>
-        /// MDSampleInfo
-        /// </summary>
-        MDSampleInfo = 0x82A9,
-
-        /// <summary>
-        /// MDPrepDate
-        /// </summary>
-        MDPrepDate = 0x82AA,
-
-        /// <summary>
-        /// MDPrepTime
-        /// </summary>
-        MDPrepTime = 0x82AB,
-
-        /// <summary>
-        /// MDFileUnits
-        /// </summary>
-        MDFileUnits = 0x82AC,
-
-        /// <summary>
-        /// PixelScale
-        /// </summary>
-        PixelScale = 0x830E,
-
-        /// <summary>
-        /// IntergraphPacketData
-        /// </summary>
-        IntergraphPacketData = 0x847E,
-
-        /// <summary>
-        /// IntergraphRegisters
-        /// </summary>
-        IntergraphRegisters = 0x847F,
-
-        /// <summary>
-        /// IntergraphMatrix
-        /// </summary>
-        IntergraphMatrix = 0x8480,
-
-        /// <summary>
-        /// ModelTiePoint
-        /// </summary>
-        ModelTiePoint = 0x8482,
-
-        /// <summary>
-        /// SEMInfo
-        /// </summary>
-        SEMInfo = 0x8546,
-
-        /// <summary>
-        /// ModelTransform
-        /// </summary>
-        ModelTransform = 0x85D8,
-
-        /// <summary>
-        /// ImageLayer
-        /// </summary>
-        ImageLayer = 0x87AC,
-
-        /// <summary>
-        /// ExposureProgram
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Not Defined")]
-        [ExifTagDescription((ushort)1, "Manual")]
-        [ExifTagDescription((ushort)2, "Program AE")]
-        [ExifTagDescription((ushort)3, "Aperture-priority AE")]
-        [ExifTagDescription((ushort)4, "Shutter speed priority AE")]
-        [ExifTagDescription((ushort)5, "Creative (Slow speed)")]
-        [ExifTagDescription((ushort)6, "Action (High speed)")]
-        [ExifTagDescription((ushort)7, "Portrait")]
-        [ExifTagDescription((ushort)8, "Landscape")]
-        [ExifTagDescription((ushort)9, "Bulb")]
-        ExposureProgram = 0x8822,
-
-        /// <summary>
-        /// SpectralSensitivity
-        /// </summary>
-        SpectralSensitivity = 0x8824,
-
-        /// <summary>
-        /// ISOSpeedRatings
-        /// </summary>
-        ISOSpeedRatings = 0x8827,
-
-        /// <summary>
-        /// OECF
-        /// </summary>
-        OECF = 0x8828,
-
-        /// <summary>
-        /// Interlace
-        /// </summary>
-        Interlace = 0x8829,
-
-        /// <summary>
-        /// TimeZoneOffset
-        /// </summary>
-        TimeZoneOffset = 0x882A,
-
-        /// <summary>
-        /// SelfTimerMode
-        /// </summary>
-        SelfTimerMode = 0x882B,
-
-        /// <summary>
-        /// SensitivityType
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Unknown")]
-        [ExifTagDescription((ushort)1, "Standard Output Sensitivity")]
-        [ExifTagDescription((ushort)2, "Recommended Exposure Index")]
-        [ExifTagDescription((ushort)3, "ISO Speed")]
-        [ExifTagDescription((ushort)4, "Standard Output Sensitivity and Recommended Exposure Index")]
-        [ExifTagDescription((ushort)5, "Standard Output Sensitivity and ISO Speed")]
-        [ExifTagDescription((ushort)6, "Recommended Exposure Index and ISO Speed")]
-        [ExifTagDescription((ushort)7, "Standard Output Sensitivity, Recommended Exposure Index and ISO Speed")]
-        SensitivityType = 0x8830,
-
-        /// <summary>
-        /// StandardOutputSensitivity
-        /// </summary>
-        StandardOutputSensitivity = 0x8831,
-
-        /// <summary>
-        /// RecommendedExposureIndex
-        /// </summary>
-        RecommendedExposureIndex = 0x8832,
-
-        /// <summary>
-        /// ISOSpeed
-        /// </summary>
-        ISOSpeed = 0x8833,
-
-        /// <summary>
-        /// ISOSpeedLatitudeyyy
-        /// </summary>
-        ISOSpeedLatitudeyyy = 0x8834,
-
-        /// <summary>
-        /// ISOSpeedLatitudezzz
-        /// </summary>
-        ISOSpeedLatitudezzz = 0x8835,
-
-        /// <summary>
-        /// FaxRecvParams
-        /// </summary>
-        FaxRecvParams = 0x885C,
-
-        /// <summary>
-        /// FaxSubaddress
-        /// </summary>
-        FaxSubaddress = 0x885D,
-
-        /// <summary>
-        /// FaxRecvTime
-        /// </summary>
-        FaxRecvTime = 0x885E,
-
-        /// <summary>
-        /// ExifVersion
-        /// </summary>
-        ExifVersion = 0x9000,
-
-        /// <summary>
-        /// DateTimeOriginal
-        /// </summary>
-        DateTimeOriginal = 0x9003,
-
-        /// <summary>
-        /// DateTimeDigitized
-        /// </summary>
-        DateTimeDigitized = 0x9004,
-
-        /// <summary>
-        /// OffsetTime
-        /// </summary>
-        OffsetTime = 0x9010,
-
-        /// <summary>
-        /// OffsetTimeOriginal
-        /// </summary>
-        OffsetTimeOriginal = 0x9011,
-
-        /// <summary>
-        /// OffsetTimeDigitized
-        /// </summary>
-        OffsetTimeDigitized = 0x9012,
-
-        /// <summary>
-        /// ComponentsConfiguration
-        /// </summary>
-        ComponentsConfiguration = 0x9101,
-
-        /// <summary>
-        /// CompressedBitsPerPixel
-        /// </summary>
-        CompressedBitsPerPixel = 0x9102,
-
-        /// <summary>
-        /// ShutterSpeedValue
-        /// </summary>
-        ShutterSpeedValue = 0x9201,
-
-        /// <summary>
-        /// ApertureValue
-        /// </summary>
-        ApertureValue = 0x9202,
-
-        /// <summary>
-        /// BrightnessValue
-        /// </summary>
-        BrightnessValue = 0x9203,
-
-        /// <summary>
-        /// ExposureBiasValue
-        /// </summary>
-        ExposureBiasValue = 0x9204,
-
-        /// <summary>
-        /// MaxApertureValue
-        /// </summary>
-        MaxApertureValue = 0x9205,
-
-        /// <summary>
-        /// SubjectDistance
-        /// </summary>
-        SubjectDistance = 0x9206,
-
-        /// <summary>
-        /// MeteringMode
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Unknown")]
-        [ExifTagDescription((ushort)1, "Average")]
-        [ExifTagDescription((ushort)2, "Center-weighted average")]
-        [ExifTagDescription((ushort)3, "Spot")]
-        [ExifTagDescription((ushort)4, "Multi-spot")]
-        [ExifTagDescription((ushort)5, "Multi-segment")]
-        [ExifTagDescription((ushort)6, "Partial")]
-        [ExifTagDescription((ushort)255, "Other")]
-        MeteringMode = 0x9207,
-
-        /// <summary>
-        /// LightSource
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Unknown")]
-        [ExifTagDescription((ushort)1, "Daylight")]
-        [ExifTagDescription((ushort)2, "Fluorescent")]
-        [ExifTagDescription((ushort)3, "Tungsten (Incandescent)")]
-        [ExifTagDescription((ushort)4, "Flash")]
-        [ExifTagDescription((ushort)9, "Fine Weather")]
-        [ExifTagDescription((ushort)10, "Cloudy")]
-        [ExifTagDescription((ushort)11, "Shade")]
-        [ExifTagDescription((ushort)12, "Daylight Fluorescent")]
-        [ExifTagDescription((ushort)13, "Day White Fluorescent")]
-        [ExifTagDescription((ushort)14, "Cool White Fluorescent")]
-        [ExifTagDescription((ushort)15, "White Fluorescent")]
-        [ExifTagDescription((ushort)16, "Warm White Fluorescent")]
-        [ExifTagDescription((ushort)17, "Standard Light A")]
-        [ExifTagDescription((ushort)18, "Standard Light B")]
-        [ExifTagDescription((ushort)19, "Standard Light C")]
-        [ExifTagDescription((ushort)20, "D55")]
-        [ExifTagDescription((ushort)21, "D65")]
-        [ExifTagDescription((ushort)22, "D75")]
-        [ExifTagDescription((ushort)23, "D50")]
-        [ExifTagDescription((ushort)24, "ISO Studio Tungsten")]
-        [ExifTagDescription((ushort)255, "Other")]
-        LightSource = 0x9208,
-
-        /// <summary>
-        /// Flash
-        /// </summary>
-        [ExifTagDescription((ushort)0, "No Flash")]
-        [ExifTagDescription((ushort)1, "Fired")]
-        [ExifTagDescription((ushort)5, "Fired, Return not detected")]
-        [ExifTagDescription((ushort)7, "Fired, Return detected")]
-        [ExifTagDescription((ushort)8, "On, Did not fire")]
-        [ExifTagDescription((ushort)9, "On, Fired")]
-        [ExifTagDescription((ushort)13, "On, Return not detected")]
-        [ExifTagDescription((ushort)15, "On, Return detected")]
-        [ExifTagDescription((ushort)16, "Off, Did not fire")]
-        [ExifTagDescription((ushort)20, "Off, Did not fire, Return not detected")]
-        [ExifTagDescription((ushort)24, "Auto, Did not fire")]
-        [ExifTagDescription((ushort)25, "Auto, Fired")]
-        [ExifTagDescription((ushort)29, "Auto, Fired, Return not detected")]
-        [ExifTagDescription((ushort)31, "Auto, Fired, Return detected")]
-        [ExifTagDescription((ushort)32, "No flash function")]
-        [ExifTagDescription((ushort)48, "Off, No flash function")]
-        [ExifTagDescription((ushort)65, "Fired, Red-eye reduction")]
-        [ExifTagDescription((ushort)69, "Fired, Red-eye reduction, Return not detected")]
-        [ExifTagDescription((ushort)71, "Fired, Red-eye reduction, Return detected")]
-        [ExifTagDescription((ushort)73, "On, Red-eye reduction")]
-        [ExifTagDescription((ushort)77, "On, Red-eye reduction, Return not detected")]
-        [ExifTagDescription((ushort)69, "On, Red-eye reduction, Return detected")]
-        [ExifTagDescription((ushort)80, "Off, Red-eye reduction")]
-        [ExifTagDescription((ushort)88, "Auto, Did not fire, Red-eye reduction")]
-        [ExifTagDescription((ushort)89, "Auto, Fired, Red-eye reduction")]
-        [ExifTagDescription((ushort)93, "Auto, Fired, Red-eye reduction, Return not detected")]
-        [ExifTagDescription((ushort)95, "Auto, Fired, Red-eye reduction, Return detected")]
-        Flash = 0x9209,
-
-        /// <summary>
-        /// FocalLength
-        /// </summary>
-        FocalLength = 0x920A,
-
-        /// <summary>
-        /// FlashEnergy2
-        /// </summary>
-        FlashEnergy2 = 0x920B,
-
-        /// <summary>
-        /// SpatialFrequencyResponse2
-        /// </summary>
-        SpatialFrequencyResponse2 = 0x920C,
-
-        /// <summary>
-        /// Noise
-        /// </summary>
-        Noise = 0x920D,
-
-        /// <summary>
-        /// FocalPlaneXResolution2
-        /// </summary>
-        FocalPlaneXResolution2 = 0x920E,
-
-        /// <summary>
-        /// FocalPlaneYResolution2
-        /// </summary>
-        FocalPlaneYResolution2 = 0x920F,
-
-        /// <summary>
-        /// FocalPlaneResolutionUnit2
-        /// </summary>
-        [ExifTagDescription((ushort)1, "None")]
-        [ExifTagDescription((ushort)2, "Inches")]
-        [ExifTagDescription((ushort)3, "Centimeter")]
-        [ExifTagDescription((ushort)4, "Millimeter")]
-        [ExifTagDescription((ushort)5, "Micrometer")]
-        FocalPlaneResolutionUnit2 = 0x9210,
-
-        /// <summary>
-        /// ImageNumber
-        /// </summary>
-        ImageNumber = 0x9211,
-
-        /// <summary>
-        /// SecurityClassification
-        /// </summary>
-        [ExifTagDescription("C", "Confidential")]
-        [ExifTagDescription("R", "Restricted")]
-        [ExifTagDescription("S", "Secret")]
-        [ExifTagDescription("T", "Top Secret")]
-        [ExifTagDescription("U", "Unclassified")]
-        SecurityClassification = 0x9212,
-
-        /// <summary>
-        /// ImageHistory
-        /// </summary>
-        ImageHistory = 0x9213,
-
-        /// <summary>
-        /// SubjectArea
-        /// </summary>
-        SubjectArea = 0x9214,
-
-        /// <summary>
-        /// ExposureIndex2
-        /// </summary>
-        ExposureIndex2 = 0x9215,
-
-        /// <summary>
-        /// TIFFEPStandardID
-        /// </summary>
-        TIFFEPStandardID = 0x9216,
-
-        /// <summary>
-        /// SensingMethod
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Not defined")]
-        [ExifTagDescription((ushort)2, "One-chip color area")]
-        [ExifTagDescription((ushort)3, "Two-chip color area")]
-        [ExifTagDescription((ushort)4, "Three-chip color area")]
-        [ExifTagDescription((ushort)5, "Color sequential area")]
-        [ExifTagDescription((ushort)7, "Trilinear")]
-        [ExifTagDescription((ushort)8, "Color sequential linear")]
-        SensingMethod2 = 0x9217,
-
-        /// <summary>
-        /// MakerNote
-        /// </summary>
-        MakerNote = 0x927C,
-
-        /// <summary>
-        /// UserComment
-        /// </summary>
-        UserComment = 0x9286,
-
-        /// <summary>
-        /// SubsecTime
-        /// </summary>
-        SubsecTime = 0x9290,
-
-        /// <summary>
-        /// SubsecTimeOriginal
-        /// </summary>
-        SubsecTimeOriginal = 0x9291,
-
-        /// <summary>
-        /// SubsecTimeDigitized
-        /// </summary>
-        SubsecTimeDigitized = 0x9292,
-
-        /// <summary>
-        /// ImageSourceData
-        /// </summary>
-        ImageSourceData = 0x935C,
-
-        /// <summary>
-        /// AmbientTemperature
-        /// </summary>
-        AmbientTemperature = 0x9400,
-
-        /// <summary>
-        /// Humidity
-        /// </summary>
-        Humidity = 0x9401,
-
-        /// <summary>
-        /// Pressure
-        /// </summary>
-        Pressure = 0x9402,
-
-        /// <summary>
-        /// WaterDepth
-        /// </summary>
-        WaterDepth = 0x9403,
-
-        /// <summary>
-        /// Acceleration
-        /// </summary>
-        Acceleration = 0x9404,
-
-        /// <summary>
-        /// CameraElevationAngle
-        /// </summary>
-        CameraElevationAngle = 0x9405,
-
-        /// <summary>
-        /// XPTitle
-        /// </summary>
-        XPTitle = 0x9C9B,
-
-        /// <summary>
-        /// XPComment
-        /// </summary>
-        XPComment = 0x9C9C,
-
-        /// <summary>
-        /// XPAuthor
-        /// </summary>
-        XPAuthor = 0x9C9D,
-
-        /// <summary>
-        /// XPKeywords
-        /// </summary>
-        XPKeywords = 0x9C9E,
-
-        /// <summary>
-        /// XPSubject
-        /// </summary>
-        XPSubject = 0x9C9F,
-
-        /// <summary>
-        /// FlashpixVersion
-        /// </summary>
-        FlashpixVersion = 0xA000,
-
-        /// <summary>
-        /// ColorSpace
-        /// </summary>
-        [ExifTagDescription((ushort)1, "sRGB")]
-        [ExifTagDescription((ushort)2, "Adobe RGB")]
-        [ExifTagDescription((ushort)4093, "Wide Gamut RGB")]
-        [ExifTagDescription((ushort)65534, "ICC Profile")]
-        [ExifTagDescription((ushort)65535, "Uncalibrated")]
-        ColorSpace = 0xA001,
-
-        /// <summary>
-        /// PixelXDimension
-        /// </summary>
-        PixelXDimension = 0xA002,
-
-        /// <summary>
-        /// PixelYDimension
-        /// </summary>
-        PixelYDimension = 0xA003,
-
-        /// <summary>
-        /// RelatedSoundFile
-        /// </summary>
-        RelatedSoundFile = 0xA004,
-
-        /// <summary>
-        /// FlashEnergy
-        /// </summary>
-        FlashEnergy = 0xA20B,
-
-        /// <summary>
-        /// SpatialFrequencyResponse
-        /// </summary>
-        SpatialFrequencyResponse = 0xA20C,
-
-        /// <summary>
-        /// FocalPlaneXResolution
-        /// </summary>
-        FocalPlaneXResolution = 0xA20E,
-
-        /// <summary>
-        /// FocalPlaneYResolution
-        /// </summary>
-        FocalPlaneYResolution = 0xA20F,
-
-        /// <summary>
-        /// FocalPlaneResolutionUnit
-        /// </summary>
-        [ExifTagDescription((ushort)1, "None")]
-        [ExifTagDescription((ushort)2, "Inches")]
-        [ExifTagDescription((ushort)3, "Centimeter")]
-        [ExifTagDescription((ushort)4, "Millimeter")]
-        [ExifTagDescription((ushort)5, "Micrometer")]
-        FocalPlaneResolutionUnit = 0xA210,
-
-        /// <summary>
-        /// SubjectLocation
-        /// </summary>
-        SubjectLocation = 0xA214,
-
-        /// <summary>
-        /// ExposureIndex
-        /// </summary>
-        ExposureIndex = 0xA215,
-
-        /// <summary>
-        /// SensingMethod
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Not defined")]
-        [ExifTagDescription((ushort)2, "One-chip color area")]
-        [ExifTagDescription((ushort)3, "Two-chip color area")]
-        [ExifTagDescription((ushort)4, "Three-chip color area")]
-        [ExifTagDescription((ushort)5, "Color sequential area")]
-        [ExifTagDescription((ushort)7, "Trilinear")]
-        [ExifTagDescription((ushort)8, "Color sequential linear")]
-        SensingMethod = 0xA217,
-
-        /// <summary>
-        /// FileSource
-        /// </summary>
-        FileSource = 0xA300,
-
-        /// <summary>
-        /// SceneType
-        /// </summary>
-        SceneType = 0xA301,
-
-        /// <summary>
-        /// CFAPattern
-        /// </summary>
-        CFAPattern = 0xA302,
-
-        /// <summary>
-        /// CustomRendered
-        /// </summary>
-        [ExifTagDescription((ushort)1, "Normal")]
-        [ExifTagDescription((ushort)2, "Custom")]
-        CustomRendered = 0xA401,
-
-        /// <summary>
-        /// ExposureMode
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Auto")]
-        [ExifTagDescription((ushort)1, "Manual")]
-        [ExifTagDescription((ushort)2, "Auto bracket")]
-        ExposureMode = 0xA402,
-
-        /// <summary>
-        /// WhiteBalance
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Auto")]
-        [ExifTagDescription((ushort)1, "Manual")]
-        WhiteBalance = 0xA403,
-
-        /// <summary>
-        /// DigitalZoomRatio
-        /// </summary>
-        DigitalZoomRatio = 0xA404,
-
-        /// <summary>
-        /// FocalLengthIn35mmFilm
-        /// </summary>
-        FocalLengthIn35mmFilm = 0xA405,
-
-        /// <summary>
-        /// SceneCaptureType
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Standard")]
-        [ExifTagDescription((ushort)1, "Landscape")]
-        [ExifTagDescription((ushort)2, "Portrait")]
-        [ExifTagDescription((ushort)3, "Night")]
-        SceneCaptureType = 0xA406,
-
-        /// <summary>
-        /// GainControl
-        /// </summary>
-        [ExifTagDescription((ushort)0, "None")]
-        [ExifTagDescription((ushort)1, "Low gain up")]
-        [ExifTagDescription((ushort)2, "High gain up")]
-        [ExifTagDescription((ushort)3, "Low gain down")]
-        [ExifTagDescription((ushort)4, "High gain down")]
-        GainControl = 0xA407,
-
-        /// <summary>
-        /// Contrast
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Normal")]
-        [ExifTagDescription((ushort)1, "Low")]
-        [ExifTagDescription((ushort)2, "High")]
-        Contrast = 0xA408,
-
-        /// <summary>
-        /// Saturation
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Normal")]
-        [ExifTagDescription((ushort)1, "Low")]
-        [ExifTagDescription((ushort)2, "High")]
-        Saturation = 0xA409,
-
-        /// <summary>
-        /// Sharpness
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Normal")]
-        [ExifTagDescription((ushort)1, "Soft")]
-        [ExifTagDescription((ushort)2, "Hard")]
-        Sharpness = 0xA40A,
-
-        /// <summary>
-        /// DeviceSettingDescription
-        /// </summary>
-        DeviceSettingDescription = 0xA40B,
-
-        /// <summary>
-        /// SubjectDistanceRange
-        /// </summary>
-        [ExifTagDescription((ushort)0, "Unknown")]
-        [ExifTagDescription((ushort)1, "Macro")]
-        [ExifTagDescription((ushort)2, "Close")]
-        [ExifTagDescription((ushort)3, "Distant")]
-        SubjectDistanceRange = 0xA40C,
-
-        /// <summary>
-        /// ImageUniqueID
-        /// </summary>
-        ImageUniqueID = 0xA420,
-
-        /// <summary>
-        /// OwnerName
-        /// </summary>
-        OwnerName = 0xA430,
-
-        /// <summary>
-        /// SerialNumber
-        /// </summary>
-        SerialNumber = 0xA431,
-
-        /// <summary>
-        /// LensInfo
-        /// </summary>
-        LensInfo = 0xA432,
-
-        /// <summary>
-        /// LensMake
-        /// </summary>
-        LensMake = 0xA433,
-
-        /// <summary>
-        /// LensModel
-        /// </summary>
-        LensModel = 0xA434,
-
-        /// <summary>
-        /// LensSerialNumber
-        /// </summary>
-        LensSerialNumber = 0xA435,
-
-        /// <summary>
-        /// GDALMetadata
-        /// </summary>
-        GDALMetadata = 0xA480,
-
-        /// <summary>
-        /// GDALNoData
-        /// </summary>
-        GDALNoData = 0xA481,
-
-        /// <summary>
-        /// GPSVersionID
-        /// </summary>
-        GPSVersionID = 0x0000,
-
-        /// <summary>
-        /// GPSLatitudeRef
-        /// </summary>
-        GPSLatitudeRef = 0x0001,
-
-        /// <summary>
-        /// GPSLatitude
-        /// </summary>
-        GPSLatitude = 0x0002,
-
-        /// <summary>
-        /// GPSLongitudeRef
-        /// </summary>
-        GPSLongitudeRef = 0x0003,
-
-        /// <summary>
-        /// GPSLongitude
-        /// </summary>
-        GPSLongitude = 0x0004,
-
-        /// <summary>
-        /// GPSAltitudeRef
-        /// </summary>
-        GPSAltitudeRef = 0x0005,
-
-        /// <summary>
-        /// GPSAltitude
-        /// </summary>
-        GPSAltitude = 0x0006,
-
-        /// <summary>
-        /// GPSTimestamp
-        /// </summary>
-        GPSTimestamp = 0x0007,
-
-        /// <summary>
-        /// GPSSatellites
-        /// </summary>
-        GPSSatellites = 0x0008,
-
-        /// <summary>
-        /// GPSStatus
-        /// </summary>
-        GPSStatus = 0x0009,
-
-        /// <summary>
-        /// GPSMeasureMode
-        /// </summary>
-        GPSMeasureMode = 0x000A,
-
-        /// <summary>
-        /// GPSDOP
-        /// </summary>
-        GPSDOP = 0x000B,
-
-        /// <summary>
-        /// GPSSpeedRef
-        /// </summary>
-        GPSSpeedRef = 0x000C,
-
-        /// <summary>
-        /// GPSSpeed
-        /// </summary>
-        GPSSpeed = 0x000D,
-
-        /// <summary>
-        /// GPSTrackRef
-        /// </summary>
-        GPSTrackRef = 0x000E,
-
-        /// <summary>
-        /// GPSTrack
-        /// </summary>
-        GPSTrack = 0x000F,
-
-        /// <summary>
-        /// GPSImgDirectionRef
-        /// </summary>
-        GPSImgDirectionRef = 0x0010,
-
-        /// <summary>
-        /// GPSImgDirection
-        /// </summary>
-        GPSImgDirection = 0x0011,
-
-        /// <summary>
-        /// GPSMapDatum
-        /// </summary>
-        GPSMapDatum = 0x0012,
-
-        /// <summary>
-        /// GPSDestLatitudeRef
-        /// </summary>
-        GPSDestLatitudeRef = 0x0013,
-
-        /// <summary>
-        /// GPSDestLatitude
-        /// </summary>
-        GPSDestLatitude = 0x0014,
-
-        /// <summary>
-        /// GPSDestLongitudeRef
-        /// </summary>
-        GPSDestLongitudeRef = 0x0015,
-
-        /// <summary>
-        /// GPSDestLongitude
-        /// </summary>
-        GPSDestLongitude = 0x0016,
-
-        /// <summary>
-        /// GPSDestBearingRef
-        /// </summary>
-        GPSDestBearingRef = 0x0017,
-
-        /// <summary>
-        /// GPSDestBearing
-        /// </summary>
-        GPSDestBearing = 0x0018,
-
-        /// <summary>
-        /// GPSDestDistanceRef
-        /// </summary>
-        GPSDestDistanceRef = 0x0019,
-
-        /// <summary>
-        /// GPSDestDistance
-        /// </summary>
-        GPSDestDistance = 0x001A,
-
-        /// <summary>
-        /// GPSProcessingMethod
-        /// </summary>
-        GPSProcessingMethod = 0x001B,
-
-        /// <summary>
-        /// GPSAreaInformation
-        /// </summary>
-        GPSAreaInformation = 0x001C,
-
-        /// <summary>
-        /// GPSDateStamp
-        /// </summary>
-        GPSDateStamp = 0x001D,
-
-        /// <summary>
-        /// GPSDifferential
-        /// </summary>
-        GPSDifferential = 0x001E
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifTagDescriptionAttribute.cs b/src/ImageSharp46/Profiles/Exif/ExifTagDescriptionAttribute.cs
deleted file mode 100644
index ca19a9776..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifTagDescriptionAttribute.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// <copyright file="ExifTagDescriptionAttribute.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Reflection;
-
-    /// <summary>
-    /// Class that provides a description for an ExifTag value.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
-    internal sealed class ExifTagDescriptionAttribute : Attribute
-    {
-        private object value;
-        private string description;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExifTagDescriptionAttribute"/> class.
-        /// </summary>
-        /// <param name="value">The value of the exif tag.</param>
-        /// <param name="description">The description for the value of the exif tag.</param>
-        public ExifTagDescriptionAttribute(object value, string description)
-        {
-            this.value = value;
-            this.description = description;
-        }
-
-        public static string GetDescription(ExifTag tag, object value)
-        {
-            FieldInfo field = tag.GetType().GetTypeInfo().GetDeclaredField(tag.ToString());
-            if (field == null)
-            {
-                return null;
-            }
-
-            foreach (CustomAttributeData customAttribute in field.CustomAttributes)
-            {
-                object attributeValue = customAttribute.ConstructorArguments[0].Value;
-
-                if (Equals(attributeValue, value))
-                {
-                    return (string)customAttribute.ConstructorArguments[1].Value;
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Profiles/Exif/ExifValue.cs b/src/ImageSharp46/Profiles/Exif/ExifValue.cs
deleted file mode 100644
index db62be4c2..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifValue.cs
+++ /dev/null
@@ -1,716 +0,0 @@
-// <copyright file="ExifValue.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-
-    /// <summary>
-    /// A value of the exif profile.
-    /// </summary>
-    public sealed class ExifValue : IEquatable<ExifValue>
-    {
-        private object exifValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExifValue"/> class
-        /// by making a copy from another exif value.
-        /// </summary>
-        /// <param name="other">The other exif value, where the clone should be made from.</param>
-        /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public ExifValue(ExifValue other)
-        {
-            Guard.NotNull(other, nameof(other));
-
-            this.DataType = other.DataType;
-            this.IsArray = other.IsArray;
-            this.Tag = other.Tag;
-
-            if (!other.IsArray)
-            {
-                this.exifValue = other.exifValue;
-            }
-            else
-            {
-                Array array = (Array)other.exifValue;
-                this.exifValue = array.Clone();
-            }
-        }
-
-        /// <summary>
-        /// Gets the data type of the exif value.
-        /// </summary>
-        public ExifDataType DataType
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the value is an array.
-        /// </summary>
-        public bool IsArray
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the tag of the exif value.
-        /// </summary>
-        public ExifTag Tag
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        public object Value
-        {
-            get
-            {
-                return this.exifValue;
-            }
-            set
-            {
-                this.CheckValue(value);
-                this.exifValue = value;
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified ExifValue instances are considered equal.
-        /// </summary>
-        /// <param name="left">The first ExifValue to compare.</param>
-        /// <param name="right"> The second ExifValue to compare.</param>
-        /// <returns></returns>
-        public static bool operator ==(ExifValue left, ExifValue right)
-        {
-            return Equals(left, right);
-        }
-
-        /// <summary>
-        /// Determines whether the specified ExifValue instances are not considered equal.
-        /// </summary>
-        /// <param name="left">The first ExifValue to compare.</param>
-        /// <param name="right"> The second ExifValue to compare.</param>
-        /// <returns></returns>
-        public static bool operator !=(ExifValue left, ExifValue right)
-        {
-            return !Equals(left, right);
-        }
-
-        /// <summary>
-        /// Determines whether the specified object is equal to the current exif value.
-        /// </summary>
-        /// <param name="obj">The object to compare this exif value with.</param>
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            return this.Equals(obj as ExifValue);
-        }
-
-        /// <summary>
-        /// Determines whether the specified exif value is equal to the current exif value.
-        /// </summary>
-        /// <param name="other">The exif value to compare this exif value with.</param>
-        public bool Equals(ExifValue other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            return
-              this.Tag == other.Tag &&
-              this.DataType == other.DataType &&
-              Equals(this.exifValue, other.exifValue);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetHashCode(this);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.exifValue == null)
-            {
-                return null;
-            }
-
-            if (this.DataType == ExifDataType.Ascii)
-            {
-                return (string)this.exifValue;
-            }
-
-            if (!this.IsArray)
-            {
-                return this.ToString(this.exifValue);
-            }
-
-            StringBuilder sb = new StringBuilder();
-            foreach (object value in (Array)this.exifValue)
-            {
-                sb.Append(this.ToString(value));
-                sb.Append(" ");
-            }
-
-            return sb.ToString();
-        }
-
-        internal bool HasValue
-        {
-            get
-            {
-                if (this.exifValue == null)
-                {
-                    return false;
-                }
-
-                if (this.DataType == ExifDataType.Ascii)
-                {
-                    return ((string)this.exifValue).Length > 0;
-                }
-
-                return true;
-            }
-        }
-
-        internal int Length
-        {
-            get
-            {
-                if (this.exifValue == null)
-                {
-                    return 4;
-                }
-
-                int size = (int)(GetSize(this.DataType) * this.NumberOfComponents);
-
-                return size < 4 ? 4 : size;
-            }
-        }
-
-        internal int NumberOfComponents
-        {
-            get
-            {
-                if (this.DataType == ExifDataType.Ascii)
-                {
-                    return Encoding.UTF8.GetBytes((string)this.exifValue).Length;
-                }
-
-                if (this.IsArray)
-                {
-                    return ((Array)this.exifValue).Length;
-                }
-
-                return 1;
-            }
-        }
-
-        internal ExifValue(ExifTag tag, ExifDataType dataType, bool isArray)
-        {
-            this.Tag = tag;
-            this.DataType = dataType;
-            this.IsArray = isArray;
-
-            if (dataType == ExifDataType.Ascii)
-            {
-                this.IsArray = false;
-            }
-        }
-
-        internal ExifValue(ExifTag tag, ExifDataType dataType, object value, bool isArray)
-          : this(tag, dataType, isArray)
-        {
-            this.exifValue = value;
-        }
-
-        internal static ExifValue Create(ExifTag tag, object value)
-        {
-            Guard.IsFalse(tag == ExifTag.Unknown, nameof(tag), "Invalid Tag");
-
-            ExifValue exifValue;
-            Type type = value?.GetType();
-            if (type != null && type.IsArray)
-            {
-                type = type.GetElementType();
-            }
-
-            switch (tag)
-            {
-                case ExifTag.ImageDescription:
-                case ExifTag.Make:
-                case ExifTag.Model:
-                case ExifTag.Software:
-                case ExifTag.DateTime:
-                case ExifTag.Artist:
-                case ExifTag.HostComputer:
-                case ExifTag.Copyright:
-                case ExifTag.DocumentName:
-                case ExifTag.PageName:
-                case ExifTag.InkNames:
-                case ExifTag.TargetPrinter:
-                case ExifTag.ImageID:
-                case ExifTag.MDLabName:
-                case ExifTag.MDSampleInfo:
-                case ExifTag.MDPrepDate:
-                case ExifTag.MDPrepTime:
-                case ExifTag.MDFileUnits:
-                case ExifTag.SEMInfo:
-                case ExifTag.SpectralSensitivity:
-                case ExifTag.DateTimeOriginal:
-                case ExifTag.DateTimeDigitized:
-                case ExifTag.SubsecTime:
-                case ExifTag.SubsecTimeOriginal:
-                case ExifTag.SubsecTimeDigitized:
-                case ExifTag.FaxSubaddress:
-                case ExifTag.OffsetTime:
-                case ExifTag.OffsetTimeOriginal:
-                case ExifTag.OffsetTimeDigitized:
-                case ExifTag.SecurityClassification:
-                case ExifTag.ImageHistory:
-                case ExifTag.ImageUniqueID:
-                case ExifTag.OwnerName:
-                case ExifTag.SerialNumber:
-                case ExifTag.LensMake:
-                case ExifTag.LensModel:
-                case ExifTag.LensSerialNumber:
-                case ExifTag.GDALMetadata:
-                case ExifTag.GDALNoData:
-                case ExifTag.GPSLatitudeRef:
-                case ExifTag.GPSLongitudeRef:
-                case ExifTag.GPSSatellites:
-                case ExifTag.GPSStatus:
-                case ExifTag.GPSMeasureMode:
-                case ExifTag.GPSSpeedRef:
-                case ExifTag.GPSTrackRef:
-                case ExifTag.GPSImgDirectionRef:
-                case ExifTag.GPSMapDatum:
-                case ExifTag.GPSDestLatitudeRef:
-                case ExifTag.GPSDestLongitudeRef:
-                case ExifTag.GPSDestBearingRef:
-                case ExifTag.GPSDestDistanceRef:
-                case ExifTag.GPSDateStamp:
-                    exifValue = new ExifValue(tag, ExifDataType.Ascii, true);
-                    break;
-
-                case ExifTag.ClipPath:
-                case ExifTag.VersionYear:
-                case ExifTag.XMP:
-                case ExifTag.CFAPattern2:
-                case ExifTag.TIFFEPStandardID:
-                case ExifTag.XPTitle:
-                case ExifTag.XPComment:
-                case ExifTag.XPAuthor:
-                case ExifTag.XPKeywords:
-                case ExifTag.XPSubject:
-                case ExifTag.GPSVersionID:
-                    exifValue = new ExifValue(tag, ExifDataType.Byte, true);
-                    break;
-                case ExifTag.FaxProfile:
-                case ExifTag.ModeNumber:
-                case ExifTag.GPSAltitudeRef:
-                    exifValue = new ExifValue(tag, ExifDataType.Byte, false);
-                    break;
-
-                case ExifTag.FreeOffsets:
-                case ExifTag.FreeByteCounts:
-                case ExifTag.ColorResponseUnit:
-                case ExifTag.TileOffsets:
-                case ExifTag.SMinSampleValue:
-                case ExifTag.SMaxSampleValue:
-                case ExifTag.JPEGQTables:
-                case ExifTag.JPEGDCTables:
-                case ExifTag.JPEGACTables:
-                case ExifTag.StripRowCounts:
-                case ExifTag.IntergraphRegisters:
-                case ExifTag.TimeZoneOffset:
-                    exifValue = new ExifValue(tag, ExifDataType.Long, true);
-                    break;
-                case ExifTag.SubfileType:
-                case ExifTag.SubIFDOffset:
-                case ExifTag.GPSIFDOffset:
-                case ExifTag.T4Options:
-                case ExifTag.T6Options:
-                case ExifTag.XClipPathUnits:
-                case ExifTag.YClipPathUnits:
-                case ExifTag.ProfileType:
-                case ExifTag.CodingMethods:
-                case ExifTag.T82ptions:
-                case ExifTag.JPEGInterchangeFormat:
-                case ExifTag.JPEGInterchangeFormatLength:
-                case ExifTag.MDFileTag:
-                case ExifTag.StandardOutputSensitivity:
-                case ExifTag.RecommendedExposureIndex:
-                case ExifTag.ISOSpeed:
-                case ExifTag.ISOSpeedLatitudeyyy:
-                case ExifTag.ISOSpeedLatitudezzz:
-                case ExifTag.FaxRecvParams:
-                case ExifTag.FaxRecvTime:
-                case ExifTag.ImageNumber:
-                    exifValue = new ExifValue(tag, ExifDataType.Long, false);
-                    break;
-
-                case ExifTag.WhitePoint:
-                case ExifTag.PrimaryChromaticities:
-                case ExifTag.YCbCrCoefficients:
-                case ExifTag.ReferenceBlackWhite:
-                case ExifTag.PixelScale:
-                case ExifTag.IntergraphMatrix:
-                case ExifTag.ModelTiePoint:
-                case ExifTag.ModelTransform:
-                case ExifTag.GPSLatitude:
-                case ExifTag.GPSLongitude:
-                case ExifTag.GPSTimestamp:
-                case ExifTag.GPSDestLatitude:
-                case ExifTag.GPSDestLongitude:
-                    exifValue = new ExifValue(tag, ExifDataType.Rational, true);
-                    break;
-                case ExifTag.XPosition:
-                case ExifTag.YPosition:
-                case ExifTag.XResolution:
-                case ExifTag.YResolution:
-                case ExifTag.BatteryLevel:
-                case ExifTag.ExposureTime:
-                case ExifTag.FNumber:
-                case ExifTag.MDScalePixel:
-                case ExifTag.CompressedBitsPerPixel:
-                case ExifTag.ApertureValue:
-                case ExifTag.MaxApertureValue:
-                case ExifTag.SubjectDistance:
-                case ExifTag.FocalLength:
-                case ExifTag.FlashEnergy2:
-                case ExifTag.FocalPlaneXResolution2:
-                case ExifTag.FocalPlaneYResolution2:
-                case ExifTag.ExposureIndex2:
-                case ExifTag.Humidity:
-                case ExifTag.Pressure:
-                case ExifTag.Acceleration:
-                case ExifTag.FlashEnergy:
-                case ExifTag.FocalPlaneXResolution:
-                case ExifTag.FocalPlaneYResolution:
-                case ExifTag.ExposureIndex:
-                case ExifTag.DigitalZoomRatio:
-                case ExifTag.LensInfo:
-                case ExifTag.GPSAltitude:
-                case ExifTag.GPSDOP:
-                case ExifTag.GPSSpeed:
-                case ExifTag.GPSTrack:
-                case ExifTag.GPSImgDirection:
-                case ExifTag.GPSDestBearing:
-                case ExifTag.GPSDestDistance:
-                    exifValue = new ExifValue(tag, ExifDataType.Rational, false);
-                    break;
-
-                case ExifTag.BitsPerSample:
-                case ExifTag.MinSampleValue:
-                case ExifTag.MaxSampleValue:
-                case ExifTag.GrayResponseCurve:
-                case ExifTag.ColorMap:
-                case ExifTag.ExtraSamples:
-                case ExifTag.PageNumber:
-                case ExifTag.TransferFunction:
-                case ExifTag.Predictor:
-                case ExifTag.HalftoneHints:
-                case ExifTag.SampleFormat:
-                case ExifTag.TransferRange:
-                case ExifTag.DefaultImageColor:
-                case ExifTag.JPEGLosslessPredictors:
-                case ExifTag.JPEGPointTransforms:
-                case ExifTag.YCbCrSubsampling:
-                case ExifTag.CFARepeatPatternDim:
-                case ExifTag.IntergraphPacketData:
-                case ExifTag.ISOSpeedRatings:
-                case ExifTag.SubjectArea:
-                case ExifTag.SubjectLocation:
-                    exifValue = new ExifValue(tag, ExifDataType.Short, true);
-                    break;
-                case ExifTag.OldSubfileType:
-                case ExifTag.Compression:
-                case ExifTag.PhotometricInterpretation:
-                case ExifTag.Thresholding:
-                case ExifTag.CellWidth:
-                case ExifTag.CellLength:
-                case ExifTag.FillOrder:
-                case ExifTag.Orientation:
-                case ExifTag.SamplesPerPixel:
-                case ExifTag.PlanarConfiguration:
-                case ExifTag.GrayResponseUnit:
-                case ExifTag.ResolutionUnit:
-                case ExifTag.CleanFaxData:
-                case ExifTag.InkSet:
-                case ExifTag.NumberOfInks:
-                case ExifTag.DotRange:
-                case ExifTag.Indexed:
-                case ExifTag.OPIProxy:
-                case ExifTag.JPEGProc:
-                case ExifTag.JPEGRestartInterval:
-                case ExifTag.YCbCrPositioning:
-                case ExifTag.Rating:
-                case ExifTag.RatingPercent:
-                case ExifTag.ExposureProgram:
-                case ExifTag.Interlace:
-                case ExifTag.SelfTimerMode:
-                case ExifTag.SensitivityType:
-                case ExifTag.MeteringMode:
-                case ExifTag.LightSource:
-                case ExifTag.FocalPlaneResolutionUnit2:
-                case ExifTag.SensingMethod2:
-                case ExifTag.Flash:
-                case ExifTag.ColorSpace:
-                case ExifTag.FocalPlaneResolutionUnit:
-                case ExifTag.SensingMethod:
-                case ExifTag.CustomRendered:
-                case ExifTag.ExposureMode:
-                case ExifTag.WhiteBalance:
-                case ExifTag.FocalLengthIn35mmFilm:
-                case ExifTag.SceneCaptureType:
-                case ExifTag.GainControl:
-                case ExifTag.Contrast:
-                case ExifTag.Saturation:
-                case ExifTag.Sharpness:
-                case ExifTag.SubjectDistanceRange:
-                case ExifTag.GPSDifferential:
-                    exifValue = new ExifValue(tag, ExifDataType.Short, false);
-                    break;
-
-                case ExifTag.Decode:
-                    exifValue = new ExifValue(tag, ExifDataType.SignedRational, true);
-                    break;
-                case ExifTag.ShutterSpeedValue:
-                case ExifTag.BrightnessValue:
-                case ExifTag.ExposureBiasValue:
-                case ExifTag.AmbientTemperature:
-                case ExifTag.WaterDepth:
-                case ExifTag.CameraElevationAngle:
-                    exifValue = new ExifValue(tag, ExifDataType.SignedRational, false);
-                    break;
-
-                case ExifTag.JPEGTables:
-                case ExifTag.OECF:
-                case ExifTag.ExifVersion:
-                case ExifTag.ComponentsConfiguration:
-                case ExifTag.MakerNote:
-                case ExifTag.UserComment:
-                case ExifTag.FlashpixVersion:
-                case ExifTag.SpatialFrequencyResponse:
-                case ExifTag.SpatialFrequencyResponse2:
-                case ExifTag.Noise:
-                case ExifTag.CFAPattern:
-                case ExifTag.DeviceSettingDescription:
-                case ExifTag.ImageSourceData:
-                case ExifTag.GPSProcessingMethod:
-                case ExifTag.GPSAreaInformation:
-                    exifValue = new ExifValue(tag, ExifDataType.Undefined, true);
-                    break;
-                case ExifTag.FileSource:
-                case ExifTag.SceneType:
-                    exifValue = new ExifValue(tag, ExifDataType.Undefined, false);
-                    break;
-
-                case ExifTag.StripOffsets:
-                case ExifTag.TileByteCounts:
-                case ExifTag.ImageLayer:
-                    exifValue = CreateNumber(tag, type, true);
-                    break;
-                case ExifTag.ImageWidth:
-                case ExifTag.ImageLength:
-                case ExifTag.TileWidth:
-                case ExifTag.TileLength:
-                case ExifTag.BadFaxLines:
-                case ExifTag.ConsecutiveBadFaxLines:
-                case ExifTag.PixelXDimension:
-                case ExifTag.PixelYDimension:
-                    exifValue = CreateNumber(tag, type, false);
-                    break;
-
-                default:
-                    throw new NotSupportedException();
-            }
-
-            exifValue.Value = value;
-            return exifValue;
-        }
-
-        internal static uint GetSize(ExifDataType dataType)
-        {
-            switch (dataType)
-            {
-                case ExifDataType.Ascii:
-                case ExifDataType.Byte:
-                case ExifDataType.SignedByte:
-                case ExifDataType.Undefined:
-                    return 1;
-                case ExifDataType.Short:
-                case ExifDataType.SignedShort:
-                    return 2;
-                case ExifDataType.Long:
-                case ExifDataType.SignedLong:
-                case ExifDataType.SingleFloat:
-                    return 4;
-                case ExifDataType.DoubleFloat:
-                case ExifDataType.Rational:
-                case ExifDataType.SignedRational:
-                    return 8;
-                default:
-                    throw new NotSupportedException(dataType.ToString());
-            }
-        }
-
-        private void CheckValue(object value)
-        {
-            if (value == null)
-            {
-                return;
-            }
-
-            Type type = value.GetType();
-
-            if (this.DataType == ExifDataType.Ascii)
-            {
-                Guard.IsTrue(type == typeof(string), nameof(value), "Value should be a string.");
-                return;
-            }
-
-            if (type.IsArray)
-            {
-                Guard.IsTrue(this.IsArray, nameof(value), "Value should not be an array.");
-                type = type.GetElementType();
-            }
-            else
-            {
-                Guard.IsFalse(this.IsArray, nameof(value), "Value should not be an array.");
-            }
-
-            switch (this.DataType)
-            {
-                case ExifDataType.Byte:
-                    Guard.IsTrue(type == typeof(byte), nameof(value), $"Value should be a byte{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.DoubleFloat:
-                    Guard.IsTrue(type == typeof(double), nameof(value), $"Value should be a double{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.Long:
-                    Guard.IsTrue(type == typeof(uint), nameof(value), $"Value should be an unsigned int{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.Rational:
-                    Guard.IsTrue(type == typeof(Rational), nameof(value), $"Value should be a Rational{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.Short:
-                    Guard.IsTrue(type == typeof(ushort), nameof(value), $"Value should be an unsigned short{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.SignedByte:
-                    Guard.IsTrue(type == typeof(sbyte), nameof(value), $"Value should be a signed byte{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.SignedLong:
-                    Guard.IsTrue(type == typeof(int), nameof(value), $"Value should be an int{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.SignedRational:
-                    Guard.IsTrue(type == typeof(SignedRational), nameof(value), $"Value should be a SignedRational{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.SignedShort:
-                    Guard.IsTrue(type == typeof(short), nameof(value), $"Value should be a short{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.SingleFloat:
-                    Guard.IsTrue(type == typeof(float), nameof(value), $"Value should be a float{(this.IsArray ? " array." : ".")}");
-                    break;
-                case ExifDataType.Undefined:
-                    Guard.IsTrue(type == typeof(byte), nameof(value), "Value should be a byte array.");
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        private static ExifValue CreateNumber(ExifTag tag, Type type, bool isArray)
-        {
-            if (type == null || type == typeof(ushort))
-            {
-                return new ExifValue(tag, ExifDataType.Short, isArray);
-            }
-
-            if (type == typeof(short))
-            {
-                return new ExifValue(tag, ExifDataType.SignedShort, isArray);
-            }
-
-            if (type == typeof(uint))
-            {
-                return new ExifValue(tag, ExifDataType.Long, isArray);
-            }
-
-            return new ExifValue(tag, ExifDataType.SignedLong, isArray);
-        }
-
-        private string ToString(object value)
-        {
-            string description = ExifTagDescriptionAttribute.GetDescription(this.Tag, value);
-            if (description != null)
-            {
-                return description;
-            }
-
-            switch (this.DataType)
-            {
-                case ExifDataType.Ascii:
-                    return (string)value;
-                case ExifDataType.Byte:
-                    return ((byte)value).ToString("X2", CultureInfo.InvariantCulture);
-                case ExifDataType.DoubleFloat:
-                    return ((double)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.Long:
-                    return ((uint)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.Rational:
-                    return ((Rational)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.Short:
-                    return ((ushort)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.SignedByte:
-                    return ((sbyte)value).ToString("X2", CultureInfo.InvariantCulture);
-                case ExifDataType.SignedLong:
-                    return ((int)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.SignedRational:
-                    return ((Rational)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.SignedShort:
-                    return ((short)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.SingleFloat:
-                    return ((float)value).ToString(CultureInfo.InvariantCulture);
-                case ExifDataType.Undefined:
-                    return ((byte)value).ToString("X2", CultureInfo.InvariantCulture);
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Returns the hash code for this instance.
-        /// </summary>
-        /// <param name="exif">
-        /// The instance of <see cref="ExifValue"/> to return the hash code for.
-        /// </param>
-        /// <returns>
-        /// A 32-bit signed integer that is the hash code for this instance.
-        /// </returns>
-        private int GetHashCode(ExifValue exif)
-        {
-            int hashCode = exif.Tag.GetHashCode() ^ exif.DataType.GetHashCode();
-            return hashCode ^ exif.exifValue?.GetHashCode() ?? hashCode;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/ExifWriter.cs b/src/ImageSharp46/Profiles/Exif/ExifWriter.cs
deleted file mode 100644
index f7653b240..000000000
--- a/src/ImageSharp46/Profiles/Exif/ExifWriter.cs
+++ /dev/null
@@ -1,585 +0,0 @@
-// <copyright file="ExifWriter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Text;
-
-    internal sealed class ExifWriter
-    {
-        private static readonly ExifTag[] IfdTags = new ExifTag[127]
-        {
-            ExifTag.SubfileType,
-            ExifTag.OldSubfileType,
-            ExifTag.ImageWidth,
-            ExifTag.ImageLength,
-            ExifTag.BitsPerSample,
-            ExifTag.Compression,
-            ExifTag.PhotometricInterpretation,
-            ExifTag.Thresholding,
-            ExifTag.CellWidth,
-            ExifTag.CellLength,
-            ExifTag.FillOrder,
-            ExifTag.DocumentName,
-            ExifTag.ImageDescription,
-            ExifTag.Make,
-            ExifTag.Model,
-            ExifTag.StripOffsets,
-            ExifTag.Orientation,
-            ExifTag.SamplesPerPixel,
-            ExifTag.RowsPerStrip,
-            ExifTag.StripByteCounts,
-            ExifTag.MinSampleValue,
-            ExifTag.MaxSampleValue,
-            ExifTag.XResolution,
-            ExifTag.YResolution,
-            ExifTag.PlanarConfiguration,
-            ExifTag.PageName,
-            ExifTag.XPosition,
-            ExifTag.YPosition,
-            ExifTag.FreeOffsets,
-            ExifTag.FreeByteCounts,
-            ExifTag.GrayResponseUnit,
-            ExifTag.GrayResponseCurve,
-            ExifTag.T4Options,
-            ExifTag.T6Options,
-            ExifTag.ResolutionUnit,
-            ExifTag.PageNumber,
-            ExifTag.ColorResponseUnit,
-            ExifTag.TransferFunction,
-            ExifTag.Software,
-            ExifTag.DateTime,
-            ExifTag.Artist,
-            ExifTag.HostComputer,
-            ExifTag.Predictor,
-            ExifTag.WhitePoint,
-            ExifTag.PrimaryChromaticities,
-            ExifTag.ColorMap,
-            ExifTag.HalftoneHints,
-            ExifTag.TileWidth,
-            ExifTag.TileLength,
-            ExifTag.TileOffsets,
-            ExifTag.TileByteCounts,
-            ExifTag.BadFaxLines,
-            ExifTag.CleanFaxData,
-            ExifTag.ConsecutiveBadFaxLines,
-            ExifTag.InkSet,
-            ExifTag.InkNames,
-            ExifTag.NumberOfInks,
-            ExifTag.DotRange,
-            ExifTag.TargetPrinter,
-            ExifTag.ExtraSamples,
-            ExifTag.SampleFormat,
-            ExifTag.SMinSampleValue,
-            ExifTag.SMaxSampleValue,
-            ExifTag.TransferRange,
-            ExifTag.ClipPath,
-            ExifTag.XClipPathUnits,
-            ExifTag.YClipPathUnits,
-            ExifTag.Indexed,
-            ExifTag.JPEGTables,
-            ExifTag.OPIProxy,
-            ExifTag.ProfileType,
-            ExifTag.FaxProfile,
-            ExifTag.CodingMethods,
-            ExifTag.VersionYear,
-            ExifTag.ModeNumber,
-            ExifTag.Decode,
-            ExifTag.DefaultImageColor,
-            ExifTag.T82ptions,
-            ExifTag.JPEGProc,
-            ExifTag.JPEGInterchangeFormat,
-            ExifTag.JPEGInterchangeFormatLength,
-            ExifTag.JPEGRestartInterval,
-            ExifTag.JPEGLosslessPredictors,
-            ExifTag.JPEGPointTransforms,
-            ExifTag.JPEGQTables,
-            ExifTag.JPEGDCTables,
-            ExifTag.JPEGACTables,
-            ExifTag.YCbCrCoefficients,
-            ExifTag.YCbCrSubsampling,
-            ExifTag.YCbCrSubsampling,
-            ExifTag.YCbCrPositioning,
-            ExifTag.ReferenceBlackWhite,
-            ExifTag.StripRowCounts,
-            ExifTag.XMP,
-            ExifTag.Rating,
-            ExifTag.RatingPercent,
-            ExifTag.ImageID,
-            ExifTag.CFARepeatPatternDim,
-            ExifTag.CFAPattern2,
-            ExifTag.BatteryLevel,
-            ExifTag.Copyright,
-            ExifTag.MDFileTag,
-            ExifTag.MDScalePixel,
-            ExifTag.MDLabName,
-            ExifTag.MDSampleInfo,
-            ExifTag.MDPrepDate,
-            ExifTag.MDPrepTime,
-            ExifTag.MDFileUnits,
-            ExifTag.PixelScale,
-            ExifTag.IntergraphPacketData,
-            ExifTag.IntergraphRegisters,
-            ExifTag.IntergraphMatrix,
-            ExifTag.ModelTiePoint,
-            ExifTag.SEMInfo,
-            ExifTag.ModelTransform,
-            ExifTag.ImageLayer,
-            ExifTag.FaxRecvParams,
-            ExifTag.FaxSubaddress,
-            ExifTag.FaxRecvTime,
-            ExifTag.ImageSourceData,
-            ExifTag.XPTitle,
-            ExifTag.XPComment,
-            ExifTag.XPAuthor,
-            ExifTag.XPKeywords,
-            ExifTag.XPSubject,
-            ExifTag.GDALMetadata,
-            ExifTag.GDALNoData
-        };
-
-        private static readonly ExifTag[] ExifTags = new ExifTag[92]
-        {
-            ExifTag.ExposureTime,
-            ExifTag.FNumber,
-            ExifTag.ExposureProgram,
-            ExifTag.SpectralSensitivity,
-            ExifTag.ISOSpeedRatings,
-            ExifTag.OECF,
-            ExifTag.Interlace,
-            ExifTag.TimeZoneOffset,
-            ExifTag.SelfTimerMode,
-            ExifTag.SensitivityType,
-            ExifTag.StandardOutputSensitivity,
-            ExifTag.RecommendedExposureIndex,
-            ExifTag.ISOSpeed,
-            ExifTag.ISOSpeedLatitudeyyy,
-            ExifTag.ISOSpeedLatitudezzz,
-            ExifTag.ExifVersion,
-            ExifTag.DateTimeOriginal,
-            ExifTag.DateTimeDigitized,
-            ExifTag.OffsetTime,
-            ExifTag.OffsetTimeOriginal,
-            ExifTag.OffsetTimeDigitized,
-            ExifTag.ComponentsConfiguration,
-            ExifTag.CompressedBitsPerPixel,
-            ExifTag.ShutterSpeedValue,
-            ExifTag.ApertureValue,
-            ExifTag.BrightnessValue,
-            ExifTag.ExposureBiasValue,
-            ExifTag.MaxApertureValue,
-            ExifTag.SubjectDistance,
-            ExifTag.MeteringMode,
-            ExifTag.LightSource,
-            ExifTag.Flash,
-            ExifTag.FocalLength,
-            ExifTag.FlashEnergy2,
-            ExifTag.SpatialFrequencyResponse2,
-            ExifTag.Noise,
-            ExifTag.FocalPlaneXResolution2,
-            ExifTag.FocalPlaneYResolution2,
-            ExifTag.FocalPlaneResolutionUnit2,
-            ExifTag.ImageNumber,
-            ExifTag.SecurityClassification,
-            ExifTag.ImageHistory,
-            ExifTag.SubjectArea,
-            ExifTag.ExposureIndex2,
-            ExifTag.TIFFEPStandardID,
-            ExifTag.SensingMethod2,
-            ExifTag.MakerNote,
-            ExifTag.UserComment,
-            ExifTag.SubsecTime,
-            ExifTag.SubsecTimeOriginal,
-            ExifTag.SubsecTimeDigitized,
-            ExifTag.AmbientTemperature,
-            ExifTag.Humidity,
-            ExifTag.Pressure,
-            ExifTag.WaterDepth,
-            ExifTag.Acceleration,
-            ExifTag.CameraElevationAngle,
-            ExifTag.FlashpixVersion,
-            ExifTag.ColorSpace,
-            ExifTag.PixelXDimension,
-            ExifTag.PixelYDimension,
-            ExifTag.RelatedSoundFile,
-            ExifTag.FlashEnergy,
-            ExifTag.SpatialFrequencyResponse,
-            ExifTag.FocalPlaneXResolution,
-            ExifTag.FocalPlaneYResolution,
-            ExifTag.FocalPlaneResolutionUnit,
-            ExifTag.SubjectLocation,
-            ExifTag.ExposureIndex,
-            ExifTag.SensingMethod,
-            ExifTag.FileSource,
-            ExifTag.SceneType,
-            ExifTag.CFAPattern,
-            ExifTag.CustomRendered,
-            ExifTag.ExposureMode,
-            ExifTag.WhiteBalance,
-            ExifTag.DigitalZoomRatio,
-            ExifTag.FocalLengthIn35mmFilm,
-            ExifTag.SceneCaptureType,
-            ExifTag.GainControl,
-            ExifTag.Contrast,
-            ExifTag.Saturation,
-            ExifTag.Sharpness,
-            ExifTag.DeviceSettingDescription,
-            ExifTag.SubjectDistanceRange,
-            ExifTag.ImageUniqueID,
-            ExifTag.OwnerName,
-            ExifTag.SerialNumber,
-            ExifTag.LensInfo,
-            ExifTag.LensMake,
-            ExifTag.LensModel,
-            ExifTag.LensSerialNumber
-          };
-
-        private static readonly ExifTag[] GPSTags = new ExifTag[31]
-        {
-            ExifTag.GPSVersionID,
-            ExifTag.GPSLatitudeRef,
-            ExifTag.GPSLatitude,
-            ExifTag.GPSLongitudeRef,
-            ExifTag.GPSLongitude,
-            ExifTag.GPSAltitudeRef,
-            ExifTag.GPSAltitude,
-            ExifTag.GPSTimestamp,
-            ExifTag.GPSSatellites,
-            ExifTag.GPSStatus,
-            ExifTag.GPSMeasureMode,
-            ExifTag.GPSDOP,
-            ExifTag.GPSSpeedRef,
-            ExifTag.GPSSpeed,
-            ExifTag.GPSTrackRef,
-            ExifTag.GPSTrack,
-            ExifTag.GPSImgDirectionRef,
-            ExifTag.GPSImgDirection,
-            ExifTag.GPSMapDatum,
-            ExifTag.GPSDestLatitudeRef,
-            ExifTag.GPSDestLatitude,
-            ExifTag.GPSDestLongitudeRef,
-            ExifTag.GPSDestLongitude,
-            ExifTag.GPSDestBearingRef,
-            ExifTag.GPSDestBearing,
-            ExifTag.GPSDestDistanceRef,
-            ExifTag.GPSDestDistance,
-            ExifTag.GPSProcessingMethod,
-            ExifTag.GPSAreaInformation,
-            ExifTag.GPSDateStamp,
-            ExifTag.GPSDifferential
-        };
-
-        private const int StartIndex = 6;
-
-        private ExifParts allowedParts;
-        private Collection<ExifValue> values;
-        private Collection<int> dataOffsets;
-        private Collection<int> ifdIndexes;
-        private Collection<int> exifIndexes;
-        private Collection<int> gpsIndexes;
-
-        public ExifWriter(Collection<ExifValue> values, ExifParts allowedParts)
-        {
-            this.values = values;
-            this.allowedParts = allowedParts;
-            this.ifdIndexes = this.GetIndexes(ExifParts.IfdTags, IfdTags);
-            this.exifIndexes = this.GetIndexes(ExifParts.ExifTags, ExifTags);
-            this.gpsIndexes = this.GetIndexes(ExifParts.GPSTags, GPSTags);
-        }
-
-        public byte[] GetData()
-        {
-            uint length = 0;
-            int exifIndex = -1;
-            int gpsIndex = -1;
-
-            if (this.exifIndexes.Count > 0)
-            {
-                exifIndex = (int)this.GetIndex(this.ifdIndexes, ExifTag.SubIFDOffset);
-            }
-
-            if (this.gpsIndexes.Count > 0)
-            {
-                gpsIndex = (int)this.GetIndex(this.ifdIndexes, ExifTag.GPSIFDOffset);
-            }
-
-            uint ifdLength = 2 + this.GetLength(this.ifdIndexes) + 4;
-            uint exifLength = this.GetLength(this.exifIndexes);
-            uint gpsLength = this.GetLength(this.gpsIndexes);
-
-            if (exifLength > 0)
-            {
-                exifLength += 2;
-            }
-
-            if (gpsLength > 0)
-            {
-                gpsLength += 2;
-            }
-
-            length = ifdLength + exifLength + gpsLength;
-
-            if (length == 6)
-            {
-                return null;
-            }
-
-            length += 10 + 4 + 2;
-
-            byte[] result = new byte[length];
-            result[0] = (byte)'E';
-            result[1] = (byte)'x';
-            result[2] = (byte)'i';
-            result[3] = (byte)'f';
-            result[4] = 0x00;
-            result[5] = 0x00;
-            result[6] = (byte)'I';
-            result[7] = (byte)'I';
-            result[8] = 0x2A;
-            result[9] = 0x00;
-
-            int i = 10;
-            uint ifdOffset = ((uint)i - StartIndex) + 4;
-            uint thumbnailOffset = ifdOffset + ifdLength + exifLength + gpsLength;
-
-            if (exifLength > 0)
-            {
-                this.values[exifIndex].Value = ifdOffset + ifdLength;
-            }
-
-            if (gpsLength > 0)
-            {
-                this.values[gpsIndex].Value = ifdOffset + ifdLength + exifLength;
-            }
-
-            i = Write(BitConverter.GetBytes(ifdOffset), result, i);
-            i = this.WriteHeaders(this.ifdIndexes, result, i);
-            i = Write(BitConverter.GetBytes(thumbnailOffset), result, i);
-            i = this.WriteData(this.ifdIndexes, result, i);
-
-            if (exifLength > 0)
-            {
-                i = this.WriteHeaders(this.exifIndexes, result, i);
-                i = this.WriteData(this.exifIndexes, result, i);
-            }
-
-            if (gpsLength > 0)
-            {
-                i = this.WriteHeaders(this.gpsIndexes, result, i);
-                i = this.WriteData(this.gpsIndexes, result, i);
-            }
-
-            Write(BitConverter.GetBytes((ushort)0), result, i);
-
-            return result;
-        }
-
-        private int GetIndex(Collection<int> indexes, ExifTag tag)
-        {
-            foreach (int index in indexes)
-            {
-                if (this.values[index].Tag == tag)
-                {
-                    return index;
-                }
-            }
-
-            int newIndex = this.values.Count;
-            indexes.Add(newIndex);
-            this.values.Add(ExifValue.Create(tag, null));
-            return newIndex;
-        }
-
-        private Collection<int> GetIndexes(ExifParts part, ExifTag[] tags)
-        {
-            if (((int)this.allowedParts & (int)part) == 0)
-            {
-                return new Collection<int>();
-            }
-
-            Collection<int> result = new Collection<int>();
-            for (int i = 0; i < this.values.Count; i++)
-            {
-                ExifValue value = this.values[i];
-
-                if (!value.HasValue)
-                {
-                    continue;
-                }
-
-                int index = Array.IndexOf(tags, value.Tag);
-                if (index > -1)
-                {
-                    result.Add(i);
-                }
-            }
-
-            return result;
-        }
-
-        private uint GetLength(IEnumerable<int> indexes)
-        {
-            uint length = 0;
-
-            foreach (int index in indexes)
-            {
-                uint valueLength = (uint)this.values[index].Length;
-
-                if (valueLength > 4)
-                {
-                    length += 12 + valueLength;
-                }
-                else
-                {
-                    length += 12;
-                }
-            }
-
-            return length;
-        }
-
-        private static int Write(byte[] source, byte[] destination, int offset)
-        {
-            Buffer.BlockCopy(source, 0, destination, offset, source.Length);
-
-            return offset + source.Length;
-        }
-
-        private int WriteArray(ExifValue value, byte[] destination, int offset)
-        {
-            if (value.DataType == ExifDataType.Ascii)
-            {
-                return this.WriteValue(ExifDataType.Ascii, value.Value, destination, offset);
-            }
-
-            int newOffset = offset;
-            foreach (object obj in (Array)value.Value)
-            {
-                newOffset = this.WriteValue(value.DataType, obj, destination, newOffset);
-            }
-
-            return newOffset;
-        }
-
-        private int WriteData(Collection<int> indexes, byte[] destination, int offset)
-        {
-            if (this.dataOffsets.Count == 0)
-            {
-                return offset;
-            }
-
-            int newOffset = offset;
-
-            int i = 0;
-            foreach (int index in indexes)
-            {
-                ExifValue value = this.values[index];
-                if (value.Length > 4)
-                {
-                    Write(BitConverter.GetBytes(newOffset - StartIndex), destination, this.dataOffsets[i++]);
-                    newOffset = this.WriteValue(value, destination, newOffset);
-                }
-            }
-
-            return newOffset;
-        }
-
-        private int WriteHeaders(Collection<int> indexes, byte[] destination, int offset)
-        {
-            this.dataOffsets = new Collection<int>();
-
-            int newOffset = Write(BitConverter.GetBytes((ushort)indexes.Count), destination, offset);
-
-            if (indexes.Count == 0)
-            {
-                return newOffset;
-            }
-
-            foreach (int index in indexes)
-            {
-                ExifValue value = this.values[index];
-                newOffset = Write(BitConverter.GetBytes((ushort)value.Tag), destination, newOffset);
-                newOffset = Write(BitConverter.GetBytes((ushort)value.DataType), destination, newOffset);
-                newOffset = Write(BitConverter.GetBytes((uint)value.NumberOfComponents), destination, newOffset);
-
-                if (value.Length > 4)
-                {
-                    this.dataOffsets.Add(newOffset);
-                }
-                else
-                {
-                    this.WriteValue(value, destination, newOffset);
-                }
-
-                newOffset += 4;
-            }
-
-            return newOffset;
-        }
-
-        private int WriteRational(Rational value, byte[] destination, int offset)
-        {
-            Write(BitConverter.GetBytes(value.Numerator), destination, offset);
-            Write(BitConverter.GetBytes(value.Denominator), destination, offset + 4);
-
-            return offset + 8;
-        }
-
-        private int WriteSignedRational(SignedRational value, byte[] destination, int offset)
-        {
-            Write(BitConverter.GetBytes(value.Numerator), destination, offset);
-            Write(BitConverter.GetBytes(value.Denominator), destination, offset + 4);
-
-            return offset + 8;
-        }
-
-        private int WriteValue(ExifDataType dataType, object value, byte[] destination, int offset)
-        {
-            switch (dataType)
-            {
-                case ExifDataType.Ascii:
-                    return Write(Encoding.UTF8.GetBytes((string)value), destination, offset);
-                case ExifDataType.Byte:
-                case ExifDataType.Undefined:
-                    destination[offset] = (byte)value;
-                    return offset + 1;
-                case ExifDataType.DoubleFloat:
-                    return Write(BitConverter.GetBytes((double)value), destination, offset);
-                case ExifDataType.Short:
-                    return Write(BitConverter.GetBytes((ushort)value), destination, offset);
-                case ExifDataType.Long:
-                    return Write(BitConverter.GetBytes((uint)value), destination, offset);
-                case ExifDataType.Rational:
-                    return this.WriteRational((Rational)value, destination, offset);
-                case ExifDataType.SignedByte:
-                    destination[offset] = unchecked((byte)((sbyte)value));
-                    return offset + 1;
-                case ExifDataType.SignedLong:
-                    return Write(BitConverter.GetBytes((int)value), destination, offset);
-                case ExifDataType.SignedShort:
-                    return Write(BitConverter.GetBytes((short)value), destination, offset);
-                case ExifDataType.SignedRational:
-                    return this.WriteSignedRational((SignedRational)value, destination, offset);
-                case ExifDataType.SingleFloat:
-                    return Write(BitConverter.GetBytes((float)value), destination, offset);
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        private int WriteValue(ExifValue value, byte[] destination, int offset)
-        {
-            if (value.IsArray && value.DataType != ExifDataType.Ascii)
-            {
-                return this.WriteArray(value, destination, offset);
-            }
-
-            return this.WriteValue(value.DataType, value.Value, destination, offset);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Profiles/Exif/README.md b/src/ImageSharp46/Profiles/Exif/README.md
deleted file mode 100644
index b6e27b70c..000000000
--- a/src/ImageSharp46/Profiles/Exif/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Adapted from Magick.NET:
-
-https://github.com/dlemstra/Magick.NET/tree/784e23b1f5c824fc03d4b95d3387b3efe1ed510b/Magick.NET/Core/Profiles/Exif
\ No newline at end of file
diff --git a/src/ImageSharp46/ProgressEventArgs.cs b/src/ImageSharp46/ProgressEventArgs.cs
deleted file mode 100644
index 585dd1b63..000000000
--- a/src/ImageSharp46/ProgressEventArgs.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="ProgressEventArgs.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Contains event data related to the progress made processing an image.
-    /// </summary>
-    public class ProgressEventArgs : System.EventArgs
-    {
-        /// <summary>
-        /// Gets or sets the number of rows processed.
-        /// </summary>
-        public int RowsProcessed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the total number of rows.
-        /// </summary>
-        public int TotalRows { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Properties/AssemblyInfo.cs b/src/ImageSharp46/Properties/AssemblyInfo.cs
deleted file mode 100644
index ec405e1d0..000000000
--- a/src/ImageSharp46/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <copyright file="AssemblyInfo.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ImageSharp")]
-[assembly: AssemblyDescription("A cross-platform library for processing of image files; written in C#")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("James Jackson-South")]
-[assembly: AssemblyProduct("ImageSharp")]
-[assembly: AssemblyCopyright("Copyright (c) James Jackson-South and contributors.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
-
-// Ensure the internals can be tested.
-[assembly: InternalsVisibleTo("ImageSharp.Benchmarks")]
-[assembly: InternalsVisibleTo("ImageSharp.Tests")]
diff --git a/src/ImageSharp46/Quantizers/IQuantizer.cs b/src/ImageSharp46/Quantizers/IQuantizer.cs
deleted file mode 100644
index 8b92af125..000000000
--- a/src/ImageSharp46/Quantizers/IQuantizer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="IQuantizer.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    /// <summary>
-    /// Provides methods for allowing quantization of images pixels.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IQuantizer<TColor, TPacked> : IQuantizer
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Quantize an image and return the resulting output pixels.
-        /// </summary>
-        /// <param name="image">The image to quantize.</param>
-        /// <param name="maxColors">The maximum number of colors to return.</param>
-        /// <returns>
-        /// A <see cref="T:QuantizedImage"/> representing a quantized version of the image pixels.
-        /// </returns>
-        QuantizedImage<TColor, TPacked> Quantize(ImageBase<TColor, TPacked> image, int maxColors);
-    }
-
-    /// <summary>
-    /// Provides methods for allowing quantization of images pixels.
-    /// </summary>
-    public interface IQuantizer
-    {
-    }
-}
diff --git a/src/ImageSharp46/Quantizers/Octree/OctreeQuantizer.cs b/src/ImageSharp46/Quantizers/Octree/OctreeQuantizer.cs
deleted file mode 100644
index 5e06a721e..000000000
--- a/src/ImageSharp46/Quantizers/Octree/OctreeQuantizer.cs
+++ /dev/null
@@ -1,518 +0,0 @@
-// <copyright file="OctreeQuantizer.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Encapsulates methods to calculate the colour palette if an image using an Octree pattern.
-    /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public sealed class OctreeQuantizer<TColor, TPacked> : Quantizer<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Stores the tree
-        /// </summary>
-        private Octree octree;
-
-        /// <summary>
-        /// Maximum allowed color depth
-        /// </summary>
-        private int colors;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OctreeQuantizer{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <remarks>
-        /// The Octree quantizer is a two pass algorithm. The initial pass sets up the Octree,
-        /// the second pass quantizes a color based on the nodes in the tree
-        /// </remarks>
-        public OctreeQuantizer()
-            : base(false)
-        {
-        }
-
-        /// <inheritdoc/>
-        public override QuantizedImage<TColor, TPacked> Quantize(ImageBase<TColor, TPacked> image, int maxColors)
-        {
-            this.colors = maxColors.Clamp(1, 256);
-
-            if (this.octree == null)
-            {
-                // Construct the Octree
-                this.octree = new Octree(this.GetBitsNeededForColorDepth(maxColors));
-            }
-
-            return base.Quantize(image, maxColors);
-        }
-
-        /// <summary>
-        /// Process the pixel in the first pass of the algorithm
-        /// </summary>
-        /// <param name="pixel">
-        /// The pixel to quantize
-        /// </param>
-        /// <remarks>
-        /// This function need only be overridden if your quantize algorithm needs two passes,
-        /// such as an Octree quantizer.
-        /// </remarks>
-        protected override void InitialQuantizePixel(TColor pixel)
-        {
-            // Add the color to the Octree
-            this.octree.AddColor(pixel);
-        }
-
-        /// <summary>
-        /// Override this to process the pixel in the second pass of the algorithm
-        /// </summary>
-        /// <param name="pixel">The pixel to quantize</param>
-        /// <returns>
-        /// The quantized value
-        /// </returns>
-        protected override byte QuantizePixel(TColor pixel)
-        {
-            return (byte)this.octree.GetPaletteIndex(pixel);
-        }
-
-        /// <summary>
-        /// Retrieve the palette for the quantized image.
-        /// </summary>
-        /// <returns>
-        /// The new color palette
-        /// </returns>
-        protected override List<TColor> GetPalette()
-        {
-            return this.octree.Palletize(Math.Max(this.colors, 1));
-        }
-
-        /// <summary>
-        /// Returns how many bits are required to store the specified number of colors.
-        /// Performs a Log2() on the value.
-        /// </summary>
-        /// <param name="colorCount">The number of colors.</param>
-        /// <returns>
-        /// The <see cref="int"/>
-        /// </returns>
-        private int GetBitsNeededForColorDepth(int colorCount)
-        {
-            return (int)Math.Ceiling(Math.Log(colorCount, 2));
-        }
-
-        /// <summary>
-        /// Class which does the actual quantization
-        /// </summary>
-        private class Octree
-        {
-            /// <summary>
-            /// Mask used when getting the appropriate pixels for a given node
-            /// </summary>
-            private static readonly int[] Mask = { 0x100, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
-
-            /// <summary>
-            /// The root of the Octree
-            /// </summary>
-            private readonly OctreeNode root;
-
-            /// <summary>
-            /// Array of reducible nodes
-            /// </summary>
-            private readonly OctreeNode[] reducibleNodes;
-
-            /// <summary>
-            /// Maximum number of significant bits in the image
-            /// </summary>
-            private readonly int maxColorBits;
-
-            /// <summary>
-            /// Store the last node quantized
-            /// </summary>
-            private OctreeNode previousNode;
-
-            /// <summary>
-            /// Cache the previous color quantized
-            /// </summary>
-            private TPacked previousColor;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Octree"/> class.
-            /// </summary>
-            /// <param name="maxColorBits">
-            /// The maximum number of significant bits in the image
-            /// </param>
-            public Octree(int maxColorBits)
-            {
-                this.maxColorBits = maxColorBits;
-                this.Leaves = 0;
-                this.reducibleNodes = new OctreeNode[9];
-                this.root = new OctreeNode(0, this.maxColorBits, this);
-                this.previousColor = default(TPacked);
-                this.previousNode = null;
-            }
-
-            /// <summary>
-            /// Gets or sets the number of leaves in the tree
-            /// </summary>
-            private int Leaves { get; set; }
-
-            /// <summary>
-            /// Gets the array of reducible nodes
-            /// </summary>
-            private OctreeNode[] ReducibleNodes => this.reducibleNodes;
-
-            /// <summary>
-            /// Add a given color value to the Octree
-            /// </summary>
-            /// <param name="pixel">
-            /// The <typeparamref name="TColor"/> containing color information to add.
-            /// </param>
-            public void AddColor(TColor pixel)
-            {
-                TPacked packed = pixel.PackedValue;
-
-                // Check if this request is for the same color as the last
-                if (this.previousColor.Equals(packed))
-                {
-                    // If so, check if I have a previous node setup. This will only occur if the first color in the image
-                    // happens to be black, with an alpha component of zero.
-                    if (this.previousNode == null)
-                    {
-                        this.previousColor = packed;
-                        this.root.AddColor(pixel, this.maxColorBits, 0, this);
-                    }
-                    else
-                    {
-                        // Just update the previous node
-                        this.previousNode.Increment(pixel);
-                    }
-                }
-                else
-                {
-                    this.previousColor = packed;
-                    this.root.AddColor(pixel, this.maxColorBits, 0, this);
-                }
-            }
-
-            /// <summary>
-            /// Convert the nodes in the Octree to a palette with a maximum of colorCount colors
-            /// </summary>
-            /// <param name="colorCount">The maximum number of colors</param>
-            /// <returns>
-            /// An <see cref="List{TColor}"/> with the palletized colors
-            /// </returns>
-            public List<TColor> Palletize(int colorCount)
-            {
-                while (this.Leaves > colorCount)
-                {
-                    this.Reduce();
-                }
-
-                // Now palletize the nodes
-                List<TColor> palette = new List<TColor>(this.Leaves);
-                int paletteIndex = 0;
-                this.root.ConstructPalette(palette, ref paletteIndex);
-
-                // And return the palette
-                return palette;
-            }
-
-            /// <summary>
-            /// Get the palette index for the passed color
-            /// </summary>
-            /// <param name="pixel">The <typeparamref name="TColor"/> containing the pixel data.</param>
-            /// <returns>
-            /// The index of the given structure.
-            /// </returns>
-            public int GetPaletteIndex(TColor pixel)
-            {
-                return this.root.GetPaletteIndex(pixel, 0);
-            }
-
-            /// <summary>
-            /// Keep track of the previous node that was quantized
-            /// </summary>
-            /// <param name="node">
-            /// The node last quantized
-            /// </param>
-            protected void TrackPrevious(OctreeNode node)
-            {
-                this.previousNode = node;
-            }
-
-            /// <summary>
-            /// Reduce the depth of the tree
-            /// </summary>
-            private void Reduce()
-            {
-                // Find the deepest level containing at least one reducible node
-                int index = this.maxColorBits - 1;
-                while ((index > 0) && (this.reducibleNodes[index] == null))
-                {
-                    index--;
-                }
-
-                // Reduce the node most recently added to the list at level 'index'
-                OctreeNode node = this.reducibleNodes[index];
-                this.reducibleNodes[index] = node.NextReducible;
-
-                // Decrement the leaf count after reducing the node
-                this.Leaves -= node.Reduce();
-
-                // And just in case I've reduced the last color to be added, and the next color to
-                // be added is the same, invalidate the previousNode...
-                this.previousNode = null;
-            }
-
-            /// <summary>
-            /// Class which encapsulates each node in the tree
-            /// </summary>
-            protected class OctreeNode
-            {
-                /// <summary>
-                /// Pointers to any child nodes
-                /// </summary>
-                private readonly OctreeNode[] children;
-
-                /// <summary>
-                /// Flag indicating that this is a leaf node
-                /// </summary>
-                private bool leaf;
-
-                /// <summary>
-                /// Number of pixels in this node
-                /// </summary>
-                private int pixelCount;
-
-                /// <summary>
-                /// Red component
-                /// </summary>
-                private int red;
-
-                /// <summary>
-                /// Green Component
-                /// </summary>
-                private int green;
-
-                /// <summary>
-                /// Blue component
-                /// </summary>
-                private int blue;
-
-                /// <summary>
-                /// Alpha component
-                /// </summary>
-                private int alpha;
-
-                /// <summary>
-                /// The index of this node in the palette
-                /// </summary>
-                private int paletteIndex;
-
-                /// <summary>
-                /// Initializes a new instance of the <see cref="OctreeNode"/> class.
-                /// </summary>
-                /// <param name="level">
-                /// The level in the tree = 0 - 7
-                /// </param>
-                /// <param name="colorBits">
-                /// The number of significant color bits in the image
-                /// </param>
-                /// <param name="octree">
-                /// The tree to which this node belongs
-                /// </param>
-                public OctreeNode(int level, int colorBits, Octree octree)
-                {
-                    // Construct the new node
-                    this.leaf = level == colorBits;
-
-                    this.red = this.green = this.blue = this.alpha = 0;
-                    this.pixelCount = 0;
-
-                    // If a leaf, increment the leaf count
-                    if (this.leaf)
-                    {
-                        octree.Leaves++;
-                        this.NextReducible = null;
-                        this.children = null;
-                    }
-                    else
-                    {
-                        // Otherwise add this to the reducible nodes
-                        this.NextReducible = octree.ReducibleNodes[level];
-                        octree.ReducibleNodes[level] = this;
-                        this.children = new OctreeNode[8];
-                    }
-                }
-
-                /// <summary>
-                /// Gets the next reducible node
-                /// </summary>
-                public OctreeNode NextReducible { get; }
-
-                /// <summary>
-                /// Add a color into the tree
-                /// </summary>
-                /// <param name="pixel">The color</param>
-                /// <param name="colorBits">The number of significant color bits</param>
-                /// <param name="level">The level in the tree</param>
-                /// <param name="octree">The tree to which this node belongs</param>
-                public void AddColor(TColor pixel, int colorBits, int level, Octree octree)
-                {
-                    // Update the color information if this is a leaf
-                    if (this.leaf)
-                    {
-                        this.Increment(pixel);
-
-                        // Setup the previous node
-                        octree.TrackPrevious(this);
-                    }
-                    else
-                    {
-                        // Go to the next level down in the tree
-                        int shift = 7 - level;
-                        Color color = new Color(pixel.ToVector4());
-                        int index = ((color.A & Mask[0]) >> (shift - 3)) |
-                                    ((color.B & Mask[level + 1]) >> (shift - 2)) |
-                                    ((color.G & Mask[level + 1]) >> (shift - 1)) |
-                                    ((color.R & Mask[level + 1]) >> shift);
-
-                        OctreeNode child = this.children[index];
-
-                        if (child == null)
-                        {
-                            // Create a new child node and store it in the array
-                            child = new OctreeNode(level + 1, colorBits, octree);
-                            this.children[index] = child;
-                        }
-
-                        // Add the color to the child node
-                        child.AddColor(pixel, colorBits, level + 1, octree);
-                    }
-                }
-
-                /// <summary>
-                /// Reduce this node by removing all of its children
-                /// </summary>
-                /// <returns>The number of leaves removed</returns>
-                public int Reduce()
-                {
-                    this.red = this.green = this.blue = this.alpha = 0;
-                    int childNodes = 0;
-
-                    // Loop through all children and add their information to this node
-                    for (int index = 0; index < 8; index++)
-                    {
-                        if (this.children[index] != null)
-                        {
-                            this.red += this.children[index].red;
-                            this.green += this.children[index].green;
-                            this.blue += this.children[index].blue;
-                            this.alpha += this.children[index].alpha;
-                            this.pixelCount += this.children[index].pixelCount;
-                            ++childNodes;
-                            this.children[index] = null;
-                        }
-                    }
-
-                    // Now change this to a leaf node
-                    this.leaf = true;
-
-                    // Return the number of nodes to decrement the leaf count by
-                    return childNodes - 1;
-                }
-
-                /// <summary>
-                /// Traverse the tree, building up the color palette
-                /// </summary>
-                /// <param name="palette">The palette</param>
-                /// <param name="index">The current palette index</param>
-                public void ConstructPalette(List<TColor> palette, ref int index)
-                {
-                    if (this.leaf)
-                    {
-                        // Consume the next palette index
-                        this.paletteIndex = index++;
-
-                        byte r = (this.red / this.pixelCount).ToByte();
-                        byte g = (this.green / this.pixelCount).ToByte();
-                        byte b = (this.blue / this.pixelCount).ToByte();
-                        byte a = (this.alpha / this.pixelCount).ToByte();
-
-                        // And set the color of the palette entry
-                        TColor pixel = default(TColor);
-                        pixel.PackFromVector4(new Color(r, g, b, a).ToVector4());
-                        palette.Add(pixel);
-                    }
-                    else
-                    {
-                        // Loop through children looking for leaves
-                        for (int i = 0; i < 8; i++)
-                        {
-                            if (this.children[i] != null)
-                            {
-                                this.children[i].ConstructPalette(palette, ref index);
-                            }
-                        }
-                    }
-                }
-
-                /// <summary>
-                /// Return the palette index for the passed color
-                /// </summary>
-                /// <param name="pixel">The <typeparamref name="TColor"/> representing the pixel.</param>
-                /// <param name="level">The level.</param>
-                /// <returns>
-                /// The <see cref="int"/> representing the index of the pixel in the palette.
-                /// </returns>
-                public int GetPaletteIndex(TColor pixel, int level)
-                {
-                    int index = this.paletteIndex;
-
-                    if (!this.leaf)
-                    {
-                        int shift = 7 - level;
-                        Color color = new Color(pixel.ToVector4());
-                        int pixelIndex = ((color.A & Mask[0]) >> (shift - 3)) |
-                                         ((color.B & Mask[level + 1]) >> (shift - 2)) |
-                                         ((color.G & Mask[level + 1]) >> (shift - 1)) |
-                                         ((color.R & Mask[level + 1]) >> shift);
-
-                        if (this.children[pixelIndex] != null)
-                        {
-                            index = this.children[pixelIndex].GetPaletteIndex(pixel, level + 1);
-                        }
-                        else
-                        {
-                            throw new Exception($"Cannot retrive a pixel at the given index {pixelIndex}.");
-                        }
-                    }
-
-                    return index;
-                }
-
-                /// <summary>
-                /// Increment the pixel count and add to the color information
-                /// </summary>
-                /// <param name="pixel">
-                /// The pixel to add.
-                /// </param>
-                public void Increment(TColor pixel)
-                {
-                    this.pixelCount++;
-                    Color color = new Color(pixel.ToVector4());
-                    this.red += color.R;
-                    this.green += color.G;
-                    this.blue += color.B;
-                    this.alpha += color.A;
-                }
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Quantizers/Octree/Quantizer.cs b/src/ImageSharp46/Quantizers/Octree/Quantizer.cs
deleted file mode 100644
index d88832634..000000000
--- a/src/ImageSharp46/Quantizers/Octree/Quantizer.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// <copyright file="Quantizer.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Encapsulates methods to calculate the color palette of an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class Quantizer<TColor, TPacked> : IQuantizer<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Flag used to indicate whether a single pass or two passes are needed for quantization.
-        /// </summary>
-        private readonly bool singlePass;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Quantizer{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="singlePass">
-        /// If true, the quantization only needs to loop through the source pixels once
-        /// </param>
-        /// <remarks>
-        /// If you construct this class with a true value for singlePass, then the code will, when quantizing your image,
-        /// only call the 'QuantizeImage' function. If two passes are required, the code will call 'InitialQuantizeImage'
-        /// and then 'QuantizeImage'.
-        /// </remarks>
-        protected Quantizer(bool singlePass)
-        {
-            this.singlePass = singlePass;
-        }
-
-        /// <inheritdoc/>
-        public virtual QuantizedImage<TColor, TPacked> Quantize(ImageBase<TColor, TPacked> image, int maxColors)
-        {
-            Guard.NotNull(image, nameof(image));
-
-            // Get the size of the source image
-            int height = image.Height;
-            int width = image.Width;
-            byte[] quantizedPixels = new byte[width * height];
-            List<TColor> palette;
-
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                // Call the FirstPass function if not a single pass algorithm.
-                // For something like an Octree quantizer, this will run through
-                // all image pixels, build a data structure, and create a palette.
-                if (!this.singlePass)
-                {
-                    this.FirstPass(pixels, width, height);
-                }
-
-                // Get the palette
-                palette = this.GetPalette();
-
-                this.SecondPass(pixels, quantizedPixels, width, height);
-            }
-
-            return new QuantizedImage<TColor, TPacked>(width, height, palette.ToArray(), quantizedPixels);
-        }
-
-        /// <summary>
-        /// Execute the first pass through the pixels in the image
-        /// </summary>
-        /// <param name="source">The source data</param>
-        /// <param name="width">The width in pixels of the image.</param>
-        /// <param name="height">The height in pixels of the image.</param>
-        protected virtual void FirstPass(PixelAccessor<TColor, TPacked> source, int width, int height)
-        {
-            // Loop through each row
-            for (int y = 0; y < height; y++)
-            {
-                // And loop through each column
-                for (int x = 0; x < width; x++)
-                {
-                    // Now I have the pixel, call the FirstPassQuantize function...
-                    this.InitialQuantizePixel(source[x, y]);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Execute a second pass through the bitmap
-        /// </summary>
-        /// <param name="source">The source image.</param>
-        /// <param name="output">The output pixel array</param>
-        /// <param name="width">The width in pixels of the image</param>
-        /// <param name="height">The height in pixels of the image</param>
-        protected virtual void SecondPass(PixelAccessor<TColor, TPacked> source, byte[] output, int width, int height)
-        {
-            Parallel.For(
-                0,
-                source.Height,
-                Bootstrapper.Instance.ParallelOptions,
-                y =>
-                    {
-                        for (int x = 0; x < source.Width; x++)
-                        {
-                            TColor sourcePixel = source[x, y];
-                            output[(y * source.Width) + x] = this.QuantizePixel(sourcePixel);
-                        }
-                    });
-        }
-
-        /// <summary>
-        /// Override this to process the pixel in the first pass of the algorithm
-        /// </summary>
-        /// <param name="pixel">The pixel to quantize</param>
-        /// <remarks>
-        /// This function need only be overridden if your quantize algorithm needs two passes,
-        /// such as an Octree quantizer.
-        /// </remarks>
-        protected virtual void InitialQuantizePixel(TColor pixel)
-        {
-        }
-
-        /// <summary>
-        /// Override this to process the pixel in the second pass of the algorithm
-        /// </summary>
-        /// <param name="pixel">The pixel to quantize</param>
-        /// <returns>
-        /// The quantized value
-        /// </returns>
-        protected abstract byte QuantizePixel(TColor pixel);
-
-        /// <summary>
-        /// Retrieve the palette for the quantized image
-        /// </summary>
-        /// <returns>
-        /// The new color palette
-        /// </returns>
-        protected abstract List<TColor> GetPalette();
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Quantizers/Options/Quantization.cs b/src/ImageSharp46/Quantizers/Options/Quantization.cs
deleted file mode 100644
index 428c8e801..000000000
--- a/src/ImageSharp46/Quantizers/Options/Quantization.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// <copyright file="Quantization.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Provides enumeration over how an image should be quantized.
-    /// </summary>
-    public enum Quantization
-    {
-        /// <summary>
-        /// An adaptive Octree quantizer. Fast with good quality.
-        /// </summary>
-        Octree,
-
-        /// <summary>
-        /// Xiaolin Wu's Color Quantizer which generates high quality output.
-        /// </summary>
-        Wu,
-
-        /// <summary>
-        /// Palette based, Uses the collection of web-safe colors by default.
-        /// </summary>
-        Palette
-    }
-}
diff --git a/src/ImageSharp46/Quantizers/Palette/PaletteQuantizer.cs b/src/ImageSharp46/Quantizers/Palette/PaletteQuantizer.cs
deleted file mode 100644
index 73b7f1af2..000000000
--- a/src/ImageSharp46/Quantizers/Palette/PaletteQuantizer.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// <copyright file="PaletteQuantizer.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    using System;
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Encapsulates methods to create a quantized image based upon the given palette.
-    /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class PaletteQuantizer<TColor, TPacked> : Quantizer<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// A lookup table for colors
-        /// </summary>
-        private readonly ConcurrentDictionary<string, byte> colorMap = new ConcurrentDictionary<string, byte>();
-
-        /// <summary>
-        /// List of all colors in the palette
-        /// </summary>
-        private TColor[] colors;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PaletteQuantizer{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="palette">
-        /// The color palette. If none is given this will default to the web safe colors defined
-        /// in the CSS Color Module Level 4.
-        /// </param>
-        public PaletteQuantizer(TColor[] palette = null)
-            : base(true)
-        {
-            if (palette == null)
-            {
-                Color[] constants = ColorConstants.WebSafeColors;
-                List<TColor> safe = new List<TColor> { default(TColor) };
-                foreach (Color c in constants)
-                {
-                    TColor packed = default(TColor);
-                    packed.PackFromVector4(c.ToVector4());
-                    safe.Add(packed);
-                }
-
-                this.colors = safe.ToArray();
-            }
-            else
-            {
-                this.colors = palette;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override QuantizedImage<TColor, TPacked> Quantize(ImageBase<TColor, TPacked> image, int maxColors)
-        {
-            Array.Resize(ref this.colors, maxColors.Clamp(1, 256));
-            return base.Quantize(image, maxColors);
-        }
-
-        /// <inheritdoc/>
-        protected override byte QuantizePixel(TColor pixel)
-        {
-            byte colorIndex = 0;
-            string colorHash = pixel.ToString();
-
-            // Check if the color is in the lookup table
-            if (this.colorMap.ContainsKey(colorHash))
-            {
-                colorIndex = this.colorMap[colorHash];
-            }
-            else
-            {
-                // Not found - loop through the palette and find the nearest match.
-                Color color = new Color(pixel.ToVector4());
-
-                int leastDistance = int.MaxValue;
-                int red = color.R;
-                int green = color.G;
-                int blue = color.B;
-                int alpha = color.A;
-
-                for (int index = 0; index < this.colors.Length; index++)
-                {
-                    Color paletteColor = new Color(this.colors[index].ToVector4());
-                    int redDistance = paletteColor.R - red;
-                    int greenDistance = paletteColor.G - green;
-                    int blueDistance = paletteColor.B - blue;
-                    int alphaDistance = paletteColor.A - alpha;
-
-                    int distance = (redDistance * redDistance) +
-                                   (greenDistance * greenDistance) +
-                                   (blueDistance * blueDistance) +
-                                   (alphaDistance * alphaDistance);
-
-                    if (distance < leastDistance)
-                    {
-                        colorIndex = (byte)index;
-                        leastDistance = distance;
-
-                        // And if it's an exact match, exit the loop
-                        if (distance == 0)
-                        {
-                            break;
-                        }
-                    }
-                }
-
-                // Now I have the color, pop it into the cache for next time
-                this.colorMap.TryAdd(colorHash, colorIndex);
-            }
-
-            return colorIndex;
-        }
-
-        /// <inheritdoc/>
-        protected override List<TColor> GetPalette()
-        {
-            return this.colors.ToList();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Quantizers/Quantize.cs b/src/ImageSharp46/Quantizers/Quantize.cs
deleted file mode 100644
index 0a339a527..000000000
--- a/src/ImageSharp46/Quantizers/Quantize.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <copyright file="Quantize.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using ImageSharp.Quantizers;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies quantization to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="mode">The quantization mode to apply to perform the operation.</param>
-        /// <param name="maxColors">The maximum number of colors to return. Defaults to 256.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Quantize<TColor, TPacked>(this Image<TColor, TPacked> source, Quantization mode = Quantization.Octree, int maxColors = 256)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            IQuantizer<TColor, TPacked> quantizer;
-            switch (mode)
-            {
-                case Quantization.Wu:
-                    quantizer = new WuQuantizer<TColor, TPacked>();
-                    break;
-
-                case Quantization.Palette:
-                    quantizer = new PaletteQuantizer<TColor, TPacked>();
-                    break;
-
-                default:
-                    quantizer = new OctreeQuantizer<TColor, TPacked>();
-                    break;
-            }
-
-            return Quantize(source, quantizer, maxColors);
-        }
-
-        /// <summary>
-        /// Applies quantization to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="quantizer">The quantizer to apply to perform the operation.</param>
-        /// <param name="maxColors">The maximum number of colors to return.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Quantize<TColor, TPacked>(this Image<TColor, TPacked> source, IQuantizer<TColor, TPacked> quantizer, int maxColors)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            QuantizedImage<TColor, TPacked> quantizedImage = quantizer.Quantize(source, maxColors);
-            source.SetPixels(source.Width, source.Height, quantizedImage.ToImage().Pixels);
-            return source;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Quantizers/QuantizedImage.cs b/src/ImageSharp46/Quantizers/QuantizedImage.cs
deleted file mode 100644
index 956557c62..000000000
--- a/src/ImageSharp46/Quantizers/QuantizedImage.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// <copyright file="QuantizedImage.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    using System;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Represents a quantized image where the pixels indexed by a color palette.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class QuantizedImage<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuantizedImage{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="width">The image width.</param>
-        /// <param name="height">The image height.</param>
-        /// <param name="palette">The color palette.</param>
-        /// <param name="pixels">The quantized pixels.</param>
-        public QuantizedImage(int width, int height, TColor[] palette, byte[] pixels)
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-            Guard.NotNull(palette, nameof(palette));
-            Guard.NotNull(pixels, nameof(pixels));
-
-            if (pixels.Length != width * height)
-            {
-                throw new ArgumentException(
-                    $"Pixel array size must be {nameof(width)} * {nameof(height)}", nameof(pixels));
-            }
-
-            this.Width = width;
-            this.Height = height;
-            this.Palette = palette;
-            this.Pixels = pixels;
-        }
-
-        /// <summary>
-        /// Gets the width of this <see cref="T:QuantizedImage"/>.
-        /// </summary>
-        public int Width { get; }
-
-        /// <summary>
-        /// Gets the height of this <see cref="T:QuantizedImage"/>.
-        /// </summary>
-        public int Height { get; }
-
-        /// <summary>
-        /// Gets the color palette of this <see cref="T:QuantizedImage"/>.
-        /// </summary>
-        public TColor[] Palette { get; }
-
-        /// <summary>
-        /// Gets the pixels of this <see cref="T:QuantizedImage"/>.
-        /// </summary>
-        public byte[] Pixels { get; }
-
-        /// <summary>
-        /// Converts this quantized image to a normal image.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="Image"/>
-        /// </returns>
-        public Image<TColor, TPacked> ToImage()
-        {
-            Image<TColor, TPacked> image = new Image<TColor, TPacked>();
-
-            int pixelCount = this.Pixels.Length;
-            int palletCount = this.Palette.Length - 1;
-            TColor[] pixels = new TColor[pixelCount];
-
-            Parallel.For(
-                0,
-                pixelCount,
-                Bootstrapper.Instance.ParallelOptions,
-                i =>
-                    {
-                        TColor color = this.Palette[Math.Min(palletCount, this.Pixels[i])];
-                        pixels[i] = color;
-                    });
-
-            image.SetPixels(this.Width, this.Height, pixels);
-            return image;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Quantizers/Wu/Box.cs b/src/ImageSharp46/Quantizers/Wu/Box.cs
deleted file mode 100644
index e715c7839..000000000
--- a/src/ImageSharp46/Quantizers/Wu/Box.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// <copyright file="Box.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    /// <summary>
-    /// Represents a box color cube.
-    /// </summary>
-    internal sealed class Box
-    {
-        /// <summary>
-        /// Gets or sets the min red value, exclusive.
-        /// </summary>
-        public int R0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max red value, inclusive.
-        /// </summary>
-        public int R1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min green value, exclusive.
-        /// </summary>
-        public int G0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max green value, inclusive.
-        /// </summary>
-        public int G1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min blue value, exclusive.
-        /// </summary>
-        public int B0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max blue value, inclusive.
-        /// </summary>
-        public int B1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min alpha value, exclusive.
-        /// </summary>
-        public int A0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max alpha value, inclusive.
-        /// </summary>
-        public int A1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the volume.
-        /// </summary>
-        public int Volume { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Quantizers/Wu/WuQuantizer.cs b/src/ImageSharp46/Quantizers/Wu/WuQuantizer.cs
deleted file mode 100644
index 8eabe38e6..000000000
--- a/src/ImageSharp46/Quantizers/Wu/WuQuantizer.cs
+++ /dev/null
@@ -1,777 +0,0 @@
-// <copyright file="WuQuantizer.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Quantizers
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An implementation of Wu's color quantizer with alpha channel.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Based on C Implementation of Xiaolin Wu's Color Quantizer (v. 2)
-    /// (see Graphics Gems volume II, pages 126-133)
-    /// (<see href="http://www.ece.mcmaster.ca/~xwu/cq.c"/>).
-    /// </para>
-    /// <para>
-    /// This adaptation is based on the excellent JeremyAnsel.ColorQuant by Jérémy Ansel
-    /// <see href="https://github.com/JeremyAnsel/JeremyAnsel.ColorQuant"/>
-    /// </para>
-    /// <para>
-    /// Algorithm: Greedy orthogonal bipartition of RGB space for variance
-    /// minimization aided by inclusion-exclusion tricks.
-    /// For speed no nearest neighbor search is done. Slightly
-    /// better performance can be expected by more sophisticated
-    /// but more expensive versions.
-    /// </para>
-    /// </remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public sealed class WuQuantizer<TColor, TPacked> : IQuantizer<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The epsilon for comparing floating point numbers.
-        /// </summary>
-        private const float Epsilon = 0.001f;
-
-        /// <summary>
-        /// The index bits.
-        /// </summary>
-        private const int IndexBits = 6;
-
-        /// <summary>
-        /// The index alpha bits.
-        /// </summary>
-        private const int IndexAlphaBits = 3;
-
-        /// <summary>
-        /// The index count.
-        /// </summary>
-        private const int IndexCount = (1 << IndexBits) + 1;
-
-        /// <summary>
-        /// The index alpha count.
-        /// </summary>
-        private const int IndexAlphaCount = (1 << IndexAlphaBits) + 1;
-
-        /// <summary>
-        /// The table length.
-        /// </summary>
-        private const int TableLength = IndexCount * IndexCount * IndexCount * IndexAlphaCount;
-
-        /// <summary>
-        /// Moment of <c>P(c)</c>.
-        /// </summary>
-        private readonly long[] vwt;
-
-        /// <summary>
-        /// Moment of <c>r*P(c)</c>.
-        /// </summary>
-        private readonly long[] vmr;
-
-        /// <summary>
-        /// Moment of <c>g*P(c)</c>.
-        /// </summary>
-        private readonly long[] vmg;
-
-        /// <summary>
-        /// Moment of <c>b*P(c)</c>.
-        /// </summary>
-        private readonly long[] vmb;
-
-        /// <summary>
-        /// Moment of <c>a*P(c)</c>.
-        /// </summary>
-        private readonly long[] vma;
-
-        /// <summary>
-        /// Moment of <c>c^2*P(c)</c>.
-        /// </summary>
-        private readonly double[] m2;
-
-        /// <summary>
-        /// Color space tag.
-        /// </summary>
-        private readonly byte[] tag;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WuQuantizer{TColor,TPacked}"/> class.
-        /// </summary>
-        public WuQuantizer()
-        {
-            this.vwt = new long[TableLength];
-            this.vmr = new long[TableLength];
-            this.vmg = new long[TableLength];
-            this.vmb = new long[TableLength];
-            this.vma = new long[TableLength];
-            this.m2 = new double[TableLength];
-            this.tag = new byte[TableLength];
-        }
-
-        /// <inheritdoc/>
-        public QuantizedImage<TColor, TPacked> Quantize(ImageBase<TColor, TPacked> image, int maxColors)
-        {
-            Guard.NotNull(image, nameof(image));
-
-            int colorCount = maxColors.Clamp(1, 256);
-
-            this.Clear();
-
-            using (PixelAccessor<TColor, TPacked> imagePixels = image.Lock())
-            {
-                this.Build3DHistogram(imagePixels);
-                this.Get3DMoments();
-
-                Box[] cube;
-                this.BuildCube(out cube, ref colorCount);
-
-                return this.GenerateResult(imagePixels, colorCount, cube);
-            }
-        }
-
-        /// <summary>
-        /// Gets an index.
-        /// </summary>
-        /// <param name="r">The red value.</param>
-        /// <param name="g">The green value.</param>
-        /// <param name="b">The blue value.</param>
-        /// <param name="a">The alpha value.</param>
-        /// <returns>The index.</returns>
-        private static int GetPaletteIndex(int r, int g, int b, int a)
-        {
-            return (r << ((IndexBits * 2) + IndexAlphaBits))
-                + (r << (IndexBits + IndexAlphaBits + 1))
-                + (g << (IndexBits + IndexAlphaBits))
-                + (r << (IndexBits * 2))
-                + (r << (IndexBits + 1))
-                + (g << IndexBits)
-                + ((r + g + b) << IndexAlphaBits)
-                + r + g + b + a;
-        }
-
-        /// <summary>
-        /// Computes sum over a box of any given statistic.
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="moment">The moment.</param>
-        /// <returns>The result.</returns>
-        private static double Volume(Box cube, long[] moment)
-        {
-            return moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
-                - moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
-                - moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A1)]
-                + moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
-                - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A1)]
-                + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
-                + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
-                - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A1)]
-                + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
-                + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
-                - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
-                - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-        }
-
-        /// <summary>
-        /// Computes part of Volume(cube, moment) that doesn't depend on r1, g1, or b1 (depending on direction).
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="direction">The direction.</param>
-        /// <param name="moment">The moment.</param>
-        /// <returns>The result.</returns>
-        private static long Bottom(Box cube, int direction, long[] moment)
-        {
-            switch (direction)
-            {
-                // Red
-                case 0:
-                    return -moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-
-                // Green
-                case 1:
-                    return -moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-
-                // Blue
-                case 2:
-                    return -moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-
-                // Alpha
-                case 3:
-                    return -moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(direction));
-            }
-        }
-
-        /// <summary>
-        /// Computes remainder of Volume(cube, moment), substituting position for r1, g1, or b1 (depending on direction).
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="direction">The direction.</param>
-        /// <param name="position">The position.</param>
-        /// <param name="moment">The moment.</param>
-        /// <returns>The result.</returns>
-        private static long Top(Box cube, int direction, int position, long[] moment)
-        {
-            switch (direction)
-            {
-                // Red
-                case 0:
-                    return moment[GetPaletteIndex(position, cube.G1, cube.B1, cube.A1)]
-                        - moment[GetPaletteIndex(position, cube.G1, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(position, cube.G1, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(position, cube.G1, cube.B0, cube.A0)]
-                        - moment[GetPaletteIndex(position, cube.G0, cube.B1, cube.A1)]
-                        + moment[GetPaletteIndex(position, cube.G0, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(position, cube.G0, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(position, cube.G0, cube.B0, cube.A0)];
-
-                // Green
-                case 1:
-                    return moment[GetPaletteIndex(cube.R1, position, cube.B1, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R1, position, cube.B1, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R1, position, cube.B0, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R1, position, cube.B0, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, position, cube.B1, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, position, cube.B1, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, position, cube.B0, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, position, cube.B0, cube.A0)];
-
-                // Blue
-                case 2:
-                    return moment[GetPaletteIndex(cube.R1, cube.G1, position, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G1, position, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G0, position, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, position, cube.A0)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G1, position, cube.A1)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, position, cube.A0)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, position, cube.A1)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, position, cube.A0)];
-
-                // Alpha
-                case 3:
-                    return moment[GetPaletteIndex(cube.R1, cube.G1, cube.B1, position)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G1, cube.B0, position)]
-                        - moment[GetPaletteIndex(cube.R1, cube.G0, cube.B1, position)]
-                        + moment[GetPaletteIndex(cube.R1, cube.G0, cube.B0, position)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G1, cube.B1, position)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G1, cube.B0, position)]
-                        + moment[GetPaletteIndex(cube.R0, cube.G0, cube.B1, position)]
-                        - moment[GetPaletteIndex(cube.R0, cube.G0, cube.B0, position)];
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(direction));
-            }
-        }
-
-        /// <summary>
-        /// Clears the tables.
-        /// </summary>
-        private void Clear()
-        {
-            Array.Clear(this.vwt, 0, TableLength);
-            Array.Clear(this.vmr, 0, TableLength);
-            Array.Clear(this.vmg, 0, TableLength);
-            Array.Clear(this.vmb, 0, TableLength);
-            Array.Clear(this.vma, 0, TableLength);
-            Array.Clear(this.m2, 0, TableLength);
-
-            Array.Clear(this.tag, 0, TableLength);
-        }
-
-        /// <summary>
-        /// Builds a 3-D color histogram of <c>counts, r/g/b, c^2</c>.
-        /// </summary>
-        /// <param name="pixels">The pixel accessor.</param>
-        private void Build3DHistogram(PixelAccessor<TColor, TPacked> pixels)
-        {
-            for (int y = 0; y < pixels.Height; y++)
-            {
-                for (int x = 0; x < pixels.Width; x++)
-                {
-                    // Colors are expected in r->g->b->a format
-                    Color color = new Color(pixels[x, y].ToVector4());
-
-                    byte r = color.R;
-                    byte g = color.G;
-                    byte b = color.B;
-                    byte a = color.A;
-
-                    int inr = r >> (8 - IndexBits);
-                    int ing = g >> (8 - IndexBits);
-                    int inb = b >> (8 - IndexBits);
-                    int ina = a >> (8 - IndexAlphaBits);
-
-                    int ind = GetPaletteIndex(inr + 1, ing + 1, inb + 1, ina + 1);
-
-                    this.vwt[ind]++;
-                    this.vmr[ind] += r;
-                    this.vmg[ind] += g;
-                    this.vmb[ind] += b;
-                    this.vma[ind] += a;
-                    this.m2[ind] += (r * r) + (g * g) + (b * b) + (a * a);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Converts the histogram into moments so that we can rapidly calculate
-        /// the sums of the above quantities over any desired box.
-        /// </summary>
-        private void Get3DMoments()
-        {
-            long[] volume = new long[IndexCount * IndexAlphaCount];
-            long[] volumeR = new long[IndexCount * IndexAlphaCount];
-            long[] volumeG = new long[IndexCount * IndexAlphaCount];
-            long[] volumeB = new long[IndexCount * IndexAlphaCount];
-            long[] volumeA = new long[IndexCount * IndexAlphaCount];
-            double[] volume2 = new double[IndexCount * IndexAlphaCount];
-
-            long[] area = new long[IndexAlphaCount];
-            long[] areaR = new long[IndexAlphaCount];
-            long[] areaG = new long[IndexAlphaCount];
-            long[] areaB = new long[IndexAlphaCount];
-            long[] areaA = new long[IndexAlphaCount];
-            double[] area2 = new double[IndexAlphaCount];
-
-            for (int r = 1; r < IndexCount; r++)
-            {
-                Array.Clear(volume, 0, IndexCount * IndexAlphaCount);
-                Array.Clear(volumeR, 0, IndexCount * IndexAlphaCount);
-                Array.Clear(volumeG, 0, IndexCount * IndexAlphaCount);
-                Array.Clear(volumeB, 0, IndexCount * IndexAlphaCount);
-                Array.Clear(volumeA, 0, IndexCount * IndexAlphaCount);
-                Array.Clear(volume2, 0, IndexCount * IndexAlphaCount);
-
-                for (int g = 1; g < IndexCount; g++)
-                {
-                    Array.Clear(area, 0, IndexAlphaCount);
-                    Array.Clear(areaR, 0, IndexAlphaCount);
-                    Array.Clear(areaG, 0, IndexAlphaCount);
-                    Array.Clear(areaB, 0, IndexAlphaCount);
-                    Array.Clear(areaA, 0, IndexAlphaCount);
-                    Array.Clear(area2, 0, IndexAlphaCount);
-
-                    for (int b = 1; b < IndexCount; b++)
-                    {
-                        long line = 0;
-                        long lineR = 0;
-                        long lineG = 0;
-                        long lineB = 0;
-                        long lineA = 0;
-                        double line2 = 0;
-
-                        for (int a = 1; a < IndexAlphaCount; a++)
-                        {
-                            int ind1 = GetPaletteIndex(r, g, b, a);
-
-                            line += this.vwt[ind1];
-                            lineR += this.vmr[ind1];
-                            lineG += this.vmg[ind1];
-                            lineB += this.vmb[ind1];
-                            lineA += this.vma[ind1];
-                            line2 += this.m2[ind1];
-
-                            area[a] += line;
-                            areaR[a] += lineR;
-                            areaG[a] += lineG;
-                            areaB[a] += lineB;
-                            areaA[a] += lineA;
-                            area2[a] += line2;
-
-                            int inv = (b * IndexAlphaCount) + a;
-
-                            volume[inv] += area[a];
-                            volumeR[inv] += areaR[a];
-                            volumeG[inv] += areaG[a];
-                            volumeB[inv] += areaB[a];
-                            volumeA[inv] += areaA[a];
-                            volume2[inv] += area2[a];
-
-                            int ind2 = ind1 - GetPaletteIndex(1, 0, 0, 0);
-
-                            this.vwt[ind1] = this.vwt[ind2] + volume[inv];
-                            this.vmr[ind1] = this.vmr[ind2] + volumeR[inv];
-                            this.vmg[ind1] = this.vmg[ind2] + volumeG[inv];
-                            this.vmb[ind1] = this.vmb[ind2] + volumeB[inv];
-                            this.vma[ind1] = this.vma[ind2] + volumeA[inv];
-                            this.m2[ind1] = this.m2[ind2] + volume2[inv];
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Computes the weighted variance of a box cube.
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <returns>The <see cref="double"/>.</returns>
-        private double Variance(Box cube)
-        {
-            double dr = Volume(cube, this.vmr);
-            double dg = Volume(cube, this.vmg);
-            double db = Volume(cube, this.vmb);
-            double da = Volume(cube, this.vma);
-
-            double xx =
-                this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B1, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G1, cube.B0, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B1, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R1, cube.G0, cube.B0, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B1, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G1, cube.B0, cube.A0)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A1)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B1, cube.A0)]
-                - this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A1)]
-                + this.m2[GetPaletteIndex(cube.R0, cube.G0, cube.B0, cube.A0)];
-
-            return xx - (((dr * dr) + (dg * dg) + (db * db) + (da * da)) / Volume(cube, this.vwt));
-        }
-
-        /// <summary>
-        /// We want to minimize the sum of the variances of two sub-boxes.
-        /// The sum(c^2) terms can be ignored since their sum over both sub-boxes
-        /// is the same (the sum for the whole box) no matter where we split.
-        /// The remaining terms have a minus sign in the variance formula,
-        /// so we drop the minus sign and maximize the sum of the two terms.
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="direction">The direction.</param>
-        /// <param name="first">The first position.</param>
-        /// <param name="last">The last position.</param>
-        /// <param name="cut">The cutting point.</param>
-        /// <param name="wholeR">The whole red.</param>
-        /// <param name="wholeG">The whole green.</param>
-        /// <param name="wholeB">The whole blue.</param>
-        /// <param name="wholeA">The whole alpha.</param>
-        /// <param name="wholeW">The whole weight.</param>
-        /// <returns>The <see cref="double"/>.</returns>
-        private double Maximize(Box cube, int direction, int first, int last, out int cut, double wholeR, double wholeG, double wholeB, double wholeA, double wholeW)
-        {
-            long baseR = Bottom(cube, direction, this.vmr);
-            long baseG = Bottom(cube, direction, this.vmg);
-            long baseB = Bottom(cube, direction, this.vmb);
-            long baseA = Bottom(cube, direction, this.vma);
-            long baseW = Bottom(cube, direction, this.vwt);
-
-            double max = 0.0;
-            cut = -1;
-
-            for (int i = first; i < last; i++)
-            {
-                double halfR = baseR + Top(cube, direction, i, this.vmr);
-                double halfG = baseG + Top(cube, direction, i, this.vmg);
-                double halfB = baseB + Top(cube, direction, i, this.vmb);
-                double halfA = baseA + Top(cube, direction, i, this.vma);
-                double halfW = baseW + Top(cube, direction, i, this.vwt);
-
-                double temp;
-
-                if (Math.Abs(halfW) < Epsilon)
-                {
-                    continue;
-                }
-
-                temp = ((halfR * halfR) + (halfG * halfG) + (halfB * halfB) + (halfA * halfA)) / halfW;
-
-                halfR = wholeR - halfR;
-                halfG = wholeG - halfG;
-                halfB = wholeB - halfB;
-                halfA = wholeA - halfA;
-                halfW = wholeW - halfW;
-
-                if (Math.Abs(halfW) < Epsilon)
-                {
-                    continue;
-                }
-
-                temp += ((halfR * halfR) + (halfG * halfG) + (halfB * halfB) + (halfA * halfA)) / halfW;
-
-                if (temp > max)
-                {
-                    max = temp;
-                    cut = i;
-                }
-            }
-
-            return max;
-        }
-
-        /// <summary>
-        /// Cuts a box.
-        /// </summary>
-        /// <param name="set1">The first set.</param>
-        /// <param name="set2">The second set.</param>
-        /// <returns>Returns a value indicating whether the box has been split.</returns>
-        private bool Cut(Box set1, Box set2)
-        {
-            double wholeR = Volume(set1, this.vmr);
-            double wholeG = Volume(set1, this.vmg);
-            double wholeB = Volume(set1, this.vmb);
-            double wholeA = Volume(set1, this.vma);
-            double wholeW = Volume(set1, this.vwt);
-
-            int cutr;
-            int cutg;
-            int cutb;
-            int cuta;
-
-            double maxr = this.Maximize(set1, 0, set1.R0 + 1, set1.R1, out cutr, wholeR, wholeG, wholeB, wholeA, wholeW);
-            double maxg = this.Maximize(set1, 1, set1.G0 + 1, set1.G1, out cutg, wholeR, wholeG, wholeB, wholeA, wholeW);
-            double maxb = this.Maximize(set1, 2, set1.B0 + 1, set1.B1, out cutb, wholeR, wholeG, wholeB, wholeA, wholeW);
-            double maxa = this.Maximize(set1, 3, set1.A0 + 1, set1.A1, out cuta, wholeR, wholeG, wholeB, wholeA, wholeW);
-
-            int dir;
-
-            if ((maxr >= maxg) && (maxr >= maxb) && (maxr >= maxa))
-            {
-                dir = 0;
-
-                if (cutr < 0)
-                {
-                    return false;
-                }
-            }
-            else if ((maxg >= maxr) && (maxg >= maxb) && (maxg >= maxa))
-            {
-                dir = 1;
-            }
-            else if ((maxb >= maxr) && (maxb >= maxg) && (maxb >= maxa))
-            {
-                dir = 2;
-            }
-            else
-            {
-                dir = 3;
-            }
-
-            set2.R1 = set1.R1;
-            set2.G1 = set1.G1;
-            set2.B1 = set1.B1;
-            set2.A1 = set1.A1;
-
-            switch (dir)
-            {
-                // Red
-                case 0:
-                    set2.R0 = set1.R1 = cutr;
-                    set2.G0 = set1.G0;
-                    set2.B0 = set1.B0;
-                    set2.A0 = set1.A0;
-                    break;
-
-                // Green
-                case 1:
-                    set2.G0 = set1.G1 = cutg;
-                    set2.R0 = set1.R0;
-                    set2.B0 = set1.B0;
-                    set2.A0 = set1.A0;
-                    break;
-
-                // Blue
-                case 2:
-                    set2.B0 = set1.B1 = cutb;
-                    set2.R0 = set1.R0;
-                    set2.G0 = set1.G0;
-                    set2.A0 = set1.A0;
-                    break;
-
-                // Alpha
-                case 3:
-                    set2.A0 = set1.A1 = cuta;
-                    set2.R0 = set1.R0;
-                    set2.G0 = set1.G0;
-                    set2.B0 = set1.B0;
-                    break;
-            }
-
-            set1.Volume = (set1.R1 - set1.R0) * (set1.G1 - set1.G0) * (set1.B1 - set1.B0) * (set1.A1 - set1.A0);
-            set2.Volume = (set2.R1 - set2.R0) * (set2.G1 - set2.G0) * (set2.B1 - set2.B0) * (set2.A1 - set2.A0);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Marks a color space tag.
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="label">A label.</param>
-        private void Mark(Box cube, byte label)
-        {
-            for (int r = cube.R0 + 1; r <= cube.R1; r++)
-            {
-                for (int g = cube.G0 + 1; g <= cube.G1; g++)
-                {
-                    for (int b = cube.B0 + 1; b <= cube.B1; b++)
-                    {
-                        for (int a = cube.A0 + 1; a <= cube.A1; a++)
-                        {
-                            this.tag[GetPaletteIndex(r, g, b, a)] = label;
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Builds the cube.
-        /// </summary>
-        /// <param name="cube">The cube.</param>
-        /// <param name="colorCount">The color count.</param>
-        private void BuildCube(out Box[] cube, ref int colorCount)
-        {
-            cube = new Box[colorCount];
-            double[] vv = new double[colorCount];
-
-            for (int i = 0; i < colorCount; i++)
-            {
-                cube[i] = new Box();
-            }
-
-            cube[0].R0 = cube[0].G0 = cube[0].B0 = cube[0].A0 = 0;
-            cube[0].R1 = cube[0].G1 = cube[0].B1 = IndexCount - 1;
-            cube[0].A1 = IndexAlphaCount - 1;
-
-            int next = 0;
-
-            for (int i = 1; i < colorCount; i++)
-            {
-                if (this.Cut(cube[next], cube[i]))
-                {
-                    vv[next] = cube[next].Volume > 1 ? this.Variance(cube[next]) : 0.0;
-                    vv[i] = cube[i].Volume > 1 ? this.Variance(cube[i]) : 0.0;
-                }
-                else
-                {
-                    vv[next] = 0.0;
-                    i--;
-                }
-
-                next = 0;
-
-                double temp = vv[0];
-                for (int k = 1; k <= i; k++)
-                {
-                    if (vv[k] > temp)
-                    {
-                        temp = vv[k];
-                        next = k;
-                    }
-                }
-
-                if (temp <= 0.0)
-                {
-                    colorCount = i + 1;
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Generates the quantized result.
-        /// </summary>
-        /// <param name="imagePixels">The image pixels.</param>
-        /// <param name="colorCount">The color count.</param>
-        /// <param name="cube">The cube.</param>
-        /// <returns>The result.</returns>
-        private QuantizedImage<TColor, TPacked> GenerateResult(PixelAccessor<TColor, TPacked> imagePixels, int colorCount, Box[] cube)
-        {
-            List<TColor> pallette = new List<TColor>();
-            byte[] pixels = new byte[imagePixels.Width * imagePixels.Height];
-            int width = imagePixels.Width;
-            int height = imagePixels.Height;
-
-            for (int k = 0; k < colorCount; k++)
-            {
-                this.Mark(cube[k], (byte)k);
-
-                double weight = Volume(cube[k], this.vwt);
-
-                if (Math.Abs(weight) > Epsilon)
-                {
-                    float r = (float)(Volume(cube[k], this.vmr) / weight);
-                    float g = (float)(Volume(cube[k], this.vmg) / weight);
-                    float b = (float)(Volume(cube[k], this.vmb) / weight);
-                    float a = (float)(Volume(cube[k], this.vma) / weight);
-
-                    TColor color = default(TColor);
-                    color.PackFromVector4(new Vector4(r, g, b, a) / 255F);
-                    pallette.Add(color);
-                }
-                else
-                {
-                    pallette.Add(default(TColor));
-                }
-            }
-
-            Parallel.For(
-                0,
-                height,
-                Bootstrapper.Instance.ParallelOptions,
-                y =>
-                    {
-                        for (int x = 0; x < width; x++)
-                        {
-                            // Expected order r->g->b->a
-                            Color color = new Color(imagePixels[x, y].ToVector4());
-                            int r = color.R >> (8 - IndexBits);
-                            int g = color.G >> (8 - IndexBits);
-                            int b = color.B >> (8 - IndexBits);
-                            int a = color.A >> (8 - IndexAlphaBits);
-
-                            int ind = GetPaletteIndex(r + 1, g + 1, b + 1, a + 1);
-                            pixels[(y * width) + x] = this.tag[ind];
-                        }
-                    });
-
-            return new QuantizedImage<TColor, TPacked>(width, height, pallette.ToArray(), pixels);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/AutoOrient.cs b/src/ImageSharp46/Samplers/AutoOrient.cs
deleted file mode 100644
index 6195a2066..000000000
--- a/src/ImageSharp46/Samplers/AutoOrient.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// <copyright file="AutoOrient.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Adjusts an image so that its orientation is suitable for viewing.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to auto rotate.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> AutoOrient<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Orientation orientation = GetExifOrientation(source);
-
-            switch (orientation)
-            {
-                case Orientation.TopRight:
-                    return source.Flip(FlipType.Horizontal);
-
-                case Orientation.BottomRight:
-                    return source.Rotate(RotateType.Rotate180);
-
-                case Orientation.BottomLeft:
-                    return source.Flip(FlipType.Vertical);
-
-                case Orientation.LeftTop:
-                    return source.Rotate(RotateType.Rotate90)
-                                 .Flip(FlipType.Horizontal);
-
-                case Orientation.RightTop:
-                    return source.Rotate(RotateType.Rotate90);
-
-                case Orientation.RightBottom:
-                    return source.Flip(FlipType.Vertical)
-                                 .Rotate(RotateType.Rotate270);
-
-                case Orientation.LeftBottom:
-                    return source.Rotate(RotateType.Rotate270);
-
-                case Orientation.Unknown:
-                case Orientation.TopLeft:
-                default:
-                    return source;
-            }
-        }
-
-        /// <summary>
-        /// Returns the current EXIF orientation
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to auto rotate.</param>
-        /// <returns>The <see cref="Orientation"/></returns>
-        private static Orientation GetExifOrientation<TColor, TPacked>(Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (source.ExifProfile == null)
-            {
-                return Orientation.Unknown;
-            }
-
-            ExifValue value = source.ExifProfile.GetValue(ExifTag.Orientation);
-            if (value == null)
-            {
-                return Orientation.Unknown;
-            }
-
-            Orientation orientation = (Orientation)value.Value;
-
-            source.ExifProfile.SetValue(ExifTag.Orientation, (ushort)Orientation.TopLeft);
-
-            return orientation;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/BoxBlur.cs b/src/ImageSharp46/Samplers/BoxBlur.cs
deleted file mode 100644
index 4c0aa8d1f..000000000
--- a/src/ImageSharp46/Samplers/BoxBlur.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="BoxBlur.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies a box blur to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="radius">The 'radius' value representing the size of the area to sample.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BoxBlur<TColor, TPacked>(this Image<TColor, TPacked> source, int radius = 7)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return BoxBlur(source, radius, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a box blur to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="radius">The 'radius' value representing the size of the area to sample.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> BoxBlur<TColor, TPacked>(this Image<TColor, TPacked> source, int radius, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new BoxBlurProcessor<TColor, TPacked>(radius));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Crop.cs b/src/ImageSharp46/Samplers/Crop.cs
deleted file mode 100644
index a266db3b2..000000000
--- a/src/ImageSharp46/Samplers/Crop.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <copyright file="Crop.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Crops an image to the given width and height.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        public static Image<TColor, TPacked> Crop<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Crop(source, width, height, source.Bounds);
-        }
-
-        /// <summary>
-        /// Crops an image to the given width and height with the given source rectangle.
-        /// <remarks>
-        /// If the source rectangle is smaller than the target dimensions then the
-        /// area within the source is resized performing a zoomed crop.
-        /// </remarks>
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to crop.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Crop<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, Rectangle sourceRectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-
-            if (sourceRectangle.Width < width || sourceRectangle.Height < height)
-            {
-                // If the source rectangle is smaller than the target perform a
-                // cropped zoom.
-                source = source.Resize(sourceRectangle.Width, sourceRectangle.Height);
-            }
-
-            CropProcessor<TColor, TPacked> processor = new CropProcessor<TColor, TPacked>();
-            return source.Process(width, height, sourceRectangle, new Rectangle(0, 0, width, height), processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/DetectEdges.cs b/src/ImageSharp46/Samplers/DetectEdges.cs
deleted file mode 100644
index c28bb3c81..000000000
--- a/src/ImageSharp46/Samplers/DetectEdges.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// <copyright file="DetectEdges.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{TColor, TPacked}"/> filter
-        /// operating in Grayscale mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return DetectEdges(source, source.Bounds, new SobelProcessor<TColor, TPacked> { Grayscale = true });
-        }
-
-        /// <summary>
-        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{T,TP}"/> filter
-        /// operating in Grayscale mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return DetectEdges(source, rectangle, new SobelProcessor<TColor, TPacked> { Grayscale = true });
-        }
-
-        /// <summary>
-        /// Detects any edges within the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="filter">The filter for detecting edges.</param>
-        /// <param name="grayscale">Whether to convert the image to Grayscale first. Defaults to true.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source, EdgeDetection filter, bool grayscale = true)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return DetectEdges(source, filter, source.Bounds, grayscale);
-        }
-
-        /// <summary>
-        /// Detects any edges within the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="filter">The filter for detecting edges.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <param name="grayscale">Whether to convert the image to Grayscale first. Defaults to true.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source, EdgeDetection filter, Rectangle rectangle, bool grayscale = true)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            IEdgeDetectorFilter<TColor, TPacked> processor;
-
-            switch (filter)
-            {
-                case EdgeDetection.Kayyali:
-                    processor = new KayyaliProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Kirsch:
-                    processor = new KirschProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Lapacian3X3:
-                    processor = new Laplacian3X3Processor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Lapacian5X5:
-                    processor = new Laplacian5X5Processor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.LaplacianOfGaussian:
-                    processor = new LaplacianOfGaussianProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Prewitt:
-                    processor = new PrewittProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.RobertsCross:
-                    processor = new RobertsCrossProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Robinson:
-                    processor = new RobinsonProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                case EdgeDetection.Scharr:
-                    processor = new ScharrProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-
-                default:
-                    processor = new SobelProcessor<TColor, TPacked> { Grayscale = grayscale };
-                    break;
-            }
-
-            return DetectEdges(source, rectangle, processor);
-        }
-
-        /// <summary>
-        /// Detects any edges within the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="filter">The filter for detecting edges.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source, IEdgeDetectorFilter<TColor, TPacked> filter)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return DetectEdges(source, source.Bounds, filter);
-        }
-
-        /// <summary>
-        /// Detects any edges within the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <param name="filter">The filter for detecting edges.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> DetectEdges<TColor, TPacked>(this Image<TColor, TPacked> source, Rectangle rectangle, IEdgeDetectorFilter<TColor, TPacked> filter)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, filter);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/EntropyCrop.cs b/src/ImageSharp46/Samplers/EntropyCrop.cs
deleted file mode 100644
index 28a2ebf48..000000000
--- a/src/ImageSharp46/Samplers/EntropyCrop.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="EntropyCrop.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Crops an image to the area of greatest entropy.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to crop.</param>
-        /// <param name="threshold">The threshold for entropic density.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> EntropyCrop<TColor, TPacked>(this Image<TColor, TPacked> source, float threshold = .5f)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            EntropyCropProcessor<TColor, TPacked> processor = new EntropyCropProcessor<TColor, TPacked>(threshold);
-            return source.Process(source.Width, source.Height, source.Bounds, Rectangle.Empty, processor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Flip.cs b/src/ImageSharp46/Samplers/Flip.cs
deleted file mode 100644
index 0e50ad8ac..000000000
--- a/src/ImageSharp46/Samplers/Flip.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="Flip.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Flips an image by the given instructions.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to rotate, flip, or both.</param>
-        /// <param name="flipType">The <see cref="FlipType"/> to perform the flip.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Flip<TColor, TPacked>(this Image<TColor, TPacked> source, FlipType flipType)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            FlipProcessor<TColor, TPacked> processor = new FlipProcessor<TColor, TPacked>(flipType);
-            return source.Process(source.Width, source.Height, source.Bounds, source.Bounds, processor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/GuassianBlur.cs b/src/ImageSharp46/Samplers/GuassianBlur.cs
deleted file mode 100644
index ef09a18f5..000000000
--- a/src/ImageSharp46/Samplers/GuassianBlur.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="GuassianBlur.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies a Guassian blur to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> GuassianBlur<TColor, TPacked>(this Image<TColor, TPacked> source, float sigma = 3f)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return GuassianBlur(source, sigma, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a Guassian blur to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> GuassianBlur<TColor, TPacked>(this Image<TColor, TPacked> source, float sigma, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new GuassianBlurProcessor<TColor, TPacked>(sigma));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/GuassianSharpen.cs b/src/ImageSharp46/Samplers/GuassianSharpen.cs
deleted file mode 100644
index 6b433f6ae..000000000
--- a/src/ImageSharp46/Samplers/GuassianSharpen.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="GuassianSharpen.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Applies a Guassian sharpening filter to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> GuassianSharpen<TColor, TPacked>(this Image<TColor, TPacked> source, float sigma = 3f)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return GuassianSharpen(source, sigma, source.Bounds);
-        }
-
-        /// <summary>
-        /// Applies a Guassian sharpening filter to the image.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> GuassianSharpen<TColor, TPacked>(this Image<TColor, TPacked> source, float sigma, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Process(rectangle, new GuassianSharpenProcessor<TColor, TPacked>(sigma));
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/OilPainting.cs b/src/ImageSharp46/Samplers/OilPainting.cs
deleted file mode 100644
index a938b2325..000000000
--- a/src/ImageSharp46/Samplers/OilPainting.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="OilPainting.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Alters the colors of the image recreating an oil painting effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="levels">The number of intensity levels. Higher values result in a broader range of colour intensities forming part of the result image.</param>
-        /// <param name="brushSize">The number of neighbouring pixels used in calculating each individual pixel value.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> OilPaint<TColor, TPacked>(this Image<TColor, TPacked> source, int levels = 10, int brushSize = 15)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return OilPaint(source, levels, brushSize, source.Bounds);
-        }
-
-        /// <summary>
-        /// Alters the colors of the image recreating an oil painting effect.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="levels">The number of intensity levels. Higher values result in a broader range of colour intensities forming part of the result image.</param>
-        /// <param name="brushSize">The number of neighbouring pixels used in calculating each individual pixel value.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> OilPaint<TColor, TPacked>(this Image<TColor, TPacked> source, int levels, int brushSize, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            Guard.MustBeGreaterThan(levels, 0, nameof(levels));
-
-            if (brushSize <= 0 || brushSize > source.Height || brushSize > source.Width)
-            {
-                throw new ArgumentOutOfRangeException(nameof(brushSize));
-            }
-
-            return source.Process(rectangle, new OilPaintingProcessor<TColor, TPacked>(levels, brushSize));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Options/AnchorPosition.cs b/src/ImageSharp46/Samplers/Options/AnchorPosition.cs
deleted file mode 100644
index c0adb4da4..000000000
--- a/src/ImageSharp46/Samplers/Options/AnchorPosition.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// <copyright file="AnchorPosition.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerated anchor positions to apply to resized images.
-    /// </summary>
-    public enum AnchorPosition
-    {
-        /// <summary>
-        /// Anchors the position of the image to the center of it's bounding container.
-        /// </summary>
-        Center,
-
-        /// <summary>
-        /// Anchors the position of the image to the top of it's bounding container.
-        /// </summary>
-        Top,
-
-        /// <summary>
-        /// Anchors the position of the image to the bottom of it's bounding container.
-        /// </summary>
-        Bottom,
-
-        /// <summary>
-        /// Anchors the position of the image to the left of it's bounding container.
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// Anchors the position of the image to the right of it's bounding container.
-        /// </summary>
-        Right,
-
-        /// <summary>
-        /// Anchors the position of the image to the top left side of it's bounding container.
-        /// </summary>
-        TopLeft,
-
-        /// <summary>
-        /// Anchors the position of the image to the top right side of it's bounding container.
-        /// </summary>
-        TopRight,
-
-        /// <summary>
-        /// Anchors the position of the image to the bottom right side of it's bounding container.
-        /// </summary>
-        BottomRight,
-
-        /// <summary>
-        /// Anchors the position of the image to the bottom left side of it's bounding container.
-        /// </summary>
-        BottomLeft
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/FlipType.cs b/src/ImageSharp46/Samplers/Options/FlipType.cs
deleted file mode 100644
index 5a9668316..000000000
--- a/src/ImageSharp46/Samplers/Options/FlipType.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// <copyright file="FlipType.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Provides enumeration over how a image should be flipped.
-    /// </summary>
-    public enum FlipType
-    {
-        /// <summary>
-        /// Don't flip the image.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Flip the image horizontally.
-        /// </summary>
-        Horizontal,
-
-        /// <summary>
-        /// Flip the image vertically.
-        /// </summary>
-        Vertical,
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/Orientation.cs b/src/ImageSharp46/Samplers/Options/Orientation.cs
deleted file mode 100644
index dfe57a4b0..000000000
--- a/src/ImageSharp46/Samplers/Options/Orientation.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// <copyright file="Orientation.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    internal enum Orientation : ushort
-    {
-        Unknown = 0,
-        TopLeft = 1,
-        TopRight = 2,
-        BottomRight = 3,
-        BottomLeft = 4,
-        LeftTop = 5,
-        RightTop = 6,
-        RightBottom = 7,
-        LeftBottom = 8
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/ResizeHelper.cs b/src/ImageSharp46/Samplers/Options/ResizeHelper.cs
deleted file mode 100644
index 33aa32528..000000000
--- a/src/ImageSharp46/Samplers/Options/ResizeHelper.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-// <copyright file="ResizeHelper.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Linq;
-
-    /// <summary>
-    /// Provides methods to help calculate the target rectangle when resizing using the
-    /// <see cref="ResizeMode"/> enumeration.
-    /// </summary>
-    internal static class ResizeHelper
-    {
-        /// <summary>
-        /// Calculates the target location and bounds to perform the resize operation against.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        public static Rectangle CalculateTargetLocationAndBounds<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            switch (options.Mode)
-            {
-                case ResizeMode.Crop:
-                    return CalculateCropRectangle(source, options);
-                case ResizeMode.Pad:
-                    return CalculatePadRectangle(source, options);
-                case ResizeMode.BoxPad:
-                    return CalculateBoxPadRectangle(source, options);
-                case ResizeMode.Max:
-                    return CalculateMaxRectangle(source, options);
-                case ResizeMode.Min:
-                    return CalculateMinRectangle(source, options);
-
-                // Last case ResizeMode.Stretch:
-                default:
-                    return new Rectangle(0, 0, options.Size.Width, options.Size.Height);
-            }
-        }
-
-        /// <summary>
-        /// Calculates the target rectangle for crop mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        private static Rectangle CalculateCropRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int width = options.Size.Width;
-            int height = options.Size.Height;
-
-            if (width <= 0 || height <= 0)
-            {
-                return new Rectangle(0, 0, source.Width, source.Height);
-            }
-
-            double ratio;
-            int sourceWidth = source.Width;
-            int sourceHeight = source.Height;
-
-            int destinationX = 0;
-            int destinationY = 0;
-            int destinationWidth = width;
-            int destinationHeight = height;
-
-            // Fractional variants for preserving aspect ratio.
-            double percentHeight = Math.Abs(height / (double)sourceHeight);
-            double percentWidth = Math.Abs(width / (double)sourceWidth);
-
-            if (percentHeight < percentWidth)
-            {
-                ratio = percentWidth;
-
-                if (options.CenterCoordinates.Any())
-                {
-                    double center = -(ratio * sourceHeight) * options.CenterCoordinates.First();
-                    destinationY = (int)center + (height / 2);
-
-                    if (destinationY > 0)
-                    {
-                        destinationY = 0;
-                    }
-
-                    if (destinationY < (int)(height - (sourceHeight * ratio)))
-                    {
-                        destinationY = (int)(height - (sourceHeight * ratio));
-                    }
-                }
-                else
-                {
-                    switch (options.Position)
-                    {
-                        case AnchorPosition.Top:
-                        case AnchorPosition.TopLeft:
-                        case AnchorPosition.TopRight:
-                            destinationY = 0;
-                            break;
-                        case AnchorPosition.Bottom:
-                        case AnchorPosition.BottomLeft:
-                        case AnchorPosition.BottomRight:
-                            destinationY = (int)(height - (sourceHeight * ratio));
-                            break;
-                        default:
-                            destinationY = (int)((height - (sourceHeight * ratio)) / 2);
-                            break;
-                    }
-                }
-
-                destinationHeight = (int)Math.Ceiling(sourceHeight * percentWidth);
-            }
-            else
-            {
-                ratio = percentHeight;
-
-                if (options.CenterCoordinates.Any())
-                {
-                    double center = -(ratio * sourceWidth) * options.CenterCoordinates.ToArray()[1];
-                    destinationX = (int)center + (width / 2);
-
-                    if (destinationX > 0)
-                    {
-                        destinationX = 0;
-                    }
-
-                    if (destinationX < (int)(width - (sourceWidth * ratio)))
-                    {
-                        destinationX = (int)(width - (sourceWidth * ratio));
-                    }
-                }
-                else
-                {
-                    switch (options.Position)
-                    {
-                        case AnchorPosition.Left:
-                        case AnchorPosition.TopLeft:
-                        case AnchorPosition.BottomLeft:
-                            destinationX = 0;
-                            break;
-                        case AnchorPosition.Right:
-                        case AnchorPosition.TopRight:
-                        case AnchorPosition.BottomRight:
-                            destinationX = (int)(width - (sourceWidth * ratio));
-                            break;
-                        default:
-                            destinationX = (int)((width - (sourceWidth * ratio)) / 2);
-                            break;
-                    }
-                }
-
-                destinationWidth = (int)Math.Ceiling(sourceWidth * percentHeight);
-            }
-
-            return new Rectangle(destinationX, destinationY, destinationWidth, destinationHeight);
-        }
-
-        /// <summary>
-        /// Calculates the target rectangle for pad mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        private static Rectangle CalculatePadRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int width = options.Size.Width;
-            int height = options.Size.Height;
-
-            if (width <= 0 || height <= 0)
-            {
-                return new Rectangle(0, 0, source.Width, source.Height);
-            }
-
-            double ratio;
-            int sourceWidth = source.Width;
-            int sourceHeight = source.Height;
-
-            int destinationX = 0;
-            int destinationY = 0;
-            int destinationWidth = width;
-            int destinationHeight = height;
-
-            // Fractional variants for preserving aspect ratio.
-            double percentHeight = Math.Abs(height / (double)sourceHeight);
-            double percentWidth = Math.Abs(width / (double)sourceWidth);
-
-            if (percentHeight < percentWidth)
-            {
-                ratio = percentHeight;
-                destinationWidth = Convert.ToInt32(sourceWidth * percentHeight);
-
-                switch (options.Position)
-                {
-                    case AnchorPosition.Left:
-                    case AnchorPosition.TopLeft:
-                    case AnchorPosition.BottomLeft:
-                        destinationX = 0;
-                        break;
-                    case AnchorPosition.Right:
-                    case AnchorPosition.TopRight:
-                    case AnchorPosition.BottomRight:
-                        destinationX = (int)(width - (sourceWidth * ratio));
-                        break;
-                    default:
-                        destinationX = Convert.ToInt32((width - (sourceWidth * ratio)) / 2);
-                        break;
-                }
-            }
-            else
-            {
-                ratio = percentWidth;
-                destinationHeight = Convert.ToInt32(sourceHeight * percentWidth);
-
-                switch (options.Position)
-                {
-                    case AnchorPosition.Top:
-                    case AnchorPosition.TopLeft:
-                    case AnchorPosition.TopRight:
-                        destinationY = 0;
-                        break;
-                    case AnchorPosition.Bottom:
-                    case AnchorPosition.BottomLeft:
-                    case AnchorPosition.BottomRight:
-                        destinationY = (int)(height - (sourceHeight * ratio));
-                        break;
-                    default:
-                        destinationY = (int)((height - (sourceHeight * ratio)) / 2);
-                        break;
-                }
-            }
-
-            return new Rectangle(destinationX, destinationY, destinationWidth, destinationHeight);
-        }
-
-        /// <summary>
-        /// Calculates the target rectangle for box pad mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        private static Rectangle CalculateBoxPadRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int width = options.Size.Width;
-            int height = options.Size.Height;
-
-            if (width <= 0 || height <= 0)
-            {
-                return new Rectangle(0, 0, source.Width, source.Height);
-            }
-
-            int sourceWidth = source.Width;
-            int sourceHeight = source.Height;
-
-            // Fractional variants for preserving aspect ratio.
-            double percentHeight = Math.Abs(height / (double)sourceHeight);
-            double percentWidth = Math.Abs(width / (double)sourceWidth);
-
-            int boxPadHeight = height > 0 ? height : Convert.ToInt32(sourceHeight * percentWidth);
-            int boxPadWidth = width > 0 ? width : Convert.ToInt32(sourceWidth * percentHeight);
-
-            // Only calculate if upscaling.
-            if (sourceWidth < boxPadWidth && sourceHeight < boxPadHeight)
-            {
-                int destinationX;
-                int destinationY;
-                int destinationWidth = sourceWidth;
-                int destinationHeight = sourceHeight;
-                width = boxPadWidth;
-                height = boxPadHeight;
-
-                switch (options.Position)
-                {
-                    case AnchorPosition.Left:
-                        destinationY = (height - sourceHeight) / 2;
-                        destinationX = 0;
-                        break;
-                    case AnchorPosition.Right:
-                        destinationY = (height - sourceHeight) / 2;
-                        destinationX = width - sourceWidth;
-                        break;
-                    case AnchorPosition.TopRight:
-                        destinationY = 0;
-                        destinationX = width - sourceWidth;
-                        break;
-                    case AnchorPosition.Top:
-                        destinationY = 0;
-                        destinationX = (width - sourceWidth) / 2;
-                        break;
-                    case AnchorPosition.TopLeft:
-                        destinationY = 0;
-                        destinationX = 0;
-                        break;
-                    case AnchorPosition.BottomRight:
-                        destinationY = height - sourceHeight;
-                        destinationX = width - sourceWidth;
-                        break;
-                    case AnchorPosition.Bottom:
-                        destinationY = height - sourceHeight;
-                        destinationX = (width - sourceWidth) / 2;
-                        break;
-                    case AnchorPosition.BottomLeft:
-                        destinationY = height - sourceHeight;
-                        destinationX = 0;
-                        break;
-                    default:
-                        destinationY = (height - sourceHeight) / 2;
-                        destinationX = (width - sourceWidth) / 2;
-                        break;
-                }
-
-                return new Rectangle(destinationX, destinationY, destinationWidth, destinationHeight);
-            }
-
-            // Switch to pad mode to downscale and calculate from there.
-            return CalculatePadRectangle(source, options);
-        }
-
-        /// <summary>
-        /// Calculates the target rectangle for max mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        private static Rectangle CalculateMaxRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int width = options.Size.Width;
-            int height = options.Size.Height;
-            int destinationWidth = width;
-            int destinationHeight = height;
-
-            // Fractional variants for preserving aspect ratio.
-            double percentHeight = Math.Abs(height / (double)source.Height);
-            double percentWidth = Math.Abs(width / (double)source.Width);
-
-            // Integers must be cast to doubles to get needed precision
-            double ratio = (double)options.Size.Height / options.Size.Width;
-            double sourceRatio = (double)source.Height / source.Width;
-
-            if (sourceRatio < ratio)
-            {
-                destinationHeight = Convert.ToInt32(source.Height * percentWidth);
-                height = destinationHeight;
-            }
-            else
-            {
-                destinationWidth = Convert.ToInt32(source.Width * percentHeight);
-                width = destinationWidth;
-            }
-
-            // Replace the size to match the rectangle.
-            options.Size = new Size(width, height);
-            return new Rectangle(0, 0, destinationWidth, destinationHeight);
-        }
-
-        /// <summary>
-        /// Calculates the target rectangle for min mode.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>
-        /// The <see cref="Rectangle"/>.
-        /// </returns>
-        private static Rectangle CalculateMinRectangle<TColor, TPacked>(ImageBase<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            int width = options.Size.Width;
-            int height = options.Size.Height;
-            int destinationWidth;
-            int destinationHeight;
-
-            // Don't upscale
-            if (width > source.Width || height > source.Height)
-            {
-                options.Size = new Size(source.Width, source.Height);
-                return new Rectangle(0, 0, source.Width, source.Height);
-            }
-
-            double sourceRatio = (double)source.Height / source.Width;
-
-            // Find the shortest distance to go.
-            int widthDiff = source.Width - width;
-            int heightDiff = source.Height - height;
-
-            if (widthDiff < heightDiff)
-            {
-                destinationHeight = Convert.ToInt32(width * sourceRatio);
-                height = destinationHeight;
-                destinationWidth = width;
-            }
-            else if (widthDiff > heightDiff)
-            {
-                destinationWidth = Convert.ToInt32(height / sourceRatio);
-                destinationHeight = height;
-                width = destinationWidth;
-            }
-            else
-            {
-                destinationWidth = width;
-                destinationHeight = height;
-            }
-
-            // Replace the size to match the rectangle.
-            options.Size = new Size(width, height);
-            return new Rectangle(0, 0, destinationWidth, destinationHeight);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/ResizeMode.cs b/src/ImageSharp46/Samplers/Options/ResizeMode.cs
deleted file mode 100644
index 7a1cc3c94..000000000
--- a/src/ImageSharp46/Samplers/Options/ResizeMode.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <copyright file="ResizeMode.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Enumerated resize modes to apply to resized images.
-    /// </summary>
-    public enum ResizeMode
-    {
-        /// <summary>
-        /// Crops the resized image to fit the bounds of its container.
-        /// </summary>
-        Crop,
-
-        /// <summary>
-        /// Pads the resized image to fit the bounds of its container.
-        /// If only one dimension is passed, will maintain the original aspect ratio.
-        /// </summary>
-        Pad,
-
-        /// <summary>
-        /// Pads the image to fit the bound of the container without resizing the
-        /// original source.
-        /// When downscaling, performs the same functionality as <see cref="ResizeMode.Pad"/>
-        /// </summary>
-        BoxPad,
-
-        /// <summary>
-        /// Constrains the resized image to fit the bounds of its container maintaining
-        /// the original aspect ratio.
-        /// </summary>
-        Max,
-
-        /// <summary>
-        /// Resizes the image until the shortest side reaches the set given dimension.
-        /// Upscaling is disabled in this mode and the original image will be returned
-        /// if attempted.
-        /// </summary>
-        Min,
-
-        /// <summary>
-        /// Stretches the resized image to fit the bounds of its container.
-        /// </summary>
-        Stretch
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/ResizeOptions.cs b/src/ImageSharp46/Samplers/Options/ResizeOptions.cs
deleted file mode 100644
index 3cfb3d6c1..000000000
--- a/src/ImageSharp46/Samplers/Options/ResizeOptions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="ResizeOptions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// The resize options for resizing images against certain modes.
-    /// </summary>
-    public class ResizeOptions
-    {
-        /// <summary>
-        /// Gets or sets the resize mode.
-        /// </summary>
-        public ResizeMode Mode { get; set; } = ResizeMode.Crop;
-
-        /// <summary>
-        /// Gets or sets the anchor position.
-        /// </summary>
-        public AnchorPosition Position { get; set; } = AnchorPosition.Center;
-
-        /// <summary>
-        /// Gets or sets the center coordinates.
-        /// </summary>
-        public IEnumerable<float> CenterCoordinates { get; set; } = Enumerable.Empty<float>();
-
-        /// <summary>
-        /// Gets or sets the target size.
-        /// </summary>
-        public Size Size { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sampler to perform the resize operation.
-        /// </summary>
-        public IResampler Sampler { get; set; } = new BicubicResampler();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to compress
-        /// or expand individual pixel colors the value on processing.
-        /// </summary>
-        public bool Compand { get; set; }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Options/RotateType.cs b/src/ImageSharp46/Samplers/Options/RotateType.cs
deleted file mode 100644
index 0545aa910..000000000
--- a/src/ImageSharp46/Samplers/Options/RotateType.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="RotateType.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Provides enumeration over how the image should be rotated.
-    /// </summary>
-    public enum RotateType
-    {
-        /// <summary>
-        /// Do not rotate the image.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Rotate the image by 90 degrees clockwise.
-        /// </summary>
-        Rotate90 = 90,
-
-        /// <summary>
-        /// Rotate the image by 180 degrees clockwise.
-        /// </summary>
-        Rotate180 = 180,
-
-        /// <summary>
-        /// Rotate the image by 270 degrees clockwise.
-        /// </summary>
-        Rotate270 = 270
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Pad.cs b/src/ImageSharp46/Samplers/Pad.cs
deleted file mode 100644
index 3c4db20bd..000000000
--- a/src/ImageSharp46/Samplers/Pad.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="Pad.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Evenly pads an image to fit the new dimensions.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The source image to pad.</param>
-        /// <param name="width">The new width.</param>
-        /// <param name="height">The new height.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Pad<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            ResizeOptions options = new ResizeOptions
-            {
-                Size = new Size(width, height),
-                Mode = ResizeMode.BoxPad,
-                Sampler = new NearestNeighborResampler()
-            };
-
-            return Resize(source, options);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Pixelate.cs b/src/ImageSharp46/Samplers/Pixelate.cs
deleted file mode 100644
index e7bd84c31..000000000
--- a/src/ImageSharp46/Samplers/Pixelate.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// <copyright file="Pixelate.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Pixelates an image with the given pixel size.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="size">The size of the pixels.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Pixelate<TColor, TPacked>(this Image<TColor, TPacked> source, int size = 4)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Pixelate(source, size, source.Bounds);
-        }
-
-        /// <summary>
-        /// Pixelates an image with the given pixel size.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="size">The size of the pixels.</param>
-        /// <param name="rectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
-        /// </param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/>.</returns>
-        public static Image<TColor, TPacked> Pixelate<TColor, TPacked>(this Image<TColor, TPacked> source, int size, Rectangle rectangle)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (size <= 0 || size > source.Height || size > source.Width)
-            {
-                throw new ArgumentOutOfRangeException(nameof(size));
-            }
-
-            return source.Process(rectangle, new PixelateProcessor<TColor, TPacked>(size));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/CompandingResizeProcessor.cs b/src/ImageSharp46/Samplers/Processors/CompandingResizeProcessor.cs
deleted file mode 100644
index 2e7a8ec9a..000000000
--- a/src/ImageSharp46/Samplers/Processors/CompandingResizeProcessor.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// <copyright file="CompandingResizeProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods that allow the resizing of images using various algorithms.
-    /// This version will expand and compress the image to and from a linear color space during processing.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class CompandingResizeProcessor<TColor, TPacked> : ResamplingWeightedProcessor<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompandingResizeProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sampler">
-        /// The sampler to perform the resize operation.
-        /// </param>
-        public CompandingResizeProcessor(IResampler sampler)
-            : base(sampler)
-        {
-        }
-
-        /// <inheritdoc/>
-        public override bool Compand { get; set; } = true;
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            // Jump out, we'll deal with that later.
-            if (source.Bounds == target.Bounds && sourceRectangle == targetRectangle)
-            {
-                return;
-            }
-
-            int width = target.Width;
-            int height = target.Height;
-            int sourceHeight = sourceRectangle.Height;
-            int targetX = target.Bounds.X;
-            int targetY = target.Bounds.Y;
-            int targetRight = target.Bounds.Right;
-            int targetBottom = target.Bounds.Bottom;
-            int startX = targetRectangle.X;
-            int endX = targetRectangle.Right;
-
-            int minX = Math.Max(targetX, startX);
-            int maxX = Math.Min(targetRight, endX);
-            int minY = Math.Max(targetY, startY);
-            int maxY = Math.Min(targetBottom, endY);
-
-            if (this.Sampler is NearestNeighborResampler)
-            {
-                // Scaling factors
-                float widthFactor = sourceRectangle.Width / (float)targetRectangle.Width;
-                float heightFactor = sourceRectangle.Height / (float)targetRectangle.Height;
-
-                using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-                using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-                {
-                    Parallel.For(
-                        minY,
-                        maxY,
-                        this.ParallelOptions,
-                        y =>
-                        {
-                            // Y coordinates of source points
-                            int originY = (int)((y - startY) * heightFactor);
-
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                // X coordinates of source points
-                                targetPixels[x, y] = sourcePixels[(int)((x - startX) * widthFactor), originY];
-                            }
-                        });
-                }
-
-                // Break out now.
-                return;
-            }
-
-            // Interpolate the image using the calculated weights.
-            // A 2-pass 1D algorithm appears to be faster than splitting a 1-pass 2D algorithm
-            // First process the columns. Since we are not using multiple threads startY and endY
-            // are the upper and lower bounds of the source rectangle.
-            Image<TColor, TPacked> firstPass = new Image<TColor, TPacked>(target.Width, source.Height);
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> firstPassPixels = firstPass.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                minX = Math.Max(0, startX);
-                maxX = Math.Min(width, endX);
-                minY = Math.Max(0, startY);
-                maxY = Math.Min(height, endY);
-
-                Parallel.For(
-                    0,
-                    sourceHeight,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = minX; x < maxX; x++)
-                        {
-                            // Ensure offsets are normalised for cropping and padding.
-                            Weight[] horizontalValues = this.HorizontalWeights[x - startX].Values;
-
-                            // Destination color components
-                            Vector4 destination = Vector4.Zero;
-
-                            for (int i = 0; i < horizontalValues.Length; i++)
-                            {
-                                Weight xw = horizontalValues[i];
-                                destination += sourcePixels[xw.Index, y].ToVector4().Expand() * xw.Value;
-                            }
-
-                            TColor d = default(TColor);
-                            d.PackFromVector4(destination.Compress());
-                            firstPassPixels[x, y] = d;
-                        }
-                    });
-
-                // Now process the rows.
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        // Ensure offsets are normalised for cropping and padding.
-                        Weight[] verticalValues = this.VerticalWeights[y - startY].Values;
-
-                        for (int x = 0; x < width; x++)
-                        {
-                            // Destination color components
-                            Vector4 destination = Vector4.Zero;
-
-                            for (int i = 0; i < verticalValues.Length; i++)
-                            {
-                                Weight yw = verticalValues[i];
-                                destination += firstPassPixels[x, yw.Index].ToVector4().Expand() * yw.Value;
-                            }
-
-                            TColor d = default(TColor);
-                            d.PackFromVector4(destination.Compress());
-                            targetPixels[x, y] = d;
-                        }
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/BoxBlurProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/BoxBlurProcessor.cs
deleted file mode 100644
index 7b87a3d1b..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/BoxBlurProcessor.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// <copyright file="BoxBlurProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Applies a Box blur filter to the image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class BoxBlurProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The maximum size of the kernel in either direction.
-        /// </summary>
-        private readonly int kernelSize;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BoxBlurProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="radius">
-        /// The 'radius' value representing the size of the area to sample.
-        /// </param>
-        public BoxBlurProcessor(int radius = 7)
-        {
-            this.kernelSize = (radius * 2) + 1;
-            this.KernelX = this.CreateBoxKernel(true);
-            this.KernelY = this.CreateBoxKernel(false);
-        }
-
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            new Convolution2PassFilter<TColor, TPacked>(this.KernelX, this.KernelY).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-        }
-
-        /// <summary>
-        /// Create a 1 dimensional Box kernel.
-        /// </summary>
-        /// <param name="horizontal">Whether to calculate a horizontal kernel.</param>
-        /// <returns>The <see cref="T:float[][]"/></returns>
-        private float[][] CreateBoxKernel(bool horizontal)
-        {
-            int size = this.kernelSize;
-            float[][] kernel = horizontal ? new float[1][] : new float[size][];
-
-            if (horizontal)
-            {
-                kernel[0] = new float[size];
-            }
-
-            float sum = 0.0f;
-
-            for (int i = 0; i < size; i++)
-            {
-                float x = 1;
-                sum += x;
-                if (horizontal)
-                {
-                    kernel[0][i] = x;
-                }
-                else
-                {
-                    kernel[i] = new[] { x };
-                }
-            }
-
-            // Normalise kernel so that the sum of all weights equals 1
-            if (horizontal)
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[0][i] = kernel[0][i] / sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[i][0] = kernel[i][0] / sum;
-                }
-            }
-
-            return kernel;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2DFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2DFilter.cs
deleted file mode 100644
index 1b77e41eb..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2DFilter.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// <copyright file="Convolution2DFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Defines a filter that uses two one-dimensional matrices to perform convolution against an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class Convolution2DFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Convolution2DFilter{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="kernelX">The horizontal gradient operator.</param>
-        /// <param name="kernelY">The vertical gradient operator.</param>
-        public Convolution2DFilter(float[][] kernelX, float[][] kernelY)
-        {
-            this.KernelX = kernelX;
-            this.KernelY = kernelY;
-        }
-
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int kernelYHeight = this.KernelY.Length;
-            int kernelYWidth = this.KernelY[0].Length;
-            int kernelXHeight = this.KernelX.Length;
-            int kernelXWidth = this.KernelX[0].Length;
-            int radiusY = kernelYHeight >> 1;
-            int radiusX = kernelXWidth >> 1;
-
-            int sourceY = sourceRectangle.Y;
-            int sourceBottom = sourceRectangle.Bottom;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int maxY = sourceBottom - 1;
-            int maxX = endX - 1;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                startY,
-                endY,
-                this.ParallelOptions,
-                y =>
-                {
-                    if (y >= sourceY && y < sourceBottom)
-                    {
-                        for (int x = startX; x < endX; x++)
-                        {
-                            float rX = 0;
-                            float gX = 0;
-                            float bX = 0;
-                            float rY = 0;
-                            float gY = 0;
-                            float bY = 0;
-
-                            // Apply each matrix multiplier to the color components for each pixel.
-                            for (int fy = 0; fy < kernelYHeight; fy++)
-                            {
-                                int fyr = fy - radiusY;
-                                int offsetY = y + fyr;
-
-                                offsetY = offsetY.Clamp(0, maxY);
-
-                                for (int fx = 0; fx < kernelXWidth; fx++)
-                                {
-                                    int fxr = fx - radiusX;
-                                    int offsetX = x + fxr;
-
-                                    offsetX = offsetX.Clamp(0, maxX);
-
-                                    Vector4 currentColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                    float r = currentColor.X;
-                                    float g = currentColor.Y;
-                                    float b = currentColor.Z;
-
-                                    if (fy < kernelXHeight)
-                                    {
-                                        rX += this.KernelX[fy][fx] * r;
-                                        gX += this.KernelX[fy][fx] * g;
-                                        bX += this.KernelX[fy][fx] * b;
-                                    }
-
-                                    if (fx < kernelYWidth)
-                                    {
-                                        rY += this.KernelY[fy][fx] * r;
-                                        gY += this.KernelY[fy][fx] * g;
-                                        bY += this.KernelY[fy][fx] * b;
-                                    }
-                                }
-                            }
-
-                            float red = (float)Math.Sqrt((rX * rX) + (rY * rY));
-                            float green = (float)Math.Sqrt((gX * gX) + (gY * gY));
-                            float blue = (float)Math.Sqrt((bX * bX) + (bY * bY));
-
-                            Vector4 targetColor = targetPixels[x, y].ToVector4();
-                            TColor packed = default(TColor);
-                            packed.PackFromVector4(new Vector4(red, green, blue, targetColor.Z));
-                            targetPixels[x, y] = packed;
-                        }
-                    }
-                });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2PassFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2PassFilter.cs
deleted file mode 100644
index 4cab6f0b2..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/Convolution2PassFilter.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// <copyright file="Convolution2PassFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Defines a filter that uses two one-dimensional matrices to perform two-pass convolution against an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class Convolution2PassFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Convolution2PassFilter{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="kernelX">The horizontal gradient operator.</param>
-        /// <param name="kernelY">The vertical gradient operator.</param>
-        public Convolution2PassFilter(float[][] kernelX, float[][] kernelY)
-        {
-            this.KernelX = kernelX;
-            this.KernelY = kernelY;
-        }
-
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float[][] kernelX = this.KernelX;
-            float[][] kernelY = this.KernelY;
-
-            ImageBase<TColor, TPacked> firstPass = new Image<TColor, TPacked>(source.Width, source.Height);
-            this.ApplyConvolution(firstPass, source, sourceRectangle, startY, endY, kernelX);
-            this.ApplyConvolution(target, firstPass, sourceRectangle, startY, endY, kernelY);
-        }
-
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor, TPacked}"/> at the specified location
-        /// and with the specified size.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="startY">The index of the row within the source image to start processing.</param>
-        /// <param name="endY">The index of the row within the source image to end processing.</param>
-        /// <param name="kernel">The kernel operator.</param>
-        private void ApplyConvolution(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle sourceRectangle, int startY, int endY, float[][] kernel)
-        {
-            int kernelHeight = kernel.Length;
-            int kernelWidth = kernel[0].Length;
-            int radiusY = kernelHeight >> 1;
-            int radiusX = kernelWidth >> 1;
-
-            int sourceBottom = sourceRectangle.Bottom;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int maxY = sourceBottom - 1;
-            int maxX = endX - 1;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                startY,
-                endY,
-                this.ParallelOptions,
-                y =>
-                {
-                    for (int x = startX; x < endX; x++)
-                    {
-                        Vector4 destination = default(Vector4);
-
-                        // Apply each matrix multiplier to the color components for each pixel.
-                        for (int fy = 0; fy < kernelHeight; fy++)
-                        {
-                            int fyr = fy - radiusY;
-                            int offsetY = y + fyr;
-
-                            offsetY = offsetY.Clamp(0, maxY);
-
-                            for (int fx = 0; fx < kernelWidth; fx++)
-                            {
-                                int fxr = fx - radiusX;
-                                int offsetX = x + fxr;
-
-                                offsetX = offsetX.Clamp(0, maxX);
-
-                                Vector4 currentColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                destination += kernel[fy][fx] * currentColor;
-                            }
-                        }
-
-                        TColor packed = default(TColor);
-                        packed.PackFromVector4(destination);
-                        targetPixels[x, y] = packed;
-                    }
-                });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/ConvolutionFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/ConvolutionFilter.cs
deleted file mode 100644
index c94bee764..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/ConvolutionFilter.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// <copyright file="ConvolutionFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Defines a filter that uses a 2 dimensional matrix to perform convolution against an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class ConvolutionFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConvolutionFilter{TColor,TPacked}"/> class.
-        /// </summary>
-        /// <param name="kernelXY">The 2d gradient operator.</param>
-        public ConvolutionFilter(float[][] kernelXY)
-        {
-            this.KernelXY = kernelXY;
-        }
-
-        /// <summary>
-        /// Gets the 2d gradient operator.
-        /// </summary>
-        public virtual float[][] KernelXY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float[][] kernelX = this.KernelXY;
-            int kernelLength = kernelX.GetLength(0);
-            int radius = kernelLength >> 1;
-
-            int sourceY = sourceRectangle.Y;
-            int sourceBottom = sourceRectangle.Bottom;
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int maxY = sourceBottom - 1;
-            int maxX = endX - 1;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                startY,
-                endY,
-                this.ParallelOptions,
-                y =>
-                {
-                    if (y >= sourceY && y < sourceBottom)
-                    {
-                        for (int x = startX; x < endX; x++)
-                        {
-                            float rX = 0;
-                            float gX = 0;
-                            float bX = 0;
-
-                            // Apply each matrix multiplier to the color components for each pixel.
-                            for (int fy = 0; fy < kernelLength; fy++)
-                            {
-                                int fyr = fy - radius;
-                                int offsetY = y + fyr;
-
-                                offsetY = offsetY.Clamp(0, maxY);
-
-                                for (int fx = 0; fx < kernelLength; fx++)
-                                {
-                                    int fxr = fx - radius;
-                                    int offsetX = x + fxr;
-
-                                    offsetX = offsetX.Clamp(0, maxX);
-
-                                    Vector4 currentColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                    float r = currentColor.X;
-                                    float g = currentColor.Y;
-                                    float b = currentColor.Z;
-
-                                    rX += kernelX[fy][fx] * r;
-                                    gX += kernelX[fy][fx] * g;
-                                    bX += kernelX[fy][fx] * b;
-                                }
-                            }
-
-                            float red = rX;
-                            float green = gX;
-                            float blue = bX;
-
-                            Vector4 targetColor = targetPixels[x, y].ToVector4();
-                            TColor packed = default(TColor);
-                            packed.PackFromVector4(new Vector4(red, green, blue, targetColor.Z));
-                            targetPixels[x, y] = packed;
-                        }
-                    }
-                });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs
deleted file mode 100644
index a689415f6..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetector2DFilter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="EdgeDetector2DFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Defines a filter that detects edges within an image using two
-    /// one-dimensional matrices.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class EdgeDetector2DFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>, IEdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public abstract float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public abstract float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public bool Grayscale { get; set; }
-
-        /// <inheritdoc />
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            // TODO: Figure out a way to pass event handlers to child classes.
-            new Convolution2DFilter<TColor, TPacked>(this.KernelX, this.KernelY).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            if (this.Grayscale)
-            {
-                new GrayscaleBt709Processor<TColor, TPacked>().Apply(source, sourceRectangle);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorCompassFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorCompassFilter.cs
deleted file mode 100644
index 6d5053111..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorCompassFilter.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// <copyright file="EdgeDetectorCompassFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Defines a filter that detects edges within an image using a eight two dimensional matrices.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class EdgeDetectorCompassFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>, IEdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Gets the North gradient operator
-        /// </summary>
-        public abstract float[][] North { get; }
-
-        /// <summary>
-        /// Gets the NorthWest gradient operator
-        /// </summary>
-        public abstract float[][] NorthWest { get; }
-
-        /// <summary>
-        /// Gets the West gradient operator
-        /// </summary>
-        public abstract float[][] West { get; }
-
-        /// <summary>
-        /// Gets the SouthWest gradient operator
-        /// </summary>
-        public abstract float[][] SouthWest { get; }
-
-        /// <summary>
-        /// Gets the South gradient operator
-        /// </summary>
-        public abstract float[][] South { get; }
-
-        /// <summary>
-        /// Gets the SouthEast gradient operator
-        /// </summary>
-        public abstract float[][] SouthEast { get; }
-
-        /// <summary>
-        /// Gets the East gradient operator
-        /// </summary>
-        public abstract float[][] East { get; }
-
-        /// <summary>
-        /// Gets the NorthEast gradient operator
-        /// </summary>
-        public abstract float[][] NorthEast { get; }
-
-        /// <inheritdoc/>
-        public bool Grayscale { get; set; }
-
-        /// <inheritdoc />
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            float[][][] kernels = { this.North, this.NorthWest, this.West, this.SouthWest, this.South, this.SouthEast, this.East, this.NorthEast };
-
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // First run.
-            new ConvolutionFilter<TColor, TPacked>(kernels[0]).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-
-            if (kernels.Length == 1)
-            {
-                return;
-            }
-
-            int shiftY = startY;
-            int shiftX = startX;
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                shiftX = 0;
-            }
-
-            if (minY > 0)
-            {
-                shiftY = 0;
-            }
-
-            // Additional runs.
-            for (int i = 1; i < kernels.Length; i++)
-            {
-                ImageBase<TColor, TPacked> pass = new Image<TColor, TPacked>(source.Width, source.Height);
-                new ConvolutionFilter<TColor, TPacked>(kernels[i]).Apply(pass, source, sourceRectangle, targetRectangle, startY, endY);
-
-                using (PixelAccessor<TColor, TPacked> passPixels = pass.Lock())
-                using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-                {
-                    Parallel.For(
-                        minY,
-                        maxY,
-                        this.ParallelOptions,
-                        y =>
-                        {
-                            int offsetY = y - shiftY;
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                int offsetX = x - shiftX;
-
-                                // Grab the max components of the two pixels
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(Vector4.Max(passPixels[offsetX, offsetY].ToVector4(), targetPixels[offsetX, offsetY].ToVector4()));
-                                targetPixels[offsetX, offsetY] = packed;
-                            }
-                        });
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            if (this.Grayscale)
-            {
-                new GrayscaleBt709Processor<TColor, TPacked>().Apply(source, sourceRectangle);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs
deleted file mode 100644
index a565dbfc1..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/EdgeDetectorFilter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="EdgeDetectorFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Defines a filter that detects edges within an image using a single two dimensional matrix.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class EdgeDetectorFilter<TColor, TPacked> : ImageSampler<TColor, TPacked>, IEdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public bool Grayscale { get; set; }
-
-        /// <summary>
-        /// Gets the 2d gradient operator.
-        /// </summary>
-        public abstract float[][] KernelXY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            new ConvolutionFilter<TColor, TPacked>(this.KernelXY).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            if (this.Grayscale)
-            {
-                new GrayscaleBt709Processor<TColor, TPacked>().Apply(source, sourceRectangle);
-            }
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs
deleted file mode 100644
index 700201ea4..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/IEdgeDetectorFilter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <copyright file="IEdgeDetectorFilter.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Provides properties and methods allowing the detection of edges within an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IEdgeDetectorFilter<TColor, TPacked> : IImageSampler<TColor, TPacked>, IEdgeDetectorFilter
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-    }
-
-    /// <summary>
-    /// Provides properties and methods allowing the detection of edges within an image.
-    /// </summary>
-    public interface IEdgeDetectorFilter
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether to convert the image to grayscale before performing edge detection.
-        /// </summary>
-        bool Grayscale { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs
deleted file mode 100644
index cbe45f8b6..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="KayyaliProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Kayyali operator filter.
-    /// <see href="http://edgedetection.webs.com/"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class KayyaliProcessor<TColor, TPacked> : EdgeDetector2DFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The horizontal gradient operator.
-        /// </summary>
-        private static readonly float[][] KayyaliX =
-        {
-            new float[] { 6, 0, -6 },
-            new float[] { 0, 0, 0 },
-            new float[] { -6, 0, 6 }
-        };
-
-        /// <summary>
-        /// The vertical gradient operator.
-        /// </summary>
-        private static readonly float[][] KayyaliY =
-        {
-            new float[] { -6, 0, 6 },
-            new float[] { 0, 0, 0 },
-            new float[] { 6, 0, -6 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelX => KayyaliX;
-
-        /// <inheritdoc/>
-        public override float[][] KernelY => KayyaliY;
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KirschProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KirschProcessor.cs
deleted file mode 100644
index b8ead4192..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/KirschProcessor.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// <copyright file="KirschProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Kirsch operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Kirsch_operator"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class KirschProcessor<TColor, TPacked> : EdgeDetectorCompassFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The North gradient operator
-        /// </summary>
-        private static readonly float[][] KirschNorth =
-        {
-           new float[] { 5,  5,  5 },
-           new float[] { -3,  0, -3 },
-           new float[] { -3, -3, -3 }
-        };
-
-        /// <summary>
-        /// The NorthWest gradient operator
-        /// </summary>
-        private static readonly float[][] KirschNorthWest =
-        {
-           new float[] { 5,  5, -3 },
-           new float[] { 5,  0, -3 },
-           new float[] { -3, -3, -3 }
-        };
-
-        /// <summary>
-        /// The West gradient operator
-        /// </summary>
-        private static readonly float[][] KirschWest =
-        {
-           new float[] { 5, -3, -3 },
-           new float[] { 5,  0, -3 },
-           new float[] { 5, -3, -3 }
-        };
-
-        /// <summary>
-        /// The SouthWest gradient operator
-        /// </summary>
-        private static readonly float[][] KirschSouthWest =
-        {
-           new float[] { -3, -3, -3 },
-           new float[] { 5, 0, -3 },
-           new float[] { 5,  5, -3 }
-        };
-
-        /// <summary>
-        /// The South gradient operator
-        /// </summary>
-        private static readonly float[][] KirschSouth =
-        {
-           new float[] { -3, -3, -3 },
-           new float[] { -3,  0, -3 },
-           new float[] { 5,  5,  5 }
-        };
-
-        /// <summary>
-        /// The SouthEast gradient operator
-        /// </summary>
-        private static readonly float[][] KirschSouthEast =
-        {
-           new float[] { -3, -3, -3 },
-           new float[] { -3,  0,  5 },
-           new float[] { -3,  5,  5 }
-        };
-
-        /// <summary>
-        /// The East gradient operator
-        /// </summary>
-        private static readonly float[][] KirschEast =
-        {
-           new float[] { -3, -3, 5 },
-           new float[] { -3,  0, 5 },
-           new float[] { -3, -3, 5 }
-        };
-
-        /// <summary>
-        /// The NorthEast gradient operator
-        /// </summary>
-        private static readonly float[][] KirschNorthEast =
-        {
-           new float[] { -3,  5,  5 },
-           new float[] { -3,  0,  5 },
-           new float[] { -3, -3, -3 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] North => KirschNorth;
-
-        /// <inheritdoc/>
-        public override float[][] NorthWest => KirschNorthWest;
-
-        /// <inheritdoc/>
-        public override float[][] West => KirschWest;
-
-        /// <inheritdoc/>
-        public override float[][] SouthWest => KirschSouthWest;
-
-        /// <inheritdoc/>
-        public override float[][] South => KirschSouth;
-
-        /// <inheritdoc/>
-        public override float[][] SouthEast => KirschSouthEast;
-
-        /// <inheritdoc/>
-        public override float[][] East => KirschEast;
-
-        /// <inheritdoc/>
-        public override float[][] NorthEast => KirschNorthEast;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs
deleted file mode 100644
index 9fbf71674..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="Laplacian3X3Processor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Laplacian 3 x 3 operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Discrete_Laplace_operator"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class Laplacian3X3Processor<TColor, TPacked> : EdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The 2d gradient operator.
-        /// </summary>
-        private static readonly float[][] Laplacian3X3XY = new float[][]
-        {
-           new float[] { -1, -1, -1 },
-           new float[] { -1,  8, -1 },
-           new float[] { -1, -1, -1 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelXY => Laplacian3X3XY;
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs
deleted file mode 100644
index fdff0ec3a..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="Laplacian5X5Processor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Laplacian 5 x 5 operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Discrete_Laplace_operator"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class Laplacian5X5Processor<TColor, TPacked> : EdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The 2d gradient operator.
-        /// </summary>
-        private static readonly float[][] Laplacian5X5XY =
-        {
-            new float[] { -1, -1, -1, -1, -1 },
-            new float[] { -1, -1, -1, -1, -1 },
-            new float[] { -1, -1, 24, -1, -1 },
-            new float[] { -1, -1, -1, -1, -1 },
-            new float[] { -1, -1, -1, -1, -1 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelXY => Laplacian5X5XY;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs
deleted file mode 100644
index 75e0efbd2..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// <copyright file="LaplacianOfGaussianProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Laplacian of Gaussian operator filter.
-    /// <see href="http://fourier.eng.hmc.edu/e161/lectures/gradient/node8.html"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class LaplacianOfGaussianProcessor<TColor, TPacked> : EdgeDetectorFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The 2d gradient operator.
-        /// </summary>
-        private static readonly float[][] LaplacianOfGaussianXY =
-        {
-           new float[] { 0, 0, -1,  0,  0 },
-           new float[] { 0, -1, -2, -1,  0 },
-           new float[] { -1, -2, 16, -2, -1 },
-           new float[] { 0, -1, -2, -1,  0 },
-           new float[] { 0, 0, -1,  0,  0 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelXY => LaplacianOfGaussianXY;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs
deleted file mode 100644
index 70b763e63..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/PrewittProcessor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="PrewittProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Prewitt operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Prewitt_operator"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class PrewittProcessor<TColor, TPacked> : EdgeDetector2DFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The horizontal gradient operator.
-        /// </summary>
-        private static readonly float[][] PrewittX =
-        {
-            new float[] { -1, 0, 1 },
-            new float[] { -1, 0, 1 },
-            new float[] { -1, 0, 1 }
-        };
-
-        /// <summary>
-        /// The vertical gradient operator.
-        /// </summary>
-        private static readonly float[][] PrewittY =
-        {
-            new float[] { 1, 1, 1 },
-            new float[] { 0, 0, 0 },
-            new float[] { -1, -1, -1 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelX => PrewittX;
-
-        /// <inheritdoc/>
-        public override float[][] KernelY => PrewittY;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs
deleted file mode 100644
index 8eb3aac3b..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// <copyright file="RobertsCrossProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Roberts Cross operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Roberts_cross"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class RobertsCrossProcessor<TColor, TPacked> : EdgeDetector2DFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The horizontal gradient operator.
-        /// </summary>
-        private static readonly float[][] RobertsCrossX =
-        {
-            new float[] { 1, 0 },
-            new float[] { 0, -1 }
-        };
-
-        /// <summary>
-        /// The vertical gradient operator.
-        /// </summary>
-        private static readonly float[][] RobertsCrossY =
-        {
-            new float[] { 0, 1 },
-            new float[] { -1, 0 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelX => RobertsCrossX;
-
-        /// <inheritdoc/>
-        public override float[][] KernelY => RobertsCrossY;
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs
deleted file mode 100644
index 189215f08..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// <copyright file="RobinsonProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Kirsch operator filter.
-    /// <see href="http://www.tutorialspoint.com/dip/Robinson_Compass_Mask.htm"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class RobinsonProcessor<TColor, TPacked> : EdgeDetectorCompassFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The North gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonNorth =
-        {
-           new float[] { 1, 2, 1 },
-           new float[] { 0,  0, 0 },
-           new float[] { -1, -2, -1 }
-        };
-
-        /// <summary>
-        /// The NorthWest gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonNorthWest =
-        {
-           new float[] { 2,  1, 0 },
-           new float[] { 1,  0, -1 },
-           new float[] { 0, -1, -2 }
-        };
-
-        /// <summary>
-        /// The West gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonWest =
-        {
-           new float[] { 1, 0, -1 },
-           new float[] { 2, 0, -2 },
-           new float[] { 1, 0, -1 }
-        };
-
-        /// <summary>
-        /// The SouthWest gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonSouthWest =
-        {
-           new float[] { 0, -1, -2 },
-           new float[] { 1, 0, -1 },
-           new float[] { 2, 1,  0 }
-        };
-
-        /// <summary>
-        /// The South gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonSouth =
-        {
-           new float[] { -1, -2, -1 },
-           new float[] { 0,  0, 0 },
-           new float[] { 1,  2,  1 }
-        };
-
-        /// <summary>
-        /// The SouthEast gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonSouthEast =
-        {
-           new float[] { -2, -1, 0 },
-           new float[] { -1,  0, 1 },
-           new float[] { 0,  1,  2 }
-        };
-
-        /// <summary>
-        /// The East gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonEast =
-        {
-           new float[] { -1, 0, 1 },
-           new float[] { -2, 0, 2 },
-           new float[] { -1, 0, 1 }
-        };
-
-        /// <summary>
-        /// The NorthEast gradient operator
-        /// </summary>
-        private static readonly float[][] RobinsonNorthEast =
-        {
-           new float[] { 0,  1,  2 },
-           new float[] { -1,  0, 1 },
-           new float[] { -2, -1, 0 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] North => RobinsonNorth;
-
-        /// <inheritdoc/>
-        public override float[][] NorthWest => RobinsonNorthWest;
-
-        /// <inheritdoc/>
-        public override float[][] West => RobinsonWest;
-
-        /// <inheritdoc/>
-        public override float[][] SouthWest => RobinsonSouthWest;
-
-        /// <inheritdoc/>
-        public override float[][] South => RobinsonSouth;
-
-        /// <inheritdoc/>
-        public override float[][] SouthEast => RobinsonSouthEast;
-
-        /// <inheritdoc/>
-        public override float[][] East => RobinsonEast;
-
-        /// <inheritdoc/>
-        public override float[][] NorthEast => RobinsonNorthEast;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs
deleted file mode 100644
index 22e7d8084..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/ScharrProcessor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="ScharrProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Scharr operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Sobel_operator#Alternative_operators"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class ScharrProcessor<TColor, TPacked> : EdgeDetector2DFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The horizontal gradient operator.
-        /// </summary>
-        private static readonly float[][] ScharrX = new float[3][]
-        {
-            new float[] { -3, 0, 3 },
-            new float[] { -10, 0, 10 },
-            new float[] { -3, 0, 3 }
-        };
-
-        /// <summary>
-        /// The vertical gradient operator.
-        /// </summary>
-        private static readonly float[][] ScharrY = new float[3][]
-        {
-            new float[] { 3, 10, 3 },
-            new float[] { 0, 0, 0 },
-            new float[] { -3, -10, -3 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelX => ScharrX;
-
-        /// <inheritdoc/>
-        public override float[][] KernelY => ScharrY;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs
deleted file mode 100644
index 7d9521c69..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/EdgeDetection/SobelProcessor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// <copyright file="SobelProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Diagnostics.CodeAnalysis;
-
-    /// <summary>
-    /// The Sobel operator filter.
-    /// <see href="http://en.wikipedia.org/wiki/Sobel_operator"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    public class SobelProcessor<TColor, TPacked> : EdgeDetector2DFilter<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The horizontal gradient operator.
-        /// </summary>
-        private static readonly float[][] SobelX =
-        {
-            new float[] { -1, 0, 1 },
-            new float[] { -2, 0, 2 },
-            new float[] { -1, 0, 1 }
-        };
-
-        /// <summary>
-        /// The vertical gradient operator.
-        /// </summary>
-        private static readonly float[][] SobelY =
-        {
-            new float[] { -1, -2, -1 },
-            new float[] { 0, 0, 0 },
-            new float[] { 1, 2, 1 }
-        };
-
-        /// <inheritdoc/>
-        public override float[][] KernelX => SobelX;
-
-        /// <inheritdoc/>
-        public override float[][] KernelY => SobelY;
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/GuassianBlurProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/GuassianBlurProcessor.cs
deleted file mode 100644
index 856239385..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/GuassianBlurProcessor.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// <copyright file="GuassianBlurProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-
-    /// <summary>
-    /// Applies a Gaussian blur filter to the image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class GuassianBlurProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The maximum size of the kernel in either direction.
-        /// </summary>
-        private readonly int kernelSize;
-
-        /// <summary>
-        /// The spread of the blur.
-        /// </summary>
-        private readonly float sigma;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianBlurProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        public GuassianBlurProcessor(float sigma = 3f)
-        {
-            this.kernelSize = ((int)Math.Ceiling(sigma) * 2) + 1;
-            this.sigma = sigma;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianBlurProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="radius">
-        /// The 'radius' value representing the size of the area to sample.
-        /// </param>
-        public GuassianBlurProcessor(int radius)
-        {
-            this.kernelSize = (radius * 2) + 1;
-            this.sigma = radius;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianBlurProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sigma">
-        /// The 'sigma' value representing the weight of the blur.
-        /// </param>
-        /// <param name="radius">
-        /// The 'radius' value representing the size of the area to sample.
-        /// This should be at least twice the sigma value.
-        /// </param>
-        public GuassianBlurProcessor(float sigma, int radius)
-        {
-            this.kernelSize = (radius * 2) + 1;
-            this.sigma = sigma;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            new Convolution2PassFilter<TColor, TPacked>(this.KernelX, this.KernelY).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-        }
-
-        /// <summary>
-        /// Create a 1 dimensional Gaussian kernel using the Gaussian G(x) function
-        /// </summary>
-        /// <param name="horizontal">Whether to calculate a horizontal kernel.</param>
-        /// <returns>The <see cref="T:float[][]"/></returns>
-        private float[][] CreateGaussianKernel(bool horizontal)
-        {
-            int size = this.kernelSize;
-            float weight = this.sigma;
-            float[][] kernel = horizontal ? new float[1][] : new float[size][];
-
-            if (horizontal)
-            {
-                kernel[0] = new float[size];
-            }
-
-            float sum = 0.0f;
-
-            float midpoint = (size - 1) / 2f;
-            for (int i = 0; i < size; i++)
-            {
-                float x = i - midpoint;
-                float gx = ImageMaths.Gaussian(x, weight);
-                sum += gx;
-                if (horizontal)
-                {
-                    kernel[0][i] = gx;
-                }
-                else
-                {
-                    kernel[i] = new[] { gx };
-                }
-            }
-
-            // Normalise kernel so that the sum of all weights equals 1
-            if (horizontal)
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[0][i] = kernel[0][i] / sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[i][0] = kernel[i][0] / sum;
-                }
-            }
-
-            return kernel;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Convolution/GuassianSharpenProcessor.cs b/src/ImageSharp46/Samplers/Processors/Convolution/GuassianSharpenProcessor.cs
deleted file mode 100644
index 3c86fcfee..000000000
--- a/src/ImageSharp46/Samplers/Processors/Convolution/GuassianSharpenProcessor.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// <copyright file="GuassianSharpenProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-
-    /// <summary>
-    /// Applies a Gaussian sharpening filter to the image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class GuassianSharpenProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The maximum size of the kernel in either direction.
-        /// </summary>
-        private readonly int kernelSize;
-
-        /// <summary>
-        /// The spread of the blur.
-        /// </summary>
-        private readonly float sigma;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianSharpenProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sigma">
-        /// The 'sigma' value representing the weight of the sharpening.
-        /// </param>
-        public GuassianSharpenProcessor(float sigma = 3f)
-        {
-            this.kernelSize = ((int)Math.Ceiling(sigma) * 2) + 1;
-            this.sigma = sigma;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianSharpenProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="radius">
-        /// The 'radius' value representing the size of the area to sample.
-        /// </param>
-        public GuassianSharpenProcessor(int radius)
-        {
-            this.kernelSize = (radius * 2) + 1;
-            this.sigma = radius;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GuassianSharpenProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sigma">
-        /// The 'sigma' value representing the weight of the sharpen.
-        /// </param>
-        /// <param name="radius">
-        /// The 'radius' value representing the size of the area to sample.
-        /// This should be at least twice the sigma value.
-        /// </param>
-        public GuassianSharpenProcessor(float sigma, int radius)
-        {
-            this.kernelSize = (radius * 2) + 1;
-            this.sigma = sigma;
-            this.KernelX = this.CreateGaussianKernel(true);
-            this.KernelY = this.CreateGaussianKernel(false);
-        }
-
-        /// <summary>
-        /// Gets the horizontal gradient operator.
-        /// </summary>
-        public float[][] KernelX { get; }
-
-        /// <summary>
-        /// Gets the vertical gradient operator.
-        /// </summary>
-        public float[][] KernelY { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            new Convolution2PassFilter<TColor, TPacked>(this.KernelX, this.KernelY).Apply(target, source, targetRectangle, sourceRectangle, startY, endY);
-        }
-
-        /// <summary>
-        /// Create a 1 dimensional Gaussian kernel using the Gaussian G(x) function
-        /// </summary>
-        /// <param name="horizontal">Whether to calculate a horizontal kernel.</param>
-        /// <returns>The <see cref="T:float[][]"/></returns>
-        private float[][] CreateGaussianKernel(bool horizontal)
-        {
-            int size = this.kernelSize;
-            float weight = this.sigma;
-            float[][] kernel = horizontal ? new float[1][] : new float[size][];
-
-            if (horizontal)
-            {
-                kernel[0] = new float[size];
-            }
-
-            float sum = 0;
-
-            float midpoint = (size - 1) / 2f;
-            for (int i = 0; i < size; i++)
-            {
-                float x = i - midpoint;
-                float gx = ImageMaths.Gaussian(x, weight);
-                sum += gx;
-                if (horizontal)
-                {
-                    kernel[0][i] = gx;
-                }
-                else
-                {
-                    kernel[i] = new[] { gx };
-                }
-            }
-
-            // Invert the kernel for sharpening.
-            int midpointRounded = (int)midpoint;
-
-            if (horizontal)
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    if (i == midpointRounded)
-                    {
-                        // Calculate central value
-                        kernel[0][i] = (2f * sum) - kernel[0][i];
-                    }
-                    else
-                    {
-                        // invert value
-                        kernel[0][i] = -kernel[0][i];
-                    }
-                }
-            }
-            else
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    if (i == midpointRounded)
-                    {
-                        // Calculate central value
-                        kernel[i][0] = (2 * sum) - kernel[i][0];
-                    }
-                    else
-                    {
-                        // invert value
-                        kernel[i][0] = -kernel[i][0];
-                    }
-                }
-            }
-
-            // Normalise kernel so that the sum of all weights equals 1
-            if (horizontal)
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[0][i] = kernel[0][i] / sum;
-                }
-            }
-            else
-            {
-                for (int i = 0; i < size; i++)
-                {
-                    kernel[i][0] = kernel[i][0] / sum;
-                }
-            }
-
-            return kernel;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/CropProcessor.cs b/src/ImageSharp46/Samplers/Processors/CropProcessor.cs
deleted file mode 100644
index 0e8510837..000000000
--- a/src/ImageSharp46/Samplers/Processors/CropProcessor.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// <copyright file="CropProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods to allow the cropping of an image.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class CropProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = targetRectangle.X;
-            int endX = targetRectangle.Right;
-            int sourceX = sourceRectangle.X;
-            int sourceY = sourceRectangle.Y;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    startY,
-                    endY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            for (int x = startX; x < endX; x++)
-                            {
-                                targetPixels[x, y] = sourcePixels[x + sourceX, y + sourceY];
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/EntropyCropProcessor.cs b/src/ImageSharp46/Samplers/Processors/EntropyCropProcessor.cs
deleted file mode 100644
index dbb99d1c4..000000000
--- a/src/ImageSharp46/Samplers/Processors/EntropyCropProcessor.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// <copyright file="EntropyCropProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods to allow the cropping of an image to preserve areas of highest
-    /// entropy.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class EntropyCropProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The rectangle for cropping
-        /// </summary>
-        private Rectangle cropRectangle;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntropyCropProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="threshold">The threshold to split the image. Must be between 0 and 1.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="threshold"/> is less than 0 or is greater than 1.
-        /// </exception>
-        public EntropyCropProcessor(float threshold)
-        {
-            Guard.MustBeBetweenOrEqualTo(threshold, 0, 1, nameof(threshold));
-            this.Value = threshold;
-        }
-
-        /// <summary>
-        /// Gets the threshold value.
-        /// </summary>
-        public float Value { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            // Jump out, we'll deal with that later.
-            if (source.Bounds == target.Bounds)
-            {
-                return;
-            }
-
-            int targetY = this.cropRectangle.Y;
-            int targetBottom = this.cropRectangle.Bottom;
-            int startX = this.cropRectangle.X;
-            int endX = this.cropRectangle.Right;
-
-            int minY = Math.Max(targetY, startY);
-            int maxY = Math.Min(targetBottom, endY);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            for (int x = startX; x < endX; x++)
-                            {
-                                targetPixels[x - startX, y - targetY] = sourcePixels[x, y];
-                            }
-                        });
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            ImageBase<TColor, TPacked> temp = new Image<TColor, TPacked>(source.Width, source.Height);
-
-            // Detect the edges.
-            new SobelProcessor<TColor, TPacked>().Apply(temp, source, sourceRectangle);
-
-            // Apply threshold binarization filter.
-            new BinaryThresholdProcessor<TColor, TPacked>(.5f).Apply(temp, sourceRectangle);
-
-            // Search for the first white pixels
-            Rectangle rectangle = ImageMaths.GetFilteredBoundingRectangle(temp, 0);
-
-            // Reset the target pixel to the correct size.
-            target.SetPixels(rectangle.Width, rectangle.Height, new TColor[rectangle.Width * rectangle.Height]);
-            this.cropRectangle = rectangle;
-        }
-
-        /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            // Copy the pixels over.
-            if (source.Bounds == target.Bounds)
-            {
-                target.ClonePixels(target.Width, target.Height, source.Pixels);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/FlipProcessor.cs b/src/ImageSharp46/Samplers/Processors/FlipProcessor.cs
deleted file mode 100644
index d6efccec7..000000000
--- a/src/ImageSharp46/Samplers/Processors/FlipProcessor.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// <copyright file="FlipProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods that allow the flipping of an image around its center point.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class FlipProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FlipProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="flipType">The <see cref="FlipType"/> used to perform flipping.</param>
-        public FlipProcessor(FlipType flipType)
-        {
-            this.FlipType = flipType;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="FlipType"/> used to perform flipping.
-        /// </summary>
-        public FlipType FlipType { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            target.ClonePixels(target.Width, target.Height, source.Pixels);
-
-            switch (this.FlipType)
-            {
-                // No default needed as we have already set the pixels.
-                case FlipType.Vertical:
-                    this.FlipX(target);
-                    break;
-                case FlipType.Horizontal:
-                    this.FlipY(target);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Swaps the image at the X-axis, which goes horizontally through the middle
-        /// at half the height of the image.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        private void FlipX(ImageBase<TColor, TPacked> target)
-        {
-            int width = target.Width;
-            int height = target.Height;
-            int halfHeight = (int)Math.Ceiling(target.Height * .5F);
-            Image<TColor, TPacked> temp = new Image<TColor, TPacked>(width, height);
-            temp.ClonePixels(width, height, target.Pixels);
-
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            using (PixelAccessor<TColor, TPacked> tempPixels = temp.Lock())
-            {
-                Parallel.For(
-                    0,
-                    halfHeight,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            for (int x = 0; x < width; x++)
-                            {
-                                int newY = height - y - 1;
-                                targetPixels[x, y] = tempPixels[x, newY];
-                                targetPixels[x, newY] = tempPixels[x, y];
-                            }
-                        });
-            }
-        }
-
-        /// <summary>
-        /// Swaps the image at the Y-axis, which goes vertically through the middle
-        /// at half of the width of the image.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        private void FlipY(ImageBase<TColor, TPacked> target)
-        {
-            int width = target.Width;
-            int height = target.Height;
-            int halfWidth = (int)Math.Ceiling(width * .5F);
-            Image<TColor, TPacked> temp = new Image<TColor, TPacked>(width, height);
-            temp.ClonePixels(width, height, target.Pixels);
-
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            using (PixelAccessor<TColor, TPacked> tempPixels = temp.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            for (int x = 0; x < halfWidth; x++)
-                            {
-                                int newX = width - x - 1;
-                                targetPixels[x, y] = tempPixels[newX, y];
-                                targetPixels[newX, y] = tempPixels[x, y];
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/IImageSampler.cs b/src/ImageSharp46/Samplers/Processors/IImageSampler.cs
deleted file mode 100644
index 891a810d1..000000000
--- a/src/ImageSharp46/Samplers/Processors/IImageSampler.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// <copyright file="IImageSampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// Encapsulates methods to alter the pixels of an image. The processor creates a copy of the original image to operate on.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public interface IImageSampler<TColor, TPacked> : IImageProcessor
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{T, TP}"/>.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <remarks>
-        /// The method keeps the source image unchanged and returns the
-        /// the result of image processing filter as new image.
-        /// </remarks>
-        /// <exception cref="System.ArgumentNullException">
-        /// <paramref name="target"/> is null or <paramref name="source"/> is null.
-        /// </exception>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="sourceRectangle"/> doesnt fit the dimension of the image.
-        /// </exception>
-        void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle sourceRectangle);
-
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{T, TP}"/> at the specified
-        /// location and with the specified size.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="width">The target width.</param>
-        /// <param name="height">The target height.</param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the location and size of the drawn image.
-        /// The image is scaled to fit the rectangle.
-        /// </param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <remarks>
-        /// The method keeps the source image unchanged and returns the
-        /// the result of image process as new image.
-        /// </remarks>
-        void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, int width, int height, Rectangle targetRectangle, Rectangle sourceRectangle);
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/ImageSampler.cs b/src/ImageSharp46/Samplers/Processors/ImageSampler.cs
deleted file mode 100644
index 98ffe3b88..000000000
--- a/src/ImageSharp46/Samplers/Processors/ImageSampler.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// <copyright file="ImageSampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-
-    /// <summary>
-    /// Encapsulates methods to alter the pixels of an image. The processor creates a copy of the original image to operate on.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class ImageSampler<TColor, TPacked> : ImageProcessor<TColor, TPacked>, IImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <inheritdoc/>
-        public void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle sourceRectangle)
-        {
-            try
-            {
-                this.OnApply(target, source, target.Bounds, sourceRectangle);
-
-                this.Apply(target, source, target.Bounds, sourceRectangle, sourceRectangle.Y, sourceRectangle.Bottom);
-
-                this.AfterApply(target, source, target.Bounds, sourceRectangle);
-            }
-            catch (Exception ex)
-            {
-                throw new ImageProcessingException($"An error occured when processing the image using {this.GetType().Name}. See the inner exception for more detail.", ex);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, int width, int height, Rectangle targetRectangle = default(Rectangle), Rectangle sourceRectangle = default(Rectangle))
-        {
-            try
-            {
-                TColor[] pixels = new TColor[width * height];
-                target.SetPixels(width, height, pixels);
-
-                // Ensure we always have bounds.
-                if (sourceRectangle == Rectangle.Empty)
-                {
-                    sourceRectangle = source.Bounds;
-                }
-
-                if (targetRectangle == Rectangle.Empty)
-                {
-                    targetRectangle = target.Bounds;
-                }
-
-                this.OnApply(target, source, targetRectangle, sourceRectangle);
-
-                this.Apply(target, source, targetRectangle, sourceRectangle, targetRectangle.Y, targetRectangle.Bottom);
-
-                this.AfterApply(target, source, target.Bounds, sourceRectangle);
-            }
-            catch (Exception ex)
-            {
-                throw new ImageProcessingException($"An error occured when processing the image using {this.GetType().Name}. See the inner exception for more detail.", ex);
-            }
-        }
-
-        /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor, TPacked}"/> at the specified location
-        /// and with the specified size.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the location and size of the drawn image.
-        /// The image is scaled to fit the rectangle.
-        /// </param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="startY">The index of the row within the source image to start processing.</param>
-        /// <param name="endY">The index of the row within the source image to end processing.</param>
-        /// <remarks>
-        /// The method keeps the source image unchanged and returns the the result of image process as new image.
-        /// </remarks>
-        public abstract void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY);
-
-        /// <summary>
-        /// This method is called before the process is applied to prepare the processor.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the location and size of the drawn image.
-        /// The image is scaled to fit the rectangle.
-        /// </param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        protected virtual void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-        }
-
-        /// <summary>
-        /// This method is called after the process is applied to prepare the processor.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image. Cannot be null.</param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the location and size of the drawn image.
-        /// The image is scaled to fit the rectangle.
-        /// </param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        protected virtual void AfterApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/Matrix3x2Processor.cs b/src/ImageSharp46/Samplers/Processors/Matrix3x2Processor.cs
deleted file mode 100644
index a9b460d43..000000000
--- a/src/ImageSharp46/Samplers/Processors/Matrix3x2Processor.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// <copyright file="Matrix3x2Processor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Provides methods to transform an image using a <see cref="Matrix3x2"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class Matrix3x2Processor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Creates a new target to contain the results of the matrix transform.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="sourceRectangle">The source rectangle.</param>
-        /// <param name="processMatrix">The processing matrix.</param>
-        protected static void CreateNewTarget(ImageBase<TColor, TPacked> target, Rectangle sourceRectangle, Matrix3x2 processMatrix)
-        {
-            Matrix3x2 sizeMatrix;
-            if (Matrix3x2.Invert(processMatrix, out sizeMatrix))
-            {
-                Rectangle rectangle = ImageMaths.GetBoundingRectangle(sourceRectangle, sizeMatrix);
-                target.SetPixels(rectangle.Width, rectangle.Height, new TColor[rectangle.Width * rectangle.Height]);
-            }
-        }
-
-        /// <summary>
-        /// Gets a transform matrix adjusted to center upon the target image bounds.
-        /// </summary>
-        /// <param name="target">Target image to apply the process to.</param>
-        /// <param name="source">The source image.</param>
-        /// <param name="matrix">The transform matrix.</param>
-        /// <returns>
-        /// The <see cref="Matrix3x2"/>.
-        /// </returns>
-        protected static Matrix3x2 GetCenteredMatrix(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Matrix3x2 matrix)
-        {
-            Matrix3x2 translationToTargetCenter = Matrix3x2.CreateTranslation(-target.Width * .5F, -target.Height * .5F);
-            Matrix3x2 translateToSourceCenter = Matrix3x2.CreateTranslation(source.Width * .5F, source.Height * .5F);
-            return (translationToTargetCenter * matrix) * translateToSourceCenter;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Processors/OilPaintingProcessor.cs b/src/ImageSharp46/Samplers/Processors/OilPaintingProcessor.cs
deleted file mode 100644
index ee0d4121a..000000000
--- a/src/ImageSharp46/Samplers/Processors/OilPaintingProcessor.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// <copyright file="OilPaintingProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageSampler{TColor,TPacked}"/> to apply an oil painting effect to an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <remarks>Adapted from <see href="https://softwarebydefault.com/2013/06/29/oil-painting-cartoon-filter/"/> by Dewald Esterhuizen.</remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class OilPaintingProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OilPaintingProcessor{T,TP}"/> class.
-        /// </summary>
-        /// <param name="levels">The number of intensity levels. Higher values result in a broader range of colour intensities forming part of the result image.</param>
-        /// <param name="brushSize">The number of neighbouring pixels used in calculating each individual pixel value.</param>
-        public OilPaintingProcessor(int levels, int brushSize)
-        {
-            Guard.MustBeGreaterThan(levels, 0, nameof(levels));
-            Guard.MustBeGreaterThan(brushSize, 0, nameof(brushSize));
-
-            this.Levels = levels;
-            this.BrushSize = brushSize;
-        }
-
-        /// <summary>
-        /// Gets the intensity levels
-        /// </summary>
-        public int Levels { get; }
-
-        /// <summary>
-        /// Gets the brush size
-        /// </summary>
-        public int BrushSize { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int radius = this.BrushSize >> 1;
-            int levels = this.Levels;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = startX; x < endX; x++)
-                        {
-                            int maxIntensity = 0;
-                            int maxIndex = 0;
-
-                            int[] intensityBin = new int[levels];
-                            float[] redBin = new float[levels];
-                            float[] blueBin = new float[levels];
-                            float[] greenBin = new float[levels];
-
-                            for (int fy = 0; fy <= radius; fy++)
-                            {
-                                int fyr = fy - radius;
-                                int offsetY = y + fyr;
-
-                                // Skip the current row
-                                if (offsetY < minY)
-                                {
-                                    continue;
-                                }
-
-                                // Outwith the current bounds so break.
-                                if (offsetY >= maxY)
-                                {
-                                    break;
-                                }
-
-                                for (int fx = 0; fx <= radius; fx++)
-                                {
-                                    int fxr = fx - radius;
-                                    int offsetX = x + fxr;
-
-                                    // Skip the column
-                                    if (offsetX < 0)
-                                    {
-                                        continue;
-                                    }
-
-                                    if (offsetX < maxX)
-                                    {
-                                        // ReSharper disable once AccessToDisposedClosure
-                                        Vector4 color = sourcePixels[offsetX, offsetY].ToVector4();
-
-                                        float sourceRed = color.X;
-                                        float sourceBlue = color.Z;
-                                        float sourceGreen = color.Y;
-
-                                        int currentIntensity = (int)Math.Round((sourceBlue + sourceGreen + sourceRed) / 3.0 * (levels - 1));
-
-                                        intensityBin[currentIntensity] += 1;
-                                        blueBin[currentIntensity] += sourceBlue;
-                                        greenBin[currentIntensity] += sourceGreen;
-                                        redBin[currentIntensity] += sourceRed;
-
-                                        if (intensityBin[currentIntensity] > maxIntensity)
-                                        {
-                                            maxIntensity = intensityBin[currentIntensity];
-                                            maxIndex = currentIntensity;
-                                        }
-                                    }
-                                }
-
-                                float red = Math.Abs(redBin[maxIndex] / maxIntensity);
-                                float green = Math.Abs(greenBin[maxIndex] / maxIntensity);
-                                float blue = Math.Abs(blueBin[maxIndex] / maxIntensity);
-
-                                Vector4 targetColor = targetPixels[x, y].ToVector4();
-                                TColor packed = default(TColor);
-                                packed.PackFromVector4(new Vector4(red, green, blue, targetColor.Z));
-                                targetPixels[x, y] = packed;
-                            }
-                        }
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/PixelateProcessor.cs b/src/ImageSharp46/Samplers/Processors/PixelateProcessor.cs
deleted file mode 100644
index 2c1875909..000000000
--- a/src/ImageSharp46/Samplers/Processors/PixelateProcessor.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// <copyright file="PixelateProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// An <see cref="IImageSampler{TColor,TPacked}"/> to pixelate the colors of an <see cref="Image{TColor, TPacked}"/>.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class PixelateProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PixelateProcessor{T,TP}"/> class.
-        /// </summary>
-        /// <param name="size">The size of the pixels. Must be greater than 0.</param>
-        /// <exception cref="System.ArgumentException">
-        /// <paramref name="size"/> is less than 0 or equal to 0.
-        /// </exception>
-        public PixelateProcessor(int size)
-        {
-            Guard.MustBeGreaterThan(size, 0, nameof(size));
-            this.Value = size;
-        }
-
-        /// <summary>
-        /// Gets or the pixel size.
-        /// </summary>
-        public int Value { get; }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int startX = sourceRectangle.X;
-            int endX = sourceRectangle.Right;
-            int size = this.Value;
-            int offset = this.Value / 2;
-
-            // Align start/end positions.
-            int minX = Math.Max(0, startX);
-            int maxX = Math.Min(source.Width, endX);
-            int minY = Math.Max(0, startY);
-            int maxY = Math.Min(source.Height, endY);
-
-            // Reset offset if necessary.
-            if (minX > 0)
-            {
-                startX = 0;
-            }
-
-            if (minY > 0)
-            {
-                startY = 0;
-            }
-
-            // Get the range on the y-plane to choose from.
-            IEnumerable<int> range = EnumerableExtensions.SteppedRange(minY, i => i < maxY, size);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.ForEach(
-                    range,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            int offsetY = y - startY;
-                            int offsetPy = offset;
-
-                            for (int x = minX; x < maxX; x += size)
-                            {
-                                int offsetX = x - startX;
-                                int offsetPx = offset;
-
-                                // Make sure that the offset is within the boundary of the image.
-                                while (offsetY + offsetPy >= maxY)
-                                {
-                                    offsetPy--;
-                                }
-
-                                while (x + offsetPx >= maxX)
-                                {
-                                    offsetPx--;
-                                }
-
-                                // Get the pixel color in the centre of the soon to be pixelated area.
-                                // ReSharper disable AccessToDisposedClosure
-                                TColor pixel = sourcePixels[offsetX + offsetPx, offsetY + offsetPy];
-
-                                // For each pixel in the pixelate size, set it to the centre color.
-                                for (int l = offsetY; l < offsetY + size && l < maxY; l++)
-                                {
-                                    for (int k = offsetX; k < offsetX + size && k < maxX; k++)
-                                    {
-                                        targetPixels[k, l] = pixel;
-                                    }
-                                }
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/ResamplingWeightedProcessor.cs b/src/ImageSharp46/Samplers/Processors/ResamplingWeightedProcessor.cs
deleted file mode 100644
index 1d9d3da35..000000000
--- a/src/ImageSharp46/Samplers/Processors/ResamplingWeightedProcessor.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-// <copyright file="ResamplingWeightedProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-
-    /// <summary>
-    /// Provides methods that allow the resizing of images using various algorithms.
-    /// Adapted from <see href="http://www.realtimerendering.com/resources/GraphicsGems/gemsiii/filter_rcg.c"/>
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public abstract class ResamplingWeightedProcessor<TColor, TPacked> : ImageSampler<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResamplingWeightedProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sampler">
-        /// The sampler to perform the resize operation.
-        /// </param>
-        protected ResamplingWeightedProcessor(IResampler sampler)
-        {
-            Guard.NotNull(sampler, nameof(sampler));
-
-            this.Sampler = sampler;
-        }
-
-        /// <summary>
-        /// Gets the sampler to perform the resize operation.
-        /// </summary>
-        public IResampler Sampler { get; }
-
-        /// <summary>
-        /// Gets or sets the horizontal weights.
-        /// </summary>
-        protected Weights[] HorizontalWeights { get; set; }
-
-        /// <summary>
-        /// Gets or sets the vertical weights.
-        /// </summary>
-        protected Weights[] VerticalWeights { get; set; }
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            if (!(this.Sampler is NearestNeighborResampler))
-            {
-                this.HorizontalWeights = this.PrecomputeWeights(targetRectangle.Width, sourceRectangle.Width);
-                this.VerticalWeights = this.PrecomputeWeights(targetRectangle.Height, sourceRectangle.Height);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            // Copy the pixels over.
-            if (source.Bounds == target.Bounds && sourceRectangle == targetRectangle)
-            {
-                target.ClonePixels(target.Width, target.Height, source.Pixels);
-            }
-        }
-
-        /// <summary>
-        /// Computes the weights to apply at each pixel when resizing.
-        /// </summary>
-        /// <param name="destinationSize">The destination section size.</param>
-        /// <param name="sourceSize">The source section size.</param>
-        /// <returns>
-        /// The <see cref="T:Weights[]"/>.
-        /// </returns>
-        protected Weights[] PrecomputeWeights(int destinationSize, int sourceSize)
-        {
-            float ratio = (float)sourceSize / destinationSize;
-            float scale = ratio;
-
-            if (scale < 1F)
-            {
-                scale = 1F;
-            }
-
-            IResampler sampler = this.Sampler;
-            float radius = (float)Math.Ceiling(scale * sampler.Radius);
-            Weights[] result = new Weights[destinationSize];
-
-            for (int i = 0; i < destinationSize; i++)
-            {
-                float center = ((i + .5F) * ratio) - .5F;
-
-                // Keep inside bounds.
-                int left = (int)Math.Ceiling(center - radius);
-                if (left < 0)
-                {
-                    left = 0;
-                }
-
-                int right = (int)Math.Floor(center + radius);
-                if (right > sourceSize - 1)
-                {
-                    right = sourceSize - 1;
-                }
-
-                float sum = 0;
-                result[i] = new Weights();
-                Weight[] weights = new Weight[right - left + 1];
-
-                for (int j = left; j <= right; j++)
-                {
-                    float weight = sampler.GetValue((j - center) / scale);
-                    sum += weight;
-                    weights[j - left] = new Weight(j, weight);
-                }
-
-                // Normalise, best to do it here rather than in the pixel loop later on.
-                if (sum > 0)
-                {
-                    for (int w = 0; w < weights.Length; w++)
-                    {
-                        weights[w].Value = weights[w].Value / sum;
-                    }
-                }
-
-                result[i].Values = weights;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Represents the weight to be added to a scaled pixel.
-        /// </summary>
-        protected class Weight
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Weight"/> class.
-            /// </summary>
-            /// <param name="index">The index.</param>
-            /// <param name="value">The value.</param>
-            public Weight(int index, float value)
-            {
-                this.Index = index;
-                this.Value = value;
-            }
-
-            /// <summary>
-            /// Gets the pixel index.
-            /// </summary>
-            public int Index { get; }
-
-            /// <summary>
-            /// Gets or sets the result of the interpolation algorithm.
-            /// </summary>
-            public float Value { get; set; }
-        }
-
-        /// <summary>
-        /// Represents a collection of weights and their sum.
-        /// </summary>
-        protected class Weights
-        {
-            /// <summary>
-            /// Gets or sets the values.
-            /// </summary>
-            public Weight[] Values { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/ResizeProcessor.cs b/src/ImageSharp46/Samplers/Processors/ResizeProcessor.cs
deleted file mode 100644
index 82e949148..000000000
--- a/src/ImageSharp46/Samplers/Processors/ResizeProcessor.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// <copyright file="ResizeProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods that allow the resizing of images using various algorithms.
-    /// </summary>
-    /// <remarks>
-    /// This version and the <see cref="CompandingResizeProcessor{TColor, TPacked}"/> have been separated out to improve performance.
-    /// </remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class ResizeProcessor<TColor, TPacked> : ResamplingWeightedProcessor<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ResizeProcessor{TColor, TPacked}"/> class.
-        /// </summary>
-        /// <param name="sampler">
-        /// The sampler to perform the resize operation.
-        /// </param>
-        public ResizeProcessor(IResampler sampler)
-            : base(sampler)
-        {
-        }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            // Jump out, we'll deal with that later.
-            if (source.Bounds == target.Bounds && sourceRectangle == targetRectangle)
-            {
-                return;
-            }
-
-            int width = target.Width;
-            int height = target.Height;
-            int sourceHeight = sourceRectangle.Height;
-            int targetX = target.Bounds.X;
-            int targetY = target.Bounds.Y;
-            int targetRight = target.Bounds.Right;
-            int targetBottom = target.Bounds.Bottom;
-            int startX = targetRectangle.X;
-            int endX = targetRectangle.Right;
-
-            int minX = Math.Max(targetX, startX);
-            int maxX = Math.Min(targetRight, endX);
-            int minY = Math.Max(targetY, startY);
-            int maxY = Math.Min(targetBottom, endY);
-
-            if (this.Sampler is NearestNeighborResampler)
-            {
-                // Scaling factors
-                float widthFactor = sourceRectangle.Width / (float)targetRectangle.Width;
-                float heightFactor = sourceRectangle.Height / (float)targetRectangle.Height;
-
-                using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-                using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-                {
-                    Parallel.For(
-                        minY,
-                        maxY,
-                        this.ParallelOptions,
-                        y =>
-                        {
-                            // Y coordinates of source points
-                            int originY = (int)((y - startY) * heightFactor);
-
-                            for (int x = minX; x < maxX; x++)
-                            {
-                                // X coordinates of source points
-                                targetPixels[x, y] = sourcePixels[(int)((x - startX) * widthFactor), originY];
-                            }
-                        });
-                }
-
-                // Break out now.
-                return;
-            }
-
-            // Interpolate the image using the calculated weights.
-            // A 2-pass 1D algorithm appears to be faster than splitting a 1-pass 2D algorithm
-            // First process the columns. Since we are not using multiple threads startY and endY
-            // are the upper and lower bounds of the source rectangle.
-            Image<TColor, TPacked> firstPass = new Image<TColor, TPacked>(target.Width, source.Height);
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> firstPassPixels = firstPass.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                minX = Math.Max(0, startX);
-                maxX = Math.Min(width, endX);
-                minY = Math.Max(0, startY);
-                maxY = Math.Min(height, endY);
-
-                Parallel.For(
-                    0,
-                    sourceHeight,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = minX; x < maxX; x++)
-                        {
-                            // Ensure offsets are normalised for cropping and padding.
-                            Weight[] horizontalValues = this.HorizontalWeights[x - startX].Values;
-
-                            // Destination color components
-                            Vector4 destination = Vector4.Zero;
-
-                            for (int i = 0; i < horizontalValues.Length; i++)
-                            {
-                                Weight xw = horizontalValues[i];
-                                destination += sourcePixels[xw.Index, y].ToVector4() * xw.Value;
-                            }
-
-                            TColor d = default(TColor);
-                            d.PackFromVector4(destination);
-                            firstPassPixels[x, y] = d;
-                        }
-                    });
-
-                // Now process the rows.
-                Parallel.For(
-                    minY,
-                    maxY,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        // Ensure offsets are normalised for cropping and padding.
-                        Weight[] verticalValues = this.VerticalWeights[y - startY].Values;
-
-                        for (int x = 0; x < width; x++)
-                        {
-                            // Destination color components
-                            Vector4 destination = Vector4.Zero;
-
-                            for (int i = 0; i < verticalValues.Length; i++)
-                            {
-                                Weight yw = verticalValues[i];
-                                destination += firstPassPixels[x, yw.Index].ToVector4() * yw.Value;
-                            }
-
-                            TColor d = default(TColor);
-                            d.PackFromVector4(destination);
-                            targetPixels[x, y] = d;
-                        }
-                    });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/RotateProcessor.cs b/src/ImageSharp46/Samplers/Processors/RotateProcessor.cs
deleted file mode 100644
index 0fdc187bd..000000000
--- a/src/ImageSharp46/Samplers/Processors/RotateProcessor.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-// <copyright file="RotateProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods that allow the rotating of images.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class RotateProcessor<TColor, TPacked> : Matrix3x2Processor<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The tranform matrix to apply.
-        /// </summary>
-        private Matrix3x2 processMatrix;
-
-        /// <summary>
-        /// Gets or sets the angle of processMatrix in degrees.
-        /// </summary>
-        public float Angle { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to expand the canvas to fit the rotated image.
-        /// </summary>
-        public bool Expand { get; set; } = true;
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            const float Epsilon = .0001F;
-
-            if (Math.Abs(this.Angle) < Epsilon || Math.Abs(this.Angle - 90) < Epsilon || Math.Abs(this.Angle - 180) < Epsilon || Math.Abs(this.Angle - 270) < Epsilon)
-            {
-                return;
-            }
-
-            this.processMatrix = Point.CreateRotation(new Point(0, 0), -this.Angle);
-            if (this.Expand)
-            {
-                CreateNewTarget(target, sourceRectangle, this.processMatrix);
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            if (this.OptimizedApply(target, source))
-            {
-                return;
-            }
-
-            int height = target.Height;
-            int width = target.Width;
-            Matrix3x2 matrix = GetCenteredMatrix(target, source, this.processMatrix);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = 0; x < width; x++)
-                        {
-                            Point transformedPoint = Point.Rotate(new Point(x, y), matrix);
-                            if (source.Bounds.Contains(transformedPoint.X, transformedPoint.Y))
-                            {
-                                targetPixels[x, y] = sourcePixels[transformedPoint.X, transformedPoint.Y];
-                            }
-                        }
-                    });
-            }
-        }
-
-        /// <summary>
-        /// Rotates the images with an optimized method when the angle is 90, 180 or 270 degrees.
-        /// </summary>
-        /// <param name="target">The target image.</param>
-        /// <param name="source">The source image.</param>
-        /// <returns></returns>
-        private bool OptimizedApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source)
-        {
-            const float Epsilon = .0001F;
-            if (Math.Abs(this.Angle) < Epsilon)
-            {
-                target.ClonePixels(target.Width, target.Height, source.Pixels);
-                return true;
-            }
-
-            if (Math.Abs(this.Angle - 90) < Epsilon)
-            {
-                this.Rotate90(target, source);
-                return true;
-            }
-
-            if (Math.Abs(this.Angle - 180) < Epsilon)
-            {
-                this.Rotate180(target, source);
-                return true;
-            }
-
-            if (Math.Abs(this.Angle - 270) < Epsilon)
-            {
-                this.Rotate270(target, source);
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Rotates the image 270 degrees clockwise at the centre point.
-        /// </summary>
-        /// <param name="target">The target image.</param>
-        /// <param name="source">The source image.</param>
-        private void Rotate270(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source)
-        {
-            int width = source.Width;
-            int height = source.Height;
-            Image<TColor, TPacked> temp = new Image<TColor, TPacked>(height, width);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> tempPixels = temp.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = 0; x < width; x++)
-                        {
-                            int newX = height - y - 1;
-                            newX = height - newX - 1;
-                            int newY = width - x - 1;
-                            tempPixels[newX, newY] = sourcePixels[x, y];
-                        }
-                    });
-            }
-
-            target.SetPixels(height, width, temp.Pixels);
-        }
-
-        /// <summary>
-        /// Rotates the image 180 degrees clockwise at the centre point.
-        /// </summary>
-        /// <param name="target">The target image.</param>
-        /// <param name="source">The source image.</param>
-        private void Rotate180(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source)
-        {
-            int width = source.Width;
-            int height = source.Height;
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = 0; x < width; x++)
-                        {
-                            int newX = width - x - 1;
-                            int newY = height - y - 1;
-                            targetPixels[newX, newY] = sourcePixels[x, y];
-                        }
-                    });
-            }
-        }
-
-        /// <summary>
-        /// Rotates the image 90 degrees clockwise at the centre point.
-        /// </summary>
-        /// <param name="target">The target image.</param>
-        /// <param name="source">The source image.</param>
-        private void Rotate90(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source)
-        {
-            int width = source.Width;
-            int height = source.Height;
-            Image<TColor, TPacked> temp = new Image<TColor, TPacked>(height, width);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> tempPixels = temp.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                    {
-                        for (int x = 0; x < width; x++)
-                        {
-                            int newX = height - y - 1;
-                            tempPixels[newX, x] = sourcePixels[x, y];
-                        }
-                    });
-            }
-
-            target.SetPixels(height, width, temp.Pixels);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Processors/SkewProcessor.cs b/src/ImageSharp46/Samplers/Processors/SkewProcessor.cs
deleted file mode 100644
index b21301a87..000000000
--- a/src/ImageSharp46/Samplers/Processors/SkewProcessor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// <copyright file="SkewProcessor.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    using System;
-    using System.Numerics;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Provides methods that allow the skewing of images.
-    /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-    public class SkewProcessor<TColor, TPacked> : Matrix3x2Processor<TColor, TPacked>
-        where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-    {
-        /// <summary>
-        /// The tranform matrix to apply.
-        /// </summary>
-        private Matrix3x2 processMatrix;
-
-        /// <summary>
-        /// Gets or sets the angle of rotation along the x-axis in degrees.
-        /// </summary>
-        public float AngleX { get; set; }
-
-        /// <summary>
-        /// Gets or sets the angle of rotation along the y-axis in degrees.
-        /// </summary>
-        public float AngleY { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to expand the canvas to fit the skewed image.
-        /// </summary>
-        public bool Expand { get; set; } = true;
-
-        /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle)
-        {
-            this.processMatrix = Point.CreateSkew(new Point(0, 0), -this.AngleX, -this.AngleY);
-            if (this.Expand)
-            {
-                CreateNewTarget(target, sourceRectangle, this.processMatrix);
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Apply(ImageBase<TColor, TPacked> target, ImageBase<TColor, TPacked> source, Rectangle targetRectangle, Rectangle sourceRectangle, int startY, int endY)
-        {
-            int height = target.Height;
-            int width = target.Width;
-            Matrix3x2 matrix = GetCenteredMatrix(target, source, this.processMatrix);
-
-            using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
-            using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
-            {
-                Parallel.For(
-                    0,
-                    height,
-                    this.ParallelOptions,
-                    y =>
-                        {
-                            for (int x = 0; x < width; x++)
-                            {
-                                Point transformedPoint = Point.Skew(new Point(x, y), matrix);
-                                if (source.Bounds.Contains(transformedPoint.X, transformedPoint.Y))
-                                {
-                                    targetPixels[x, y] = sourcePixels[transformedPoint.X, transformedPoint.Y];
-                                }
-                            }
-                        });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp46/Samplers/Resamplers/BicubicResampler.cs b/src/ImageSharp46/Samplers/Resamplers/BicubicResampler.cs
deleted file mode 100644
index a0bfc1413..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/BicubicResampler.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// <copyright file="BicubicResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the bicubic kernel algorithm W(x) as described on
-    /// <see href="https://en.wikipedia.org/wiki/Bicubic_interpolation#Bicubic_convolution_algorithm">Wikipedia</see>
-    /// A commonly used algorithm within imageprocessing that preserves sharpness better than triangle interpolation.
-    /// </summary>
-    public class BicubicResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            float result = 0;
-
-            // Given the coefficient "a" as -0.5F.
-            if (x <= 1F)
-            {
-                // Below simplified result = ((a + 2F) * (x * x * x)) - ((a + 3F) * (x * x)) + 1;
-                result = (((1.5F * x) - 2.5F) * x * x) + 1;
-            }
-            else if (x < 2F)
-            {
-                // Below simplified result = (a * (x * x * x)) - ((5F * a) * (x * x)) + ((8F * a) * x) - (4F * a);
-                result = (((((-0.5F * x) + 2.5F) * x) - 4) * x) + 2;
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/BoxResampler.cs b/src/ImageSharp46/Samplers/Resamplers/BoxResampler.cs
deleted file mode 100644
index adb238a19..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/BoxResampler.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// <copyright file="BoxResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the box algorithm. Similar to nearest neighbour when upscaling.
-    /// When downscaling the pixels will average, merging together.
-    /// </summary>
-    public class BoxResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 0.5F;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x > -0.5F && x <= 0.5F)
-            {
-                return 1;
-            }
-
-            return 0;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/CatmullRomResampler.cs b/src/ImageSharp46/Samplers/Resamplers/CatmullRomResampler.cs
deleted file mode 100644
index 7751aa08b..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/CatmullRomResampler.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// <copyright file="CatmullRomResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The Catmull-Rom filter is a well known standard Cubic Filter often used as a interpolation function.
-    /// This filter produces a reasonably sharp edge, but without a the pronounced gradient change on large
-    /// scale image enlargements that a 'Lagrange' filter can produce.
-    /// <see href="http://www.imagemagick.org/Usage/filter/#cubic_bc"/>
-    /// </summary>
-    public class CatmullRomResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 0;
-            const float C = 0.5F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/HermiteResampler.cs b/src/ImageSharp46/Samplers/Resamplers/HermiteResampler.cs
deleted file mode 100644
index 9af35e8e8..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/HermiteResampler.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <copyright file="HermiteResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Processors
-{
-    /// <summary>
-    /// The Hermite filter is type of smoothed triangular interpolation Filter,
-    /// This filter rounds off strong edges while preserving flat 'color levels' in the original image.
-    /// <see href="http://www.imagemagick.org/Usage/filter/#cubic_bc"/>
-    /// </summary>
-    public class HermiteResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 0F;
-            const float C = 0F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/IResampler.cs b/src/ImageSharp46/Samplers/Resamplers/IResampler.cs
deleted file mode 100644
index ce100a8c7..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/IResampler.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <copyright file="IResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Encapsulates an interpolation algorithm for resampling images.
-    /// </summary>
-    public interface IResampler
-    {
-        /// <summary>
-        /// Gets the radius in which to sample pixels.
-        /// </summary>
-        float Radius { get; }
-
-        /// <summary>
-        /// Gets the result of the interpolation algorithm.
-        /// </summary>
-        /// <param name="x">The value to process.</param>
-        /// <returns>
-        /// The <see cref="float"/>
-        /// </returns>
-        float GetValue(float x);
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/Lanczos2Resampler.cs b/src/ImageSharp46/Samplers/Resamplers/Lanczos2Resampler.cs
deleted file mode 100644
index 3d25cf859..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/Lanczos2Resampler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="Lanczos2Resampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Lanczos kernel algorithm as described on
-    /// <see href="https://en.wikipedia.org/wiki/Lanczos_resampling#Algorithm">Wikipedia</see>
-    /// with a radius of 2 pixels.
-    /// </summary>
-    public class Lanczos2Resampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 2F)
-            {
-                return ImageMaths.SinC(x) * ImageMaths.SinC(x / 2F);
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/Lanczos3Resampler.cs b/src/ImageSharp46/Samplers/Resamplers/Lanczos3Resampler.cs
deleted file mode 100644
index f771de1a5..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/Lanczos3Resampler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="Lanczos3Resampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Lanczos kernel algorithm as described on
-    /// <see href="https://en.wikipedia.org/wiki/Lanczos_resampling#Algorithm">Wikipedia</see>
-    /// with a radius of 3 pixels.
-    /// </summary>
-    public class Lanczos3Resampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 3;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 3F)
-            {
-                return ImageMaths.SinC(x) * ImageMaths.SinC(x / 3F);
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/Lanczos5Resampler.cs b/src/ImageSharp46/Samplers/Resamplers/Lanczos5Resampler.cs
deleted file mode 100644
index 4584b258f..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/Lanczos5Resampler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="Lanczos5Resampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Lanczos kernel algorithm as described on
-    /// <see href="https://en.wikipedia.org/wiki/Lanczos_resampling#Algorithm">Wikipedia</see>
-    /// with a radius of 5 pixels.
-    /// </summary>
-    public class Lanczos5Resampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 5;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 5F)
-            {
-                return ImageMaths.SinC(x) * ImageMaths.SinC(x / 5F);
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/Lanczos8Resampler.cs b/src/ImageSharp46/Samplers/Resamplers/Lanczos8Resampler.cs
deleted file mode 100644
index 03f5a6d7b..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/Lanczos8Resampler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="Lanczos8Resampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Lanczos kernel algorithm as described on
-    /// <see href="https://en.wikipedia.org/wiki/Lanczos_resampling#Algorithm">Wikipedia</see>
-    /// with a radius of 8 pixels.
-    /// </summary>
-    public class Lanczos8Resampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 8;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 8F)
-            {
-                return ImageMaths.SinC(x) * ImageMaths.SinC(x / 8F);
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/MitchellNetravaliResampler.cs b/src/ImageSharp46/Samplers/Resamplers/MitchellNetravaliResampler.cs
deleted file mode 100644
index f4bc3a6f2..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/MitchellNetravaliResampler.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <copyright file="MitchellNetravaliResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the mitchell algorithm as described on
-    /// <see href="https://de.wikipedia.org/wiki/Mitchell-Netravali-Filter">Wikipedia</see>
-    /// </summary>
-    public class MitchellNetravaliResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 0.3333333F;
-            const float C = 0.3333333F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/NearestNeighborResampler.cs b/src/ImageSharp46/Samplers/Resamplers/NearestNeighborResampler.cs
deleted file mode 100644
index ec2417f9c..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/NearestNeighborResampler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <copyright file="NearestNeighborResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the nearest neighbour algorithm. This uses an unscaled filter
-    /// which will select the closest pixel to the new pixels position.
-    /// </summary>
-    public class NearestNeighborResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 1;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            return x;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/RobidouxResampler.cs b/src/ImageSharp46/Samplers/Resamplers/RobidouxResampler.cs
deleted file mode 100644
index 6ef90bda4..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/RobidouxResampler.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <copyright file="RobidouxResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Robidoux algorithm.
-    /// <see href="http://www.imagemagick.org/Usage/filter/#robidoux"/>
-    /// </summary>
-    public class RobidouxResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 0.37821575509399867F;
-            const float C = 0.31089212245300067F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/RobidouxSharpResampler.cs b/src/ImageSharp46/Samplers/Resamplers/RobidouxSharpResampler.cs
deleted file mode 100644
index 8755bf3e4..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/RobidouxSharpResampler.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <copyright file="RobidouxSharpResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the Robidoux Sharp algorithm.
-    /// <see href="http://www.imagemagick.org/Usage/filter/#robidoux"/>
-    /// </summary>
-    public class RobidouxSharpResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 0.2620145123990142F;
-            const float C = 0.3689927438004929F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/SplineResampler.cs b/src/ImageSharp46/Samplers/Resamplers/SplineResampler.cs
deleted file mode 100644
index 921ea23a8..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/SplineResampler.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <copyright file="SplineResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the spline algorithm.
-    /// <see href="http://www.imagemagick.org/Usage/filter/#cubic_bc"/>
-    /// </summary>
-    public class SplineResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 2;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            const float B = 1F;
-            const float C = 0F;
-
-            return ImageMaths.GetBcValue(x, B, C);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/TriangleResampler.cs b/src/ImageSharp46/Samplers/Resamplers/TriangleResampler.cs
deleted file mode 100644
index c53d5a146..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/TriangleResampler.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// <copyright file="TriangleResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the triangle (bilinear) algorithm.
-    /// Bilinear interpolation can be used where perfect image transformation with pixel matching is impossible,
-    /// so that one can calculate and assign appropriate intensity values to pixels.
-    /// </summary>
-    public class TriangleResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 1;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 1F)
-            {
-                return 1F - x;
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resamplers/WelchResampler.cs b/src/ImageSharp46/Samplers/Resamplers/WelchResampler.cs
deleted file mode 100644
index eb5506151..000000000
--- a/src/ImageSharp46/Samplers/Resamplers/WelchResampler.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// <copyright file="WelchResampler.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// The function implements the welch algorithm.
-    /// <see href="http://www.imagemagick.org/Usage/filter/"/>
-    /// </summary>
-    public class WelchResampler : IResampler
-    {
-        /// <inheritdoc/>
-        public float Radius => 3;
-
-        /// <inheritdoc/>
-        public float GetValue(float x)
-        {
-            if (x < 0F)
-            {
-                x = -x;
-            }
-
-            if (x < 3F)
-            {
-                return ImageMaths.SinC(x) * (1F - (x * x / 9.0F));
-            }
-
-            return 0F;
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Resize.cs b/src/ImageSharp46/Samplers/Resize.cs
deleted file mode 100644
index ee3da5ec6..000000000
--- a/src/ImageSharp46/Samplers/Resize.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// <copyright file="Resize.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Resizes an image in accordance with the given <see cref="ResizeOptions"/>.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="options">The resize options.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width within the resize options will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, ResizeOptions options)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            // Ensure size is populated across both dimensions.
-            if (options.Size.Width == 0 && options.Size.Height > 0)
-            {
-                options.Size = new Size(source.Width * options.Size.Height / source.Height, options.Size.Height);
-            }
-
-            if (options.Size.Height == 0 && options.Size.Width > 0)
-            {
-                options.Size = new Size(options.Size.Width, source.Height * options.Size.Width / source.Width);
-            }
-
-            Rectangle targetRectangle = ResizeHelper.CalculateTargetLocationAndBounds(source, options);
-
-            return Resize(source, options.Size.Width, options.Size.Height, options.Sampler, source.Bounds, targetRectangle, options.Compand);
-        }
-
-        /// <summary>
-        /// Resizes an image to the given width and height.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Resize(source, width, height, new BicubicResampler(), false);
-        }
-
-        /// <summary>
-        /// Resizes an image to the given width and height.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, bool compand)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Resize(source, width, height, new BicubicResampler(), compand);
-        }
-
-        /// <summary>
-        /// Resizes an image to the given width and height with the given sampler.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sampler">The <see cref="IResampler"/> to perform the resampling.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, IResampler sampler)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Resize(source, width, height, sampler, false);
-        }
-
-        /// <summary>
-        /// Resizes an image to the given width and height with the given sampler.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sampler">The <see cref="IResampler"/> to perform the resampling.</param>
-        /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, IResampler sampler, bool compand)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Resize(source, width, height, sampler, source.Bounds, new Rectangle(0, 0, width, height), compand);
-        }
-
-        /// <summary>
-        /// Resizes an image to the given width and height with the given sampler and
-        /// source rectangle.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to resize.</param>
-        /// <param name="width">The target image width.</param>
-        /// <param name="height">The target image height.</param>
-        /// <param name="sampler">The <see cref="IResampler"/> to perform the resampling.</param>
-        /// <param name="sourceRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
-        /// </param>
-        /// <param name="targetRectangle">
-        /// The <see cref="Rectangle"/> structure that specifies the portion of the target image object to draw to.
-        /// </param>
-        /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor, TPacked}"/></returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor, TPacked> Resize<TColor, TPacked>(this Image<TColor, TPacked> source, int width, int height, IResampler sampler, Rectangle sourceRectangle, Rectangle targetRectangle, bool compand = false)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            if (width == 0 && height > 0)
-            {
-                width = source.Width * height / source.Height;
-                targetRectangle.Width = width;
-            }
-
-            if (height == 0 && width > 0)
-            {
-                height = source.Height * width / source.Width;
-                targetRectangle.Height = height;
-            }
-
-            Guard.MustBeGreaterThan(width, 0, nameof(width));
-            Guard.MustBeGreaterThan(height, 0, nameof(height));
-
-            ResamplingWeightedProcessor<TColor, TPacked> processor;
-
-            if (compand)
-            {
-                processor = new CompandingResizeProcessor<TColor, TPacked>(sampler);
-            }
-            else
-            {
-                processor = new ResizeProcessor<TColor, TPacked>(sampler);
-            }
-
-            return source.Process(width, height, sourceRectangle, targetRectangle, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Rotate.cs b/src/ImageSharp46/Samplers/Rotate.cs
deleted file mode 100644
index f8f0a59e8..000000000
--- a/src/ImageSharp46/Samplers/Rotate.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// <copyright file="Rotate.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Rotates an image by the given angle in degrees, expanding the image to fit the rotated result.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to rotate.</param>
-        /// <param name="degrees">The angle in degrees to perform the rotation.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Rotate<TColor, TPacked>(this Image<TColor, TPacked> source, float degrees)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Rotate(source, degrees, true);
-        }
-
-        /// <summary>
-        /// Rotates and flips an image by the given instructions.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to rotate.</param>
-        /// <param name="rotateType">The <see cref="RotateType"/> to perform the rotation.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Rotate<TColor, TPacked>(this Image<TColor, TPacked> source, RotateType rotateType)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Rotate(source, (float)rotateType, false);
-        }
-
-        /// <summary>
-        /// Rotates an image by the given angle in degrees.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to rotate.</param>
-        /// <param name="degrees">The angle in degrees to perform the rotation.</param>
-        /// <param name="expand">Whether to expand the image to fit the rotated result.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Rotate<TColor, TPacked>(this Image<TColor, TPacked> source, float degrees, bool expand)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            RotateProcessor<TColor, TPacked> processor = new RotateProcessor<TColor, TPacked> { Angle = degrees, Expand = expand };
-            return source.Process(source.Width, source.Height, source.Bounds, source.Bounds, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/RotateFlip.cs b/src/ImageSharp46/Samplers/RotateFlip.cs
deleted file mode 100644
index 5adef987c..000000000
--- a/src/ImageSharp46/Samplers/RotateFlip.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <copyright file="RotateFlip.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Rotates and flips an image by the given instructions.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to rotate, flip, or both.</param>
-        /// <param name="rotateType">The <see cref="RotateType"/> to perform the rotation.</param>
-        /// <param name="flipType">The <see cref="FlipType"/> to perform the flip.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> RotateFlip<TColor, TPacked>(this Image<TColor, TPacked> source, RotateType rotateType, FlipType flipType)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return source.Rotate(rotateType).Flip(flipType);
-        }
-    }
-}
diff --git a/src/ImageSharp46/Samplers/Skew.cs b/src/ImageSharp46/Samplers/Skew.cs
deleted file mode 100644
index 4aa756842..000000000
--- a/src/ImageSharp46/Samplers/Skew.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <copyright file="Skew.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using Processors;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor, TPacked}"/> type.
-    /// </summary>
-    public static partial class ImageExtensions
-    {
-        /// <summary>
-        /// Skews an image by the given angles in degrees, expanding the image to fit the skewed result.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to skew.</param>
-        /// <param name="degreesX">The angle in degrees to perform the rotation along the x-axis.</param>
-        /// <param name="degreesY">The angle in degrees to perform the rotation along the y-axis.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Skew<TColor, TPacked>(this Image<TColor, TPacked> source, float degreesX, float degreesY)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            return Skew(source, degreesX, degreesY, true);
-        }
-
-        /// <summary>
-        /// Skews an image by the given angles in degrees.
-        /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <typeparam name="TPacked">The packed format. <example>uint, long, float.</example></typeparam>
-        /// <param name="source">The image to skew.</param>
-        /// <param name="degreesX">The angle in degrees to perform the rotation along the x-axis.</param>
-        /// <param name="degreesY">The angle in degrees to perform the rotation along the y-axis.</param>
-        /// <param name="expand">Whether to expand the image to fit the skewed result.</param>
-        /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor, TPacked> Skew<TColor, TPacked>(this Image<TColor, TPacked> source, float degreesX, float degreesY, bool expand)
-            where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            SkewProcessor<TColor, TPacked> processor = new SkewProcessor<TColor, TPacked> { AngleX = degreesX, AngleY = degreesY, Expand = expand };
-            return source.Process(source.Width, source.Height, source.Bounds, source.Bounds, processor);
-        }
-    }
-}
diff --git a/src/ImageSharp46/app.config b/src/ImageSharp46/app.config
deleted file mode 100644
index 5e95024db..000000000
--- a/src/ImageSharp46/app.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/ImageSharp46/packages.config b/src/ImageSharp46/packages.config
deleted file mode 100644
index 6ace6583b..000000000
--- a/src/ImageSharp46/packages.config
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.AppContext" version="4.1.0" targetFramework="net461" />
-  <package id="System.Buffers" version="4.0.0" targetFramework="net461" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net461" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
-  <package id="System.Console" version="4.0.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net461" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
-  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO" version="4.1.0" targetFramework="net461" />
-  <package id="System.IO.Compression" version="4.1.0" targetFramework="net461" />
-  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net461" />
-  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net461" />
-  <package id="System.Net.Sockets" version="4.1.0" targetFramework="net461" />
-  <package id="System.Numerics.Vectors" version="4.1.1" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net461" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.0.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net461" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net461" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net461" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Benchmark/DecodeJpegBenchmark.cs b/tests/ImageSharp.Tests46/Benchmark/DecodeJpegBenchmark.cs
deleted file mode 100644
index 6de820f8b..000000000
--- a/tests/ImageSharp.Tests46/Benchmark/DecodeJpegBenchmark.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.CompilerServices;
-using ImageSharp.Tests;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace ImageSharp.Tests46.Benchmark
-{
-    using System.Drawing;
-    using System.IO;
-
-    using CoreImage = ImageSharp.Image;
-    using CoreSize = ImageSharp.Size;
-
-    public class DecodeJpegBenchmark
-    {
-        private static byte[] jpegBytes = File.ReadAllBytes(TestImages.Jpeg.Calliphora);
-
-        private ITestOutputHelper _output;
-
-        public DecodeJpegBenchmark(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        private void DoBenchmark(int times, Action<Stream> action, [CallerMemberName]string method = null)
-        {
-            _output.WriteLine($"{method} x {times} ... ");
-            Stopwatch sw = Stopwatch.StartNew();
-            for (int i = 0; i < times; i++)
-            {
-                using (MemoryStream memoryStream = new MemoryStream(jpegBytes))
-                {
-                    action(memoryStream);
-                }
-            }
-            sw.Stop();
-            var millis = sw.ElapsedMilliseconds;
-
-            _output.WriteLine($"{method} finished in {millis}ms");
-        }
-
-        [Theory]
-        [InlineData(10)]
-        [InlineData(100)]
-        public void JpegSystemDrawing(int times)
-        {
-            DoBenchmark(times, memoryStream =>
-            {
-                Image image = Image.FromStream(memoryStream);
-                image.Dispose();
-            });
-        }
-
-        [Theory]
-        [InlineData(10)]
-        [InlineData(100)]
-        public void JpegCore(int times)
-        {
-            DoBenchmark(times, memoryStream =>
-            {
-                CoreImage image = new CoreImage(memoryStream);
-            });
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Colors/ColorConversionTests.cs b/tests/ImageSharp.Tests46/Colors/ColorConversionTests.cs
deleted file mode 100644
index f1b6d5f9b..000000000
--- a/tests/ImageSharp.Tests46/Colors/ColorConversionTests.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-// <copyright file="ColorConversionTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-
-    using Xunit;
-
-    /// <summary>
-    /// Test conversion between the various color structs.
-    ///  </summary>
-    /// <remarks>
-    /// Output values have been compared with <see cref="http://colormine.org/color-converter"/>
-    /// and <see cref="http://www.colorhexa.com/"/> for accuracy.
-    /// </remarks>
-    public class ColorConversionTests
-    {
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="YCbCr"/>.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
-            Justification = "Reviewed. Suppression is OK here.")]
-        public void ColorToYCbCr()
-        {
-            // White
-            Color color = Color.White;
-            YCbCr yCbCr = color;
-
-            Assert.Equal(255, yCbCr.Y);
-            Assert.Equal(128, yCbCr.Cb);
-            Assert.Equal(128, yCbCr.Cr);
-
-            // Black
-            Color color2 = Color.Black;
-            YCbCr yCbCr2 = color2;
-            Assert.Equal(0, yCbCr2.Y);
-            Assert.Equal(128, yCbCr2.Cb);
-            Assert.Equal(128, yCbCr2.Cr);
-
-            // Gray
-            Color color3 = Color.Gray;
-            YCbCr yCbCr3 = color3;
-            Assert.Equal(128, yCbCr3.Y);
-            Assert.Equal(128, yCbCr3.Cb);
-            Assert.Equal(128, yCbCr3.Cr);
-
-            //Assert.Equal(255, yCbCr.Y, 0);
-            //Assert.Equal(128, yCbCr.Cb, 0);
-            //Assert.Equal(128, yCbCr.Cr, 0);
-
-            //// Black
-            //Color color2 = Color.Black;
-            //YCbCr yCbCr2 = color2;
-            //Assert.Equal(0, yCbCr2.Y, 0);
-            //Assert.Equal(128, yCbCr2.Cb, 0);
-            //Assert.Equal(128, yCbCr2.Cr, 0);
-
-            //// Gray
-            //Color color3 = Color.Gray;
-            //YCbCr yCbCr3 = color3;
-            //Assert.Equal(128, yCbCr3.Y, 0);
-            //Assert.Equal(128, yCbCr3.Cb, 0);
-            //Assert.Equal(128, yCbCr3.Cr, 0);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="YCbCr"/> to <see cref="Color"/>.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
-            Justification = "Reviewed. Suppression is OK here.")]
-        public void YCbCrToColor()
-        {
-            // White
-            YCbCr yCbCr = new YCbCr(255, 128, 128);
-            Color color = yCbCr;
-
-            Assert.Equal(255, color.R);
-            Assert.Equal(255, color.G);
-            Assert.Equal(255, color.B);
-            Assert.Equal(255, color.A);
-
-            // Black
-            YCbCr yCbCr2 = new YCbCr(0, 128, 128);
-            Color color2 = yCbCr2;
-
-            Assert.Equal(0, color2.R);
-            Assert.Equal(0, color2.G);
-            Assert.Equal(0, color2.B);
-            Assert.Equal(255, color2.A);
-
-            // Gray
-            YCbCr yCbCr3 = new YCbCr(128, 128, 128);
-            Color color3 = yCbCr3;
-
-            Assert.Equal(128, color3.R);
-            Assert.Equal(128, color3.G);
-            Assert.Equal(128, color3.B);
-            Assert.Equal(255, color3.A);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieXyz"/>.
-        /// Comparison values obtained from 
-        /// http://colormine.org/convert/rgb-to-xyz
-        /// </summary>
-        [Fact]
-        public void ColorToCieXyz()
-        {
-            // White
-            Color color = Color.White;
-            CieXyz ciexyz = color;
-
-            Assert.Equal(95.05f, ciexyz.X, 3);
-            Assert.Equal(100.0f, ciexyz.Y, 3);
-            Assert.Equal(108.900f, ciexyz.Z, 3);
-
-            // Black
-            Color color2 = Color.Black;
-            CieXyz ciexyz2 = color2;
-            Assert.Equal(0, ciexyz2.X, 3);
-            Assert.Equal(0, ciexyz2.Y, 3);
-            Assert.Equal(0, ciexyz2.Z, 3);
-
-            // Gray
-            Color color3 = Color.Gray;
-            CieXyz ciexyz3 = color3;
-            Assert.Equal(20.518, ciexyz3.X, 3);
-            Assert.Equal(21.586, ciexyz3.Y, 3);
-            Assert.Equal(23.507, ciexyz3.Z, 3);
-
-            // Cyan
-            Color color4 = Color.Cyan;
-            CieXyz ciexyz4 = color4;
-            Assert.Equal(53.810f, ciexyz4.X, 3);
-            Assert.Equal(78.740f, ciexyz4.Y, 3);
-            Assert.Equal(106.970f, ciexyz4.Z, 3);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="CieXyz"/> to <see cref="Color"/>.
-        /// Comparison values obtained from 
-        /// http://colormine.org/convert/rgb-to-xyz
-        /// </summary>
-        [Fact]
-        public void CieXyzToColor()
-        {
-            // Dark moderate pink.
-            CieXyz ciexyz = new CieXyz(13.337f, 9.297f, 14.727f);
-            Color color = ciexyz;
-
-            Assert.Equal(128, color.R);
-            Assert.Equal(64, color.G);
-            Assert.Equal(106, color.B);
-
-            // Ochre
-            CieXyz ciexyz2 = new CieXyz(31.787f, 26.147f, 4.885f);
-            Color color2 = ciexyz2;
-
-            Assert.Equal(204, color2.R);
-            Assert.Equal(119, color2.G);
-            Assert.Equal(34, color2.B);
-
-            // Black
-            CieXyz ciexyz3 = new CieXyz(0, 0, 0);
-            Color color3 = ciexyz3;
-
-            Assert.Equal(0, color3.R);
-            Assert.Equal(0, color3.G);
-            Assert.Equal(0, color3.B);
-
-            //// Check others.
-            //Random random = new Random(0);
-            //for (int i = 0; i < 1000; i++)
-            //{
-            //    Color color4 = new Color((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble());
-            //    CieXyz ciexyz4 = color4;
-            //    Assert.Equal(color4, (Color)ciexyz4);
-            //}
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Hsv"/>.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
-            Justification = "Reviewed. Suppression is OK here.")]
-        public void ColorToHsv()
-        {
-            // Black
-            Color b = Color.Black;
-            Hsv h = b;
-
-            Assert.Equal(0, h.H, 1);
-            Assert.Equal(0, h.S, 1);
-            Assert.Equal(0, h.V, 1);
-
-            // White
-            Color color = Color.White;
-            Hsv hsv = color;
-
-            Assert.Equal(0f, hsv.H, 1);
-            Assert.Equal(0f, hsv.S, 1);
-            Assert.Equal(1f, hsv.V, 1);
-
-            // Dark moderate pink.
-            Color color2 = new Color(128, 64, 106);
-            Hsv hsv2 = color2;
-
-            Assert.Equal(320.6f, hsv2.H, 1);
-            Assert.Equal(0.5f, hsv2.S, 1);
-            Assert.Equal(0.502f, hsv2.V, 2);
-
-            // Ochre.
-            Color color3 = new Color(204, 119, 34);
-            Hsv hsv3 = color3;
-
-            Assert.Equal(30f, hsv3.H, 1);
-            Assert.Equal(0.833f, hsv3.S, 3);
-            Assert.Equal(0.8f, hsv3.V, 1);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Hsv"/> to <see cref="Color"/>.
-        /// </summary>
-        [Fact]
-        public void HsvToColor()
-        {
-            // Dark moderate pink.
-            Hsv hsv = new Hsv(320.6f, 0.5f, 0.502f);
-            Color color = hsv;
-
-            Assert.Equal(color.R, 128);
-            Assert.Equal(color.G, 64);
-            Assert.Equal(color.B, 106);
-
-            // Ochre
-            Hsv hsv2 = new Hsv(30, 0.833f, 0.8f);
-            Color color2 = hsv2;
-
-            Assert.Equal(color2.R, 204);
-            Assert.Equal(color2.G, 119);
-            Assert.Equal(color2.B, 34);
-
-            // White
-            Hsv hsv3 = new Hsv(0, 0, 1);
-            Color color3 = hsv3;
-
-            Assert.Equal(color3.B, 255);
-            Assert.Equal(color3.G, 255);
-            Assert.Equal(color3.R, 255);
-
-            // Check others.
-            //Random random = new Random(0);
-            //for (int i = 0; i < 1000; i++)
-            //{
-            //    Color color4 = new Color((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble());
-            //    Hsv hsv4 = color4;
-            //    Assert.Equal(color4, (Color)hsv4);
-            //}
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Hsl"/>.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
-            Justification = "Reviewed. Suppression is OK here.")]
-        public void ColorToHsl()
-        {
-            // Black
-            Color b = Color.Black;
-            Hsl h = b;
-
-            Assert.Equal(0, h.H, 1);
-            Assert.Equal(0, h.S, 1);
-            Assert.Equal(0, h.L, 1);
-
-            // White
-            Color color = Color.White;
-            Hsl hsl = color;
-
-            Assert.Equal(0f, hsl.H, 1);
-            Assert.Equal(0f, hsl.S, 1);
-            Assert.Equal(1f, hsl.L, 1);
-
-            // Dark moderate pink.
-            Color color2 = new Color(128, 64, 106);
-            Hsl hsl2 = color2;
-
-            Assert.Equal(320.6f, hsl2.H, 1);
-            Assert.Equal(0.33f, hsl2.S, 1);
-            Assert.Equal(0.376f, hsl2.L, 2);
-
-            // Ochre.
-            Color color3 = new Color(204, 119, 34);
-            Hsl hsl3 = color3;
-
-            Assert.Equal(30f, hsl3.H, 1);
-            Assert.Equal(0.714f, hsl3.S, 3);
-            Assert.Equal(0.467f, hsl3.L, 3);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Hsl"/> to <see cref="Color"/>.
-        /// </summary>
-        [Fact]
-        public void HslToColor()
-        {
-            // Dark moderate pink.
-            Hsl hsl = new Hsl(320.6f, 0.33f, 0.376f);
-            Color color = hsl;
-
-            Assert.Equal(color.R, 128);
-            Assert.Equal(color.G, 64);
-            Assert.Equal(color.B, 106);
-
-            // Ochre
-            Hsl hsl2 = new Hsl(30, 0.714f, 0.467f);
-            Color color2 = hsl2;
-
-            Assert.Equal(color2.R, 204);
-            Assert.Equal(color2.G, 119);
-            Assert.Equal(color2.B, 34);
-
-            // White
-            Hsl hsl3 = new Hsl(0, 0, 1);
-            Color color3 = hsl3;
-
-            Assert.Equal(color3.R, 255);
-            Assert.Equal(color3.G, 255);
-            Assert.Equal(color3.B, 255);
-
-            // Check others.
-            //Random random = new Random(0);
-            //for (int i = 0; i < 1000; i++)
-            //{
-            //    Color color4 = new Color((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble());
-            //    Hsl hsl4 = color4;
-            //    Assert.Equal(color4, (Color)hsl4);
-            //}
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Cmyk"/>.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
-            Justification = "Reviewed. Suppression is OK here.")]
-        public void ColorToCmyk()
-        {
-            // White
-            Color color = Color.White;
-            Cmyk cmyk = color;
-
-            Assert.Equal(0, cmyk.C, 1);
-            Assert.Equal(0, cmyk.M, 1);
-            Assert.Equal(0, cmyk.Y, 1);
-            Assert.Equal(0, cmyk.K, 1);
-
-            // Black
-            Color color2 = Color.Black;
-            Cmyk cmyk2 = color2;
-            Assert.Equal(0, cmyk2.C, 1);
-            Assert.Equal(0, cmyk2.M, 1);
-            Assert.Equal(0, cmyk2.Y, 1);
-            Assert.Equal(1, cmyk2.K, 1);
-
-            // Gray
-            Color color3 = Color.Gray;
-            Cmyk cmyk3 = color3;
-            Assert.Equal(0f, cmyk3.C, 1);
-            Assert.Equal(0f, cmyk3.M, 1);
-            Assert.Equal(0f, cmyk3.Y, 1);
-            Assert.Equal(0.498, cmyk3.K, 2); // Checked with other online converters.
-
-            // Cyan
-            Color color4 = Color.Cyan;
-            Cmyk cmyk4 = color4;
-            Assert.Equal(1, cmyk4.C, 1);
-            Assert.Equal(0f, cmyk4.M, 1);
-            Assert.Equal(0f, cmyk4.Y, 1);
-            Assert.Equal(0f, cmyk4.K, 1);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Cmyk"/> to <see cref="Color"/>.
-        /// </summary>
-        [Fact]
-        public void CmykToColor()
-        {
-            // Dark moderate pink.
-            Cmyk cmyk = new Cmyk(0f, .5f, .171f, .498f);
-            Color color = cmyk;
-
-            Assert.Equal(color.R, 128);
-            Assert.Equal(color.G, 64);
-            Assert.Equal(color.B, 106);
-
-            // Ochre
-            Cmyk cmyk2 = new Cmyk(0, .416f, .833f, .199f);
-            Color color2 = cmyk2;
-
-            Assert.Equal(color2.R, 204);
-            Assert.Equal(color2.G, 119);
-            Assert.Equal(color2.B, 34);
-
-            // White
-            Cmyk cmyk3 = new Cmyk(0, 0, 0, 0);
-            Color color3 = cmyk3;
-
-            Assert.Equal(color3.R, 255);
-            Assert.Equal(color3.G, 255);
-            Assert.Equal(color3.B, 255);
-
-            // Check others.
-            //Random random = new Random(0);
-            //for (int i = 0; i < 1000; i++)
-            //{
-            //    Color color4 = new Color((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble());
-            //    Cmyk cmyk4 = color4;
-            //    Assert.Equal(color4, (Color)cmyk4);
-            //}
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieLab"/>.
-        /// Comparison values obtained from 
-        /// http://colormine.org/convert/rgb-to-lab
-        /// </summary>
-        [Fact]
-        public void ColorToCieLab()
-        {
-            // White
-            Color color = Color.White;
-            CieLab cielab = color;
-
-            Assert.Equal(100, cielab.L, 3);
-            Assert.Equal(0.005, cielab.A, 3);
-            Assert.Equal(-0.010, cielab.B, 3);
-
-            // Black
-            Color color2 = Color.Black;
-            CieLab cielab2 = color2;
-            Assert.Equal(0, cielab2.L, 3);
-            Assert.Equal(0, cielab2.A, 3);
-            Assert.Equal(0, cielab2.B, 3);
-
-            // Gray
-            Color color3 = Color.Gray;
-            CieLab cielab3 = color3;
-            Assert.Equal(53.585, cielab3.L, 3);
-            Assert.Equal(0.003, cielab3.A, 3);
-            Assert.Equal(-0.006, cielab3.B, 3);
-
-            // Cyan
-            Color color4 = Color.Cyan;
-            CieLab cielab4 = color4;
-            Assert.Equal(91.117, cielab4.L, 3);
-            Assert.Equal(-48.080, cielab4.A, 3);
-            Assert.Equal(-14.138, cielab4.B, 3);
-        }
-
-        /// <summary>
-        /// Tests the implicit conversion from <see cref="CieLab"/> to <see cref="Color"/>.
-        /// </summary>
-        /// Comparison values obtained from 
-        /// http://colormine.org/convert/rgb-to-lab
-        [Fact]
-        public void CieLabToColor()
-        {
-            // Dark moderate pink.
-            CieLab cielab = new CieLab(36.5492f, 33.3173f, -12.0615f);
-            Color color = cielab;
-
-            Assert.Equal(color.R, 128);
-            Assert.Equal(color.G, 64);
-            Assert.Equal(color.B, 106);
-
-            // Ochre
-            CieLab cielab2 = new CieLab(58.1758f, 27.3399f, 56.8240f);
-            Color color2 = cielab2;
-
-            Assert.Equal(color2.R, 204);
-            Assert.Equal(color2.G, 119);
-            Assert.Equal(color2.B, 34);
-
-            // Black
-            CieLab cielab3 = new CieLab(0, 0, 0);
-            Color color3 = cielab3;
-
-            Assert.Equal(color3.R, 0);
-            Assert.Equal(color3.G, 0);
-            Assert.Equal(color3.B, 0);
-
-            // Check others.
-            //Random random = new Random(0);
-            //for (int i = 0; i < 1000; i++)
-            //{
-            //    Color color4 = new Color((float)random.NextDouble(), (float)random.NextDouble(), (float)random.NextDouble());
-            //    CieLab cielab4 = color4;
-            //    Assert.Equal(color4, (Color)cielab4);
-            //}
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Colors/ColorTests.cs b/tests/ImageSharp.Tests46/Colors/ColorTests.cs
deleted file mode 100644
index 23ebbec98..000000000
--- a/tests/ImageSharp.Tests46/Colors/ColorTests.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// <copyright file="ColorTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Numerics;
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Color"/> struct.
-    /// </summary>
-    public class ColorTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            Color color1 = new Color(0, 0, 0);
-            Color color2 = new Color(0, 0, 0, 1F);
-            Color color3 = new Color("#000");
-            Color color4 = new Color("#000F");
-            Color color5 = new Color("#000000");
-            Color color6 = new Color("#000000FF");
-
-            Assert.Equal(color1, color2);
-            Assert.Equal(color1, color3);
-            Assert.Equal(color1, color4);
-            Assert.Equal(color1, color5);
-            Assert.Equal(color1, color6);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            Color color1 = new Color(255, 0, 0, 255);
-            Color color2 = new Color(0, 0, 0, 255);
-            Color color3 = new Color("#000");
-            Color color4 = new Color("#000000");
-            Color color5 = new Color("#FF000000");
-
-            Assert.NotEqual(color1, color2);
-            Assert.NotEqual(color1, color3);
-            Assert.NotEqual(color1, color4);
-            Assert.NotEqual(color1, color5);
-        }
-
-        /// <summary>
-        /// Tests whether the color constructor correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            Color color1 = new Color(1, .1f, .133f, .864f);
-            Assert.Equal(255, color1.R);
-            Assert.Equal((byte)Math.Round(.1f * 255), color1.G);
-            Assert.Equal((byte)Math.Round(.133f * 255), color1.B);
-            Assert.Equal((byte)Math.Round(.864f * 255), color1.A);
-
-            Color color2 = new Color(1, .1f, .133f);
-            Assert.Equal(255, color2.R);
-            Assert.Equal(Math.Round(.1f * 255), color2.G);
-            Assert.Equal(Math.Round(.133f * 255), color2.B);
-            Assert.Equal(255, color2.A);
-
-            Color color3 = new Color("#FF0000");
-            Assert.Equal(255, color3.R);
-            Assert.Equal(0, color3.G);
-            Assert.Equal(0, color3.B);
-            Assert.Equal(255, color3.A);
-
-            Color color4 = new Color(new Vector3(1, .1f, .133f));
-            Assert.Equal(255, color4.R);
-            Assert.Equal(Math.Round(.1f * 255), color4.G);
-            Assert.Equal(Math.Round(.133f * 255), color4.B);
-            Assert.Equal(255, color4.A);
-
-            Color color5 = new Color(new Vector4(1, .1f, .133f, .5f));
-            Assert.Equal(255, color5.R);
-            Assert.Equal(Math.Round(.1f * 255), color5.G);
-            Assert.Equal(Math.Round(.133f * 255), color5.B);
-            Assert.Equal(Math.Round(.5f * 255), color5.A);
-        }
-
-        /// <summary>
-        /// Tests whether FromHex and ToHex work correctly.
-        /// </summary>
-        [Fact]
-        public void FromAndToHex()
-        {
-            Color color = Color.FromHex("#AABBCCDD");
-            Assert.Equal(170, color.R);
-            Assert.Equal(187, color.G);
-            Assert.Equal(204, color.B);
-            Assert.Equal(221, color.A);
-
-            color.A = 170;
-            color.B = 187;
-            color.G = 204;
-            color.R = 221;
-
-            Assert.Equal("DDCCBBAA", color.ToHex());
-
-            color.R = 0;
-
-            Assert.Equal("00CCBBAA", color.ToHex());
-
-            color.A = 255;
-
-            Assert.Equal("00CCBBFF", color.ToHex());
-        }
-
-        /// <summary>
-        /// Tests that the individual byte elements are layed out in RGBA order.
-        /// </summary>
-        [Fact]
-        public unsafe void ByteLayout()
-        {
-            Color color = new Color(1, 2, 3, 4);
-            byte* colorBase = (byte*)&color;
-            Assert.Equal(1, colorBase[0]);
-            Assert.Equal(2, colorBase[1]);
-            Assert.Equal(3, colorBase[2]);
-            Assert.Equal(4, colorBase[3]);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/DctSandbox.cs b/tests/ImageSharp.Tests46/DctSandbox.cs
deleted file mode 100644
index d3b1bacb2..000000000
--- a/tests/ImageSharp.Tests46/DctSandbox.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Numerics;
-using System.Text;
-using ImageSharp.Formats;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace ImageSharp.Tests
-{
-    public class DctSandbox
-    {
-
-        private ITestOutputHelper Output { get; }
-
-        public DctSandbox(ITestOutputHelper output)
-        {
-            Output = output;
-        }
-
-        private float[] CreateTestData()
-        {
-            float[] result =new float[64];
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    result[i*8 + j] = i*10 + j;
-                }
-            }
-            return result;
-        }
-
-        private void Print(float[] data)
-        {
-            StringBuilder bld = new StringBuilder();
-            for (int i = 0; i < 8; i++)
-            {
-                for (int j = 0; j < 8; j++)
-                {
-                    bld.Append($"{data[i * 8 + j],3} ");
-                }
-                bld.AppendLine();
-            }
-
-            Output.WriteLine(bld.ToString());
-        }
-
-        [Fact]
-        public void Mennyi()
-        {
-            Output.WriteLine(Vector.IsHardwareAccelerated.ToString());
-            Output.WriteLine(Vector<float>.Count.ToString());
-        }
-
-        [Fact]
-        public void CheckTestData()
-        {
-            var data = CreateTestData();
-
-            Print(data);
-        }
-
-        [Fact]
-        public void Load_Store()
-        {
-            var data = CreateTestData();
-
-            var m = MagicDCT.Load(data, 1, 1);
-            m = Matrix4x4.Transpose(m);
-
-            MagicDCT.Store(m, data, 4, 4);
-
-            Print(data);
-        }
-
-        [Fact]
-        public void Transpose8x8()
-        {
-            var data = CreateTestData();
-
-            Span<float> result = new Span<float>(64);
-
-            MagicDCT.Transpose8x8(data, result);
-
-            Print(result.Data);
-        }
-
-        [Fact]
-        public void Transpose8x8_Inplace()
-        {
-            var data = CreateTestData();
-
-            MagicDCT.Transpose8x8(data);
-
-            Print(data);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/FileTestBase.cs b/tests/ImageSharp.Tests46/FileTestBase.cs
deleted file mode 100644
index b9a226fc8..000000000
--- a/tests/ImageSharp.Tests46/FileTestBase.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// <copyright file="FileTestBase.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.Collections.Generic;
-    using System.IO;
-
-    /// <summary>
-    /// The test base class for reading and writing to files.
-    /// </summary>
-    public abstract class FileTestBase
-    {
-        /// <summary>
-        /// The collection of image files to test against.
-        /// </summary>
-        protected static readonly List<TestFile> Files = new List<TestFile>
-        {
-            // new TestFile(TestImages.Png.P1), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Png.Pd), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Jpeg.Floorplan), // Perf: Enable for local testing only
-            new TestFile(TestImages.Jpeg.Calliphora),
-            // new TestFile(TestImages.Jpeg.Cmyk), // Perf: Enable for local testing only
-            new TestFile(TestImages.Jpeg.Turtle),
-            // new TestFile(TestImages.Jpeg.Fb), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Jpeg.Progress), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Jpeg.GammaDalaiLamaGray), // Perf: Enable for local testing only
-            new TestFile(TestImages.Bmp.Car),
-            // new TestFile(TestImages.Bmp.Neg_height), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Png.Blur), // Perf: Enable for local testing only
-            // new TestFile(TestImages.Png.Indexed), // Perf: Enable for local testing only
-            new TestFile(TestImages.Png.Splash),
-            new TestFile(TestImages.Gif.Rings),
-            // new TestFile(TestImages.Gif.Giphy) // Perf: Enable for local testing only
-        };
-
-        protected string CreateOutputDirectory(string path)
-        {
-            path = "TestOutput/" + path;
-
-            if (!Directory.Exists(path))
-            {
-                Directory.CreateDirectory(path);
-            }
-
-            return path;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Formats/Bmp/BitmapTests.cs b/tests/ImageSharp.Tests46/Formats/Bmp/BitmapTests.cs
deleted file mode 100644
index c91b0ad1b..000000000
--- a/tests/ImageSharp.Tests46/Formats/Bmp/BitmapTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// <copyright file="BitmapTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using ImageSharp.Formats;
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Formats;
-
-    using Xunit;
-
-    public class BitmapTests : FileTestBase
-    {
-        public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel
-        = new TheoryData<BmpBitsPerPixel>
-        {
-            BmpBitsPerPixel.Pixel24 ,
-            BmpBitsPerPixel.Pixel32
-        };
-
-        [Theory]
-        [MemberData("BitsPerPixel")]
-        public void BitmapCanEncodeDifferentBitRates(BmpBitsPerPixel bitsPerPixel)
-        {
-            string path = CreateOutputDirectory("Bmp");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileNameWithoutExtension(bitsPerPixel);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}.bmp"))
-                {
-                    image.Save(output, new BmpEncoder { BitsPerPixel = bitsPerPixel });
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests46/Formats/GeneralFormatTests.cs
deleted file mode 100644
index 7d88ca6e1..000000000
--- a/tests/ImageSharp.Tests46/Formats/GeneralFormatTests.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// <copyright file="GeneralFormatTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using System.IO;
-
-    using Xunit;
-
-    public class GeneralFormatTests : FileTestBase
-    {
-        [Fact]
-        public void ResolutionShouldChange()
-        {
-            string path = CreateOutputDirectory("Resolution");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.VerticalResolution = 150;
-                    image.HorizontalResolution = 150;
-                    image.Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageCanEncodeToString()
-        {
-            string path = CreateOutputDirectory("ToString");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                string filename = path + "/" + file.FileNameWithoutExtension + ".txt";
-                File.WriteAllText(filename, image.ToBase64String());
-            }
-        }
-
-        [Fact]
-        public void DecodeThenEncodeImageFromStreamShouldSucceed()
-        {
-            string path = CreateOutputDirectory("Encode");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void QuantizeImageShouldPreserveMaximumColorPrecision()
-        {
-            string path = CreateOutputDirectory("Quantize");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                // Copy the original pixels to save decoding time.
-                Color[] pixels = new Color[image.Width * image.Height];
-                Array.Copy(image.Pixels, pixels, image.Pixels.Length);
-
-                using (FileStream output = File.OpenWrite($"{path}/Octree-{file.FileName}"))
-                {
-                    image.Quantize(Quantization.Octree)
-                          .Save(output, image.CurrentImageFormat);
-
-                }
-
-                image.SetPixels(image.Width, image.Height, pixels);
-                using (FileStream output = File.OpenWrite($"{path}/Wu-{file.FileName}"))
-                {
-                    image.Quantize(Quantization.Wu)
-                          .Save(output, image.CurrentImageFormat);
-                }
-
-                image.SetPixels(image.Width, image.Height, pixels);
-                using (FileStream output = File.OpenWrite($"{path}/Palette-{file.FileName}"))
-                {
-                    image.Quantize(Quantization.Palette)
-                          .Save(output, image.CurrentImageFormat);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageCanConvertFormat()
-        {
-            string path = CreateOutputDirectory("Format");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.gif"))
-                {
-                    image.SaveAsGif(output);
-                }
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.bmp"))
-                {
-                    image.SaveAsBmp(output);
-                }
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.jpg"))
-                {
-                    image.SaveAsJpeg(output);
-                }
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.png"))
-                {
-                    image.SaveAsPng(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldPreservePixelByteOrderWhenSerialized()
-        {
-            string path = CreateOutputDirectory("Serialized");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                byte[] serialized;
-                using (MemoryStream memoryStream = new MemoryStream())
-                {
-                    image.Save(memoryStream);
-                    memoryStream.Flush();
-                    serialized = memoryStream.ToArray();
-                }
-
-                using (MemoryStream memoryStream = new MemoryStream(serialized))
-                {
-                    Image image2 = new Image(memoryStream);
-                    using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                    {
-                        image2.Save(output);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Formats/Jpg/JpegTests.cs b/tests/ImageSharp.Tests46/Formats/Jpg/JpegTests.cs
deleted file mode 100644
index 57bce1504..000000000
--- a/tests/ImageSharp.Tests46/Formats/Jpg/JpegTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using ImageSharp.Formats;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace ImageSharp.Tests.Formats.Jpg
-{
-    public class JpegTests
-    {
-        
-        public const string TestOutputDirectory = "TestOutput/Jpeg";
-
-        private ITestOutputHelper Output { get; }
-
-        public JpegTests(ITestOutputHelper output)
-        {
-            Output = output;
-        }
-
-        protected string CreateTestOutputFile(string fileName)
-        {
-            if (!Directory.Exists(TestOutputDirectory))
-            {
-                Directory.CreateDirectory(TestOutputDirectory);
-            }
-
-            //string id = Guid.NewGuid().ToString().Substring(0, 4);
-
-            string ext = Path.GetExtension(fileName);
-            fileName = Path.GetFileNameWithoutExtension(fileName);
-
-            return $"{TestOutputDirectory}/{fileName}{ext}";
-        }
-
-        protected Stream CreateOutputStream(string fileName)
-        {
-            fileName = CreateTestOutputFile(fileName);
-            Output?.WriteLine("Opened for write: "+fileName);
-            return File.OpenWrite(fileName);
-        }
-
-        public static IEnumerable<object[]> AllJpegFiles
-            => TestImages.Jpeg.All.Select(fn => new object[] {fn});
-
-        [Theory]
-        [MemberData(nameof(AllJpegFiles))]
-        public void OpenJpeg_SaveBmp(string jpegPath)
-        {
-            string bmpFileName = Path.GetFileNameWithoutExtension(jpegPath) + ".bmp";
-
-            using (var inputStream = File.OpenRead(jpegPath))
-            {
-                var image = new Image(inputStream);
-                
-                using (var outputStream = CreateOutputStream(bmpFileName))
-                {
-                    image.Save(outputStream, new BmpFormat());
-                }
-            }
-        }
-
-        public static IEnumerable<object[]> AllBmpFiles
-            => TestImages.Jpeg.All.Select(fn => new object[] {fn});
-
-        [Theory]
-        [MemberData(nameof(AllBmpFiles))]
-        public void OpenBmp_SaveJpeg(string bmpPath)
-        {
-            string jpegPath = Path.GetFileNameWithoutExtension(bmpPath) + ".jpeg";
-
-            using (var inputStream = File.OpenRead(bmpPath))
-            {
-                var image = new Image(inputStream);
-
-                using (var outputStream = CreateOutputStream(jpegPath))
-                {
-                    image.Save(outputStream, new JpegFormat());
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Formats/Png/PngTests.cs b/tests/ImageSharp.Tests46/Formats/Png/PngTests.cs
deleted file mode 100644
index 3c37ce898..000000000
--- a/tests/ImageSharp.Tests46/Formats/Png/PngTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <copyright file="PngTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using ImageSharp.Formats;
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Formats;
-
-    using Xunit;
-
-    public class PngTests : FileTestBase
-    {
-
-
-        [Fact]
-        public void ImageCanSaveIndexedPng()
-        {
-            string path = CreateOutputDirectory("Png");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileNameWithoutExtension}.png"))
-                {
-                    image.Quality = 256;
-                    image.Save(output, new PngFormat());
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Helpers/GuardTests.cs b/tests/ImageSharp.Tests46/Helpers/GuardTests.cs
deleted file mode 100644
index ba6d5687c..000000000
--- a/tests/ImageSharp.Tests46/Helpers/GuardTests.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-// <copyright file="GuardTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests.Helpers
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Guard"/> helper.
-    /// </summary>
-    public class GuardTests
-    {
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.NotNull"/> method throws when the argument is null.
-        /// </summary>
-        [Fact]
-        public void NotNullThrowsWhenArgIsNull()
-        {
-            Assert.Throws<ArgumentNullException>(() => Guard.NotNull(null, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.NotNull"/> method throws when the argument name is empty.
-        /// </summary>
-        [Fact]
-        public void NotNullThrowsWhenArgNameEmpty()
-        {
-            Assert.Throws<ArgumentNullException>(() => Guard.NotNull(null, string.Empty));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.NotEmpty"/> method throws when the argument is empty.
-        /// </summary>
-        [Fact]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1122:UseStringEmptyForEmptyStrings", Justification = "Reviewed. Suppression is OK here.")]
-        public void NotEmptyThrowsWhenEmpty()
-        {
-            Assert.Throws<ArgumentException>(() => Guard.NotNullOrEmpty("", string.Empty));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.NotEmpty"/> method throws when the argument is whitespace.
-        /// </summary>
-        [Fact]
-        public void NotEmptyThrowsWhenWhitespace()
-        {
-            Assert.Throws<ArgumentException>(() => Guard.NotNullOrEmpty(" ", string.Empty));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.NotEmpty"/> method throws when the argument name is null.
-        /// </summary>
-        [Fact]
-        public void NotEmptyThrowsWhenParameterNameNull()
-        {
-            Assert.Throws<ArgumentNullException>(() => Guard.NotNullOrEmpty(null, null));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThan"/> method throws when the argument is greater.
-        /// </summary>
-        [Fact]
-        public void LessThanThrowsWhenArgIsGreater()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeLessThan(1, 0, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThan"/> method throws when the argument is equal.
-        /// </summary>
-        [Fact]
-        public void LessThanThrowsWhenArgIsEqual()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeLessThan(1, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThanOrEqual"/> method throws when the argument is greater.
-        /// </summary>
-        [Fact]
-        public void LessThanOrEqualToThrowsWhenArgIsGreater()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeLessThanOrEqualTo(1, 0, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThanOrEqual"/> method does not throw when the argument 
-        /// is less.
-        /// </summary>
-        [Fact]
-        public void LessThanOrEqualToDoesNotThrowWhenArgIsLess()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeLessThanOrEqualTo(0, 1, "foo"));
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThanOrEqual"/> method does not throw when the argument 
-        /// is equal.
-        /// </summary>
-        [Fact]
-        public void LessThanOrEqualToDoesNotThrowWhenArgIsEqual()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeLessThanOrEqualTo(1, 1, "foo"));
-            Assert.Equal(1, 1);
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThan"/> method throws when the argument is greater.
-        /// </summary>
-        [Fact]
-        public void GreaterThanThrowsWhenArgIsLess()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeGreaterThan(0, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThan"/> method throws when the argument is greater.
-        /// </summary>
-        [Fact]
-        public void GreaterThanThrowsWhenArgIsEqual()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeGreaterThan(1, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThan"/> method throws when the argument name is greater.
-        /// </summary>
-        [Fact]
-        public void GreaterThanOrEqualToThrowsWhenArgIsLess()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeGreaterThanOrEqualTo(0, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThanOrEqual"/> method does not throw when the argument 
-        /// is less.
-        /// </summary>
-        [Fact]
-        public void GreaterThanOrEqualToDoesNotThrowWhenArgIsGreater()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeGreaterThanOrEqualTo(1, 0, "foo"));
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeLessThanOrEqual"/> method does not throw when the argument 
-        /// is equal.
-        /// </summary>
-        [Fact]
-        public void GreaterThanOrEqualToDoesNotThrowWhenArgIsEqual()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeGreaterThanOrEqualTo(1, 1, "foo"));
-            Assert.Equal(1, 1);
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeBetweenOrEqualTo"/> method throws when the argument is less.
-        /// </summary>
-        [Fact]
-        public void BetweenOrEqualToThrowsWhenArgIsLess()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeBetweenOrEqualTo(-2, -1, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeBetweenOrEqualTo"/> method throws when the argument is greater.
-        /// </summary>
-        [Fact]
-        public void BetweenOrEqualToThrowsWhenArgIsGreater()
-        {
-            Assert.Throws<ArgumentOutOfRangeException>(() => Guard.MustBeBetweenOrEqualTo(2, -1, 1, "foo"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeBetweenOrEqualTo"/> method does not throw when the argument 
-        /// is equal.
-        /// </summary>
-        [Fact]
-        public void BetweenOrEqualToDoesNotThrowWhenArgIsEqual()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeBetweenOrEqualTo(1, 1, 1, "foo"));
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.MustBeBetweenOrEqualTo"/> method does not throw when the argument 
-        /// is equal.
-        /// </summary>
-        [Fact]
-        public void BetweenOrEqualToDoesNotThrowWhenArgIsBetween()
-        {
-            Exception ex = Record.Exception(() => Guard.MustBeBetweenOrEqualTo(0, -1, 1, "foo"));
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.IsTrue"/> method throws when the argument is false.
-        /// </summary>
-        [Fact]
-        public void IsTrueThrowsWhenArgIsFalse()
-        {
-            Assert.Throws<ArgumentException>(() => Guard.IsTrue(false, "foo", "message"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.IsTrue"/> method does not throw when the argument is true.
-        /// </summary>
-        [Fact]
-        public void IsTrueDoesThrowsWhenArgIsTrue()
-        {
-            Exception ex = Record.Exception(() => Guard.IsTrue(true, "foo", "message"));
-            Assert.Null(ex);
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.IsFalse"/> method throws when the argument is true.
-        /// </summary>
-        [Fact]
-        public void IsFalseThrowsWhenArgIsFalse()
-        {
-            Assert.Throws<ArgumentException>(() => Guard.IsFalse(true, "foo", "message"));
-        }
-
-        /// <summary>
-        /// Tests that the <see cref="M:Guard.IsFalse"/> method does not throw when the argument is false.
-        /// </summary>
-        [Fact]
-        public void IsFalseDoesThrowsWhenArgIsTrue()
-        {
-            Exception ex = Record.Exception(() => Guard.IsFalse(false, "foo", "message"));
-            Assert.Null(ex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Image/ImagePropertyTests.cs b/tests/ImageSharp.Tests46/Image/ImagePropertyTests.cs
deleted file mode 100644
index 8b4c6ea10..000000000
--- a/tests/ImageSharp.Tests46/Image/ImagePropertyTests.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <copyright file="ColorConversionTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="ImageProperty"/> class.
-    /// </summary>
-    public class ImagePropertyTests
-    {
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            ImageProperty property1 = new ImageProperty("Foo", "Bar");
-            ImageProperty property2 = new ImageProperty("Foo", "Bar");
-            ImageProperty property3 = null;
-
-            Assert.Equal(property1, property2);
-            Assert.True(property1 == property2);
-            Assert.Equal(property3, null);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            ImageProperty property1 = new ImageProperty("Foo", "Bar");
-            ImageProperty property2 = new ImageProperty("Foo", "Foo");
-            ImageProperty property3 = new ImageProperty("Bar", "Bar");
-            ImageProperty property4 = new ImageProperty("Foo", null);
-
-            Assert.False(property1.Equals("Foo"));
-
-            Assert.NotEqual(property1, null);
-
-            Assert.NotEqual(property1, property2);
-            Assert.True(property1 != property2);
-
-            Assert.NotEqual(property1, property3);
-            Assert.NotEqual(property1, property4);
-        }
-
-        /// <summary>
-        /// Tests whether the constructor throws an exception when the property name is null or empty.
-        /// </summary>
-        [Fact]
-        public void ConstructorThrowsWhenNameIsNullOrEmpty()
-        {
-            Assert.Throws<ArgumentNullException>(() => new ImageProperty(null, "Foo"));
-
-            Assert.Throws<ArgumentException>(() => new ImageProperty(string.Empty, "Foo"));
-        }
-
-        /// <summary>
-        /// Tests whether the constructor correctly assigns properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            ImageProperty property = new ImageProperty("Foo", null);
-            Assert.Equal("Foo", property.Name);
-            Assert.Equal(null, property.Value);
-
-            property = new ImageProperty("Foo", string.Empty);
-            Assert.Equal(string.Empty, property.Value);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests46/Image/PixelAccessorTests.cs
deleted file mode 100644
index ab71d8de7..000000000
--- a/tests/ImageSharp.Tests46/Image/PixelAccessorTests.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// <copyright file="PixelAccessorTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="PixelAccessor"/> class.
-    /// </summary>
-    public class PixelAccessorTests
-    {
-        [Fact]
-        public void CopyFromZYX()
-        {
-            CopyFromZYX(new Image<Color, uint>(1, 1));
-        }
-
-        [Fact]
-        public void CopyFromZYXOptimized()
-        {
-            CopyFromZYX(new Image(1, 1));
-        }
-
-        [Fact]
-        public void CopyFromZYXW()
-        {
-            CopyFromZYXW(new Image<Color, uint>(1, 1));
-        }
-
-        [Fact]
-        public void CopyFromZYXWOptimized()
-        {
-            CopyFromZYXW(new Image(1, 1));
-        }
-
-        [Fact]
-        public void CopyToZYX()
-        {
-            CopyToZYX(new Image<Color, uint>(1, 1));
-        }
-
-        [Fact]
-        public void CopyToZYXOptimized()
-        {
-            CopyToZYX(new Image(1, 1));
-        }
-
-        [Fact]
-        public void CopyToZYXW()
-        {
-            CopyToZYXW(new Image<Color, uint>(1, 1));
-        }
-
-        [Fact]
-        public void CopyToZYXWOptimized()
-        {
-            CopyToZYXW(new Image(1, 1));
-        }
-
-        private static void CopyFromZYX<TColor, TPacked>(Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 255;
-
-                using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(1, ComponentOrder.ZYX))
-                {
-                    row.Bytes[0] = blue;
-                    row.Bytes[1] = green;
-                    row.Bytes[2] = red;
-
-                    pixels.CopyFrom(row, 0);
-
-                    Color color = (Color) (object) pixels[0, 0];
-                    Assert.Equal(red, color.R);
-                    Assert.Equal(green, color.G);
-                    Assert.Equal(blue, color.B);
-                    Assert.Equal(alpha, color.A);
-                }
-            }
-        }
-
-        private static void CopyFromZYXW<TColor, TPacked>(Image<TColor, TPacked> image)
-            where TColor : struct, IPackedPixel<TPacked>
-        where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 4;
-
-                using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(1, ComponentOrder.ZYXW))
-                {
-                    row.Bytes[0] = blue;
-                    row.Bytes[1] = green;
-                    row.Bytes[2] = red;
-                    row.Bytes[3] = alpha;
-
-                    pixels.CopyFrom(row, 0);
-
-                    Color color = (Color) (object) pixels[0, 0];
-                    Assert.Equal(red, color.R);
-                    Assert.Equal(green, color.G);
-                    Assert.Equal(blue, color.B);
-                    Assert.Equal(alpha, color.A);
-                }
-            }
-        }
-
-        private static void CopyToZYX<TColor, TPacked>(Image<TColor, TPacked> image)
-          where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-
-                using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(1, ComponentOrder.ZYX))
-                {
-                    pixels[0, 0] = (TColor) (object) new Color(red, green, blue);
-
-                    pixels.CopyTo(row, 0);
-
-                    Assert.Equal(blue, row.Bytes[0]);
-                    Assert.Equal(green, row.Bytes[1]);
-                    Assert.Equal(red, row.Bytes[2]);
-                }
-            }
-        }
-
-        private static void CopyToZYXW<TColor, TPacked>(Image<TColor, TPacked> image)
-          where TColor : struct, IPackedPixel<TPacked>
-            where TPacked : struct
-        {
-            using (PixelAccessor<TColor, TPacked> pixels = image.Lock())
-            {
-                byte red = 1;
-                byte green = 2;
-                byte blue = 3;
-                byte alpha = 4;
-
-                using (PixelRow<TColor, TPacked> row = new PixelRow<TColor, TPacked>(1, ComponentOrder.ZYXW))
-                {
-                    pixels[0, 0] = (TColor) (object) new Color(red, green, blue, alpha);
-
-                    pixels.CopyTo(row, 0);
-
-                    Assert.Equal(blue, row.Bytes[0]);
-                    Assert.Equal(green, row.Bytes[1]);
-                    Assert.Equal(red, row.Bytes[2]);
-                    Assert.Equal(alpha, row.Bytes[3]);
-                }
-            }
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/ImageSharp.Tests46.csproj b/tests/ImageSharp.Tests46/ImageSharp.Tests46.csproj
deleted file mode 100644
index ab80f3d93..000000000
--- a/tests/ImageSharp.Tests46/ImageSharp.Tests46.csproj
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{635E0A15-3893-4763-A7F6-FCCFF85BCCA4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ImageSharp.Tests</RootNamespace>
-    <AssemblyName>ImageSharp.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.1.1\lib\net46\System.Numerics.Vectors.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Benchmark\DecodeJpegBenchmark.cs" />
-    <Compile Include="Colors\ColorConversionTests.cs" />
-    <Compile Include="Colors\ColorTests.cs" />
-    <Compile Include="DctSandbox.cs" />
-    <Compile Include="FileTestBase.cs" />
-    <Compile Include="Formats\Bmp\BitmapTests.cs" />
-    <Compile Include="Formats\GeneralFormatTests.cs" />
-    <Compile Include="Formats\Jpg\JpegTests.cs" />
-    <Compile Include="Formats\Png\PngTests.cs" />
-    <Compile Include="Helpers\GuardTests.cs" />
-    <Compile Include="Image\ImagePropertyTests.cs" />
-    <Compile Include="Image\PixelAccessorTests.cs" />
-    <Compile Include="Numerics\PointTests.cs" />
-    <Compile Include="Numerics\RationalTests.cs" />
-    <Compile Include="Numerics\RectangleTests.cs" />
-    <Compile Include="Numerics\SignedRationalTests.cs" />
-    <Compile Include="Numerics\SizeTests.cs" />
-    <Compile Include="Processors\Filters\AlphaTest.cs" />
-    <Compile Include="Processors\Filters\BackgroundColorTest.cs" />
-    <Compile Include="Processors\Filters\BinaryThreshold.cs" />
-    <Compile Include="Processors\Filters\BlackWhiteTest.cs" />
-    <Compile Include="Processors\Filters\BlendTest.cs" />
-    <Compile Include="Processors\Filters\BoxBlurTest.cs" />
-    <Compile Include="Processors\Filters\BrightnessTest.cs" />
-    <Compile Include="Processors\Filters\ColorBlindnessTest.cs" />
-    <Compile Include="Processors\Filters\ContrastTest.cs" />
-    <Compile Include="Processors\Filters\GlowTest.cs" />
-    <Compile Include="Processors\Filters\GrayscaleTest.cs" />
-    <Compile Include="Processors\Filters\HueTest.cs" />
-    <Compile Include="Processors\Filters\InvertTest.cs" />
-    <Compile Include="Processors\Filters\KodachromeTest.cs" />
-    <Compile Include="Processors\Filters\LomographTest.cs" />
-    <Compile Include="Processors\Filters\PolaroidTest.cs" />
-    <Compile Include="Processors\Filters\SaturationTest.cs" />
-    <Compile Include="Processors\Filters\SepiaTest.cs" />
-    <Compile Include="Processors\Filters\VignetteTest.cs" />
-    <Compile Include="Processors\Samplers\AutoOrientTests.cs" />
-    <Compile Include="Processors\Samplers\CropTest.cs" />
-    <Compile Include="Processors\Samplers\DetectEdgesTest.cs" />
-    <Compile Include="Processors\Samplers\EntropyCropTest.cs" />
-    <Compile Include="Processors\Samplers\FlipTests.cs" />
-    <Compile Include="Processors\Samplers\GuassianBlurTest.cs" />
-    <Compile Include="Processors\Samplers\GuassianSharpenTest.cs" />
-    <Compile Include="Processors\Samplers\OilPaintTest.cs" />
-    <Compile Include="Processors\Samplers\PadTest.cs" />
-    <Compile Include="Processors\Samplers\PixelateTest.cs" />
-    <Compile Include="Processors\Samplers\ResizeTests.cs" />
-    <Compile Include="Processors\Samplers\RotateFlipTest.cs" />
-    <Compile Include="Processors\Samplers\RotateTest.cs" />
-    <Compile Include="Processors\Samplers\SkewTest.cs" />
-    <Compile Include="Profiles\Exif\ExifProfileTests.cs" />
-    <Compile Include="Profiles\Exif\ExifTagDescriptionAttributeTests.cs" />
-    <Compile Include="Profiles\Exif\ExifValueTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestFile.cs" />
-    <Compile Include="TestImages.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ImageSharp46\ImageSharp46.csproj">
-      <Project>{fba0b5f6-09c2-4317-8ef6-6adb9b20e6b1}</Project>
-      <Name>ImageSharp46</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="TestImages\Formats\Bmp\Car.bmp" />
-    <Content Include="TestImages\Formats\Bmp\F.bmp" />
-    <Content Include="TestImages\Formats\Bmp\neg_height.bmp" />
-    <Content Include="TestImages\Formats\Gif\giphy.gif" />
-    <Content Include="TestImages\Formats\Gif\rings.gif" />
-    <Content Include="TestImages\Formats\Jpg\Calliphora.jpg" />
-    <Content Include="TestImages\Formats\Jpg\cmyk.jpg" />
-    <Content Include="TestImages\Formats\Jpg\exif.jpg" />
-    <Content Include="TestImages\Formats\Jpg\fb.jpg" />
-    <Content Include="TestImages\Formats\Jpg\Floorplan.jpeg" />
-    <Content Include="TestImages\Formats\Jpg\gamma_dalai_lama_gray.jpg" />
-    <Content Include="TestImages\Formats\Jpg\progress.jpg" />
-    <Content Include="TestImages\Formats\Jpg\turtle.jpg" />
-    <Content Include="TestImages\Formats\Png\blur.png" />
-    <Content Include="TestImages\Formats\Png\indexed.png" />
-    <Content Include="TestImages\Formats\Png\pd.png" />
-    <Content Include="TestImages\Formats\Png\pl.png" />
-    <Content Include="TestImages\Formats\Png\splash.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Numerics/PointTests.cs b/tests/ImageSharp.Tests46/Numerics/PointTests.cs
deleted file mode 100644
index 82b26b946..000000000
--- a/tests/ImageSharp.Tests46/Numerics/PointTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// <copyright file="PointTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Point"/> struct.
-    /// </summary>
-    public class PointTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            Point first = new Point(100, 100);
-            Point second = new Point(100, 100);
-
-            Assert.Equal(first, second);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            Point first = new Point(0, 100);
-            Point second = new Point(100, 100);
-
-            Assert.NotEqual(first, second);
-        }
-
-        /// <summary>
-        /// Tests whether the point constructor correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            Point first = new Point(4, 5);
-            Assert.Equal(4, first.X);
-            Assert.Equal(5, first.Y);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Numerics/RationalTests.cs b/tests/ImageSharp.Tests46/Numerics/RationalTests.cs
deleted file mode 100644
index 3d80b88fe..000000000
--- a/tests/ImageSharp.Tests46/Numerics/RationalTests.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// <copyright file="RationalTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Rational"/> struct.
-    /// </summary>
-    public class RationalTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            Rational r1 = new Rational(3, 2);
-            Rational r2 = new Rational(3, 2);
-
-            Assert.Equal(r1, r2);
-            Assert.True(r1 == r2);
-
-            Rational r3 = new Rational(7.55);
-            Rational r4 = new Rational(755, 100);
-            Rational r5 = new Rational(151, 20);
-
-            Assert.Equal(r3, r4);
-            Assert.Equal(r4, r5);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            Rational first = new Rational(0, 100);
-            Rational second = new Rational(100, 100);
-
-            Assert.NotEqual(first, second);
-            Assert.True(first != second);
-        }
-
-        /// <summary>
-        /// Tests whether the Rational constructor correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            Rational rational = new Rational(7, 55);
-            Assert.Equal(7U, rational.Numerator);
-            Assert.Equal(55U, rational.Denominator);
-
-            rational = new Rational(755, 100);
-            Assert.Equal(151U, rational.Numerator);
-            Assert.Equal(20U, rational.Denominator);
-
-            rational = new Rational(755, 100, false);
-            Assert.Equal(755U, rational.Numerator);
-            Assert.Equal(100U, rational.Denominator);
-
-            rational = new Rational(-7.55);
-            Assert.Equal(151U, rational.Numerator);
-            Assert.Equal(20U, rational.Denominator);
-
-            rational = new Rational(7);
-            Assert.Equal(7U, rational.Numerator);
-            Assert.Equal(1U, rational.Denominator);
-        }
-
-        [Fact]
-        public void Fraction()
-        {
-            Rational first = new Rational(1.0 / 1600);
-            Rational second = new Rational(1.0 / 1600, true);
-            Assert.False(first.Equals(second));
-        }
-
-        [Fact]
-        public void ToDouble()
-        {
-            Rational rational = new Rational(0, 0);
-            Assert.Equal(double.NaN, rational.ToDouble());
-
-            rational = new Rational(2, 0);
-            Assert.Equal(double.PositiveInfinity, rational.ToDouble());
-        }
-
-        [Fact]
-        public void ToStringRepresention()
-        {
-            Rational rational = new Rational(0, 0);
-            Assert.Equal("[ Indeterminate ]", rational.ToString());
-
-            rational = new Rational(double.PositiveInfinity);
-            Assert.Equal("[ PositiveInfinity ]", rational.ToString());
-
-            rational = new Rational(double.NegativeInfinity);
-            Assert.Equal("[ PositiveInfinity ]", rational.ToString());
-
-            rational = new Rational(0, 1);
-            Assert.Equal("0", rational.ToString());
-
-            rational = new Rational(2, 1);
-            Assert.Equal("2", rational.ToString());
-
-            rational = new Rational(1, 2);
-            Assert.Equal("1/2", rational.ToString());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Numerics/RectangleTests.cs b/tests/ImageSharp.Tests46/Numerics/RectangleTests.cs
deleted file mode 100644
index 2f9ad3d37..000000000
--- a/tests/ImageSharp.Tests46/Numerics/RectangleTests.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// <copyright file="RectangleTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Rectangle"/> struct.
-    /// </summary>
-    public class RectangleTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            Rectangle first = new Rectangle(1, 1, 100, 100);
-            Rectangle second = new Rectangle(1, 1, 100, 100);
-
-            Assert.Equal(first, second);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            Rectangle first = new Rectangle(1, 1, 0, 100);
-            Rectangle second = new Rectangle(1, 1, 100, 100);
-
-            Assert.NotEqual(first, second);
-        }
-
-        /// <summary>
-        /// Tests whether the rectangle constructors correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            Rectangle first = new Rectangle(1, 1, 50, 100);
-            Assert.Equal(1, first.X);
-            Assert.Equal(1, first.Y);
-            Assert.Equal(50, first.Width);
-            Assert.Equal(100, first.Height);
-            Assert.Equal(1, first.Top);
-            Assert.Equal(51, first.Right);
-            Assert.Equal(101, first.Bottom);
-            Assert.Equal(1, first.Left);
-
-            Rectangle second = new Rectangle(new Point(1, 1), new Size(50, 100));
-            Assert.Equal(1, second.X);
-            Assert.Equal(1, second.Y);
-            Assert.Equal(50, second.Width);
-            Assert.Equal(100, second.Height);
-            Assert.Equal(1, second.Top);
-            Assert.Equal(51, second.Right);
-            Assert.Equal(101, second.Bottom);
-            Assert.Equal(1, second.Left);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Numerics/SignedRationalTests.cs b/tests/ImageSharp.Tests46/Numerics/SignedRationalTests.cs
deleted file mode 100644
index cb7e21db0..000000000
--- a/tests/ImageSharp.Tests46/Numerics/SignedRationalTests.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-// <copyright file="RationalTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="SignedRational"/> struct.
-    /// </summary>
-    public class SignedRationalTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            SignedRational r1 = new SignedRational(3, 2);
-            SignedRational r2 = new SignedRational(3, 2);
-
-            Assert.Equal(r1, r2);
-            Assert.True(r1 == r2);
-
-            SignedRational r3 = new SignedRational(7.55);
-            SignedRational r4 = new SignedRational(755, 100);
-            SignedRational r5 = new SignedRational(151, 20);
-
-            Assert.Equal(r3, r4);
-            Assert.Equal(r4, r5);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            SignedRational first = new SignedRational(0, 100);
-            SignedRational second = new SignedRational(100, 100);
-
-            Assert.NotEqual(first, second);
-            Assert.True(first != second);
-        }
-
-        /// <summary>
-        /// Tests whether the Rational constructor correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            SignedRational rational = new SignedRational(7, -55);
-            Assert.Equal(7, rational.Numerator);
-            Assert.Equal(-55, rational.Denominator);
-
-            rational = new SignedRational(-755, 100);
-            Assert.Equal(-151, rational.Numerator);
-            Assert.Equal(20, rational.Denominator);
-
-            rational = new SignedRational(-755, -100, false);
-            Assert.Equal(-755, rational.Numerator);
-            Assert.Equal(-100, rational.Denominator);
-
-            rational = new SignedRational(-151, -20);
-            Assert.Equal(-151, rational.Numerator);
-            Assert.Equal(-20, rational.Denominator);
-
-            rational = new SignedRational(-7.55);
-            Assert.Equal(-151, rational.Numerator);
-            Assert.Equal(20, rational.Denominator);
-
-            rational = new SignedRational(7);
-            Assert.Equal(7, rational.Numerator);
-            Assert.Equal(1, rational.Denominator);
-        }
-
-        [Fact]
-        public void Fraction()
-        {
-            SignedRational first = new SignedRational(1.0 / 1600);
-            SignedRational second = new SignedRational(1.0 / 1600, true);
-            Assert.False(first.Equals(second));
-        }
-
-        [Fact]
-        public void ToDouble()
-        {
-            SignedRational rational = new SignedRational(0, 0);
-            Assert.Equal(double.NaN, rational.ToDouble());
-
-            rational = new SignedRational(2, 0);
-            Assert.Equal(double.PositiveInfinity, rational.ToDouble());
-
-            rational = new SignedRational(-2, 0);
-            Assert.Equal(double.NegativeInfinity, rational.ToDouble());
-        }
-
-        [Fact]
-        public void ToStringRepresention()
-        {
-            SignedRational rational = new SignedRational(0, 0);
-            Assert.Equal("[ Indeterminate ]", rational.ToString());
-
-            rational = new SignedRational(double.PositiveInfinity);
-            Assert.Equal("[ PositiveInfinity ]", rational.ToString());
-
-            rational = new SignedRational(double.NegativeInfinity);
-            Assert.Equal("[ NegativeInfinity ]", rational.ToString());
-
-            rational = new SignedRational(0, 1);
-            Assert.Equal("0", rational.ToString());
-
-            rational = new SignedRational(2, 1);
-            Assert.Equal("2", rational.ToString());
-
-            rational = new SignedRational(1, 2);
-            Assert.Equal("1/2", rational.ToString());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Numerics/SizeTests.cs b/tests/ImageSharp.Tests46/Numerics/SizeTests.cs
deleted file mode 100644
index 29eb768d9..000000000
--- a/tests/ImageSharp.Tests46/Numerics/SizeTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// <copyright file="SizeTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    /// <summary>
-    /// Tests the <see cref="Size"/> struct.
-    /// </summary>
-    public class SizeTests
-    {
-        /// <summary>
-        /// Tests the equality operators for equality.
-        /// </summary>
-        [Fact]
-        public void AreEqual()
-        {
-            Size first = new Size(100, 100);
-            Size second = new Size(100, 100);
-
-            Assert.Equal(first, second);
-        }
-
-        /// <summary>
-        /// Tests the equality operators for inequality.
-        /// </summary>
-        [Fact]
-        public void AreNotEqual()
-        {
-            Size first = new Size(0, 100);
-            Size second = new Size(100, 100);
-
-            Assert.NotEqual(first, second);
-        }
-
-        /// <summary>
-        /// Tests whether the size constructor correctly assign properties.
-        /// </summary>
-        [Fact]
-        public void ConstructorAssignsProperties()
-        {
-            Size first = new Size(4, 5);
-            Assert.Equal(4, first.Width);
-            Assert.Equal(5, first.Height);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/AlphaTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/AlphaTest.cs
deleted file mode 100644
index efbfe75a8..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/AlphaTest.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="AlphaTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class AlphaTest : FileTestBase
-    {
-        public static readonly TheoryData<int> AlphaValues
-        = new TheoryData<int>
-        {
-            20 ,
-            80
-        };
-
-        [Theory]
-        [MemberData("AlphaValues")]
-        public void ImageShouldApplyAlphaFilter(int value)
-        {
-            string path = CreateOutputDirectory("Alpha");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Alpha(value)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("AlphaValues")]
-        public void ImageShouldApplyAlphaFilterInBox(int value)
-        {
-            string path = CreateOutputDirectory("Alpha");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Alpha(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BackgroundColorTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/BackgroundColorTest.cs
deleted file mode 100644
index a7ecf6c08..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BackgroundColorTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="BackgroundColorTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class BackgroundColorTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyBackgroundColorFilter()
-        {
-            string path = CreateOutputDirectory("BackgroundColor");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.BackgroundColor(Color.HotPink)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BinaryThreshold.cs b/tests/ImageSharp.Tests46/Processors/Filters/BinaryThreshold.cs
deleted file mode 100644
index 10b174cd5..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BinaryThreshold.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="BinaryThresholdTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class BinaryThresholdTest : FileTestBase
-    {
-        public static readonly TheoryData<float> BinaryThresholdValues
-        = new TheoryData<float>
-        {
-            .25f ,
-            .75f ,
-        };
-
-        [Theory]
-        [MemberData("BinaryThresholdValues")]
-        public void ImageShouldApplyBinaryThresholdFilter(float value)
-        {
-            string path = CreateOutputDirectory("BinaryThreshold");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.BinaryThreshold(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/BlackWhiteTest.cs
deleted file mode 100644
index d4af4ad38..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BlackWhiteTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="BlackWhiteTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class BlackWhiteTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyBlackWhiteFilter()
-        {
-            string path = CreateOutputDirectory("BlackWhite");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.BlackWhite()
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BlendTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/BlendTest.cs
deleted file mode 100644
index 653524e20..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BlendTest.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <copyright file="BlendTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class BlendTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyBlendFilter()
-        {
-            string path = CreateOutputDirectory("Blend");
-
-            Image blend;
-            using (FileStream stream = File.OpenRead(TestImages.Bmp.Car))
-            {
-                blend = new Image(stream);
-            }
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Blend(blend)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BoxBlurTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/BoxBlurTest.cs
deleted file mode 100644
index 453d56863..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BoxBlurTest.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <copyright file="BoxBlurTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-
-    public class BoxBlurTest : FileTestBase
-    {
-        public static readonly TheoryData<int> BoxBlurValues
-        = new TheoryData<int>
-        {
-            3 ,
-            5 ,
-        };
-
-        [Theory]
-        [MemberData("BoxBlurValues")]
-        public void ImageShouldApplyBoxBlurFilter(int value)
-        {
-            string path = CreateOutputDirectory("BoxBlur");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.BoxBlur(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/BrightnessTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/BrightnessTest.cs
deleted file mode 100644
index e32c7d35e..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/BrightnessTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="BrightnessTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class BrightnessTest : FileTestBase
-    {
-        public static readonly TheoryData<int> BrightnessValues
-        = new TheoryData<int>
-        {
-            50 ,
-           -50 ,
-        };
-
-        [Theory]
-        [MemberData("BrightnessValues")]
-        public void ImageShouldApplyBrightnessFilter(int value)
-        {
-            string path = CreateOutputDirectory("Brightness");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Brightness(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/ColorBlindnessTest.cs
deleted file mode 100644
index 966514577..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/ColorBlindnessTest.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <copyright file="ColorBlindnessTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class ColorBlindnessTest : FileTestBase
-    {
-        public static readonly TheoryData<ColorBlindness> ColorBlindnessFilters
-        = new TheoryData<ColorBlindness>
-        {
-            ColorBlindness.Achromatomaly,
-            ColorBlindness.Achromatopsia,
-            ColorBlindness.Deuteranomaly,
-            ColorBlindness.Deuteranopia,
-            ColorBlindness.Protanomaly,
-            ColorBlindness.Protanopia,
-            ColorBlindness.Tritanomaly,
-            ColorBlindness.Tritanopia
-        };
-
-        [Theory]
-        [MemberData("ColorBlindnessFilters")]
-        public void ImageShouldApplyColorBlindnessFilter(ColorBlindness colorBlindness)
-        {
-            string path = CreateOutputDirectory("ColorBlindness");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(colorBlindness);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.ColorBlindness(colorBlindness)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/ContrastTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/ContrastTest.cs
deleted file mode 100644
index 3c83fd892..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/ContrastTest.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// <copyright file="ContrastTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class ContrastTest : FileTestBase
-    {
-        public static readonly TheoryData<int> ContrastValues
-        = new TheoryData<int>
-        {
-            50 ,
-           -50 ,
-        };
-
-        [Theory]
-        [MemberData("ContrastValues")]
-        public void ImageShouldApplyContrastFilter(int value)
-        {
-            string path = CreateOutputDirectory("Contrast");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Contrast(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/GlowTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/GlowTest.cs
deleted file mode 100644
index 1d317795d..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/GlowTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// <copyright file="GlowTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class GlowTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyGlowFilter()
-        {
-            string path = CreateOutputDirectory("Glow");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Glow()
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyGlowFilterColor()
-        {
-            string path = CreateOutputDirectory("Glow");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("Color");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Glow(Color.HotPink)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyGlowFilterRadius()
-        {
-            string path = CreateOutputDirectory("Glow");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("Radius");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Glow(image.Width / 4)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyGlowFilterInBox()
-        {
-            string path = CreateOutputDirectory("Glow");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Glow(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/GrayscaleTest.cs
deleted file mode 100644
index 6796ba617..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/GrayscaleTest.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <copyright file="GrayscaleTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Processors;
-    using System.IO;
-
-    using Xunit;
-
-    public class GrayscaleTest : FileTestBase
-    {
-        public static readonly TheoryData<GrayscaleMode> GrayscaleValues
-        = new TheoryData<GrayscaleMode>
-        {
-            GrayscaleMode.Bt709 ,
-            GrayscaleMode.Bt601 ,
-        };
-
-        [Theory]
-        [MemberData("GrayscaleValues")]
-        public void ImageShouldApplyGrayscaleFilter(GrayscaleMode value)
-        {
-            string path = CreateOutputDirectory("Grayscale");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Grayscale(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/HueTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/HueTest.cs
deleted file mode 100644
index a56aec9ec..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/HueTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="HueTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class HueTest : FileTestBase
-    {
-        public static readonly TheoryData<int> HueValues
-        = new TheoryData<int>
-        {
-            180 ,
-           -180 ,
-        };
-
-        [Theory]
-        [MemberData("HueValues")]
-        public void ImageShouldApplyHueFilter(int value)
-        {
-            string path = CreateOutputDirectory("Hue");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Hue(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/InvertTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/InvertTest.cs
deleted file mode 100644
index 55bfa852b..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/InvertTest.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <copyright file="InvertTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class InvertTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyInvertFilter()
-        {
-            string path = CreateOutputDirectory("Invert");
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Invert()
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyInvertFilterInBox()
-        {
-            string path = CreateOutputDirectory("Invert");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Invert(new Rectangle(10, 10, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/KodachromeTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/KodachromeTest.cs
deleted file mode 100644
index adb7cb36d..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/KodachromeTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="KodachromeTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class KodachromeTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyKodachromeFilter()
-        {
-            string path = CreateOutputDirectory("Kodachrome");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Kodachrome()
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/LomographTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/LomographTest.cs
deleted file mode 100644
index 79a7aa3ba..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/LomographTest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <copyright file="LomographTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class LomographTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyLomographFilter()
-        {
-            string path = CreateOutputDirectory("Lomograph");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Lomograph()
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyLomographFilterInBox()
-        {
-            string path = CreateOutputDirectory("Lomograph");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Lomograph(new Rectangle(image.Width / 4, image.Width / 4, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/PolaroidTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/PolaroidTest.cs
deleted file mode 100644
index dc9d3a150..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/PolaroidTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="PolaroidTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class PolaroidTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyPolaroidFilter()
-        {
-            string path = CreateOutputDirectory("Polaroid");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Polaroid()
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/SaturationTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/SaturationTest.cs
deleted file mode 100644
index 5fe4c3e00..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/SaturationTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="SaturationTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class SaturationTest : FileTestBase
-    {
-        public static readonly TheoryData<int> SaturationValues
-        = new TheoryData<int>
-        {
-            50 ,
-           -50 ,
-        };
-
-        [Theory]
-        [MemberData("SaturationValues")]
-        public void ImageShouldApplySaturationFilter(int value)
-        {
-            string path = CreateOutputDirectory("Saturation");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Saturation(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/SepiaTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/SepiaTest.cs
deleted file mode 100644
index b5e4d3105..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/SepiaTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="SepiaTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class SepiaTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplySepiaFilter()
-        {
-            string path = CreateOutputDirectory("Sepia");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Sepia()
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Filters/VignetteTest.cs b/tests/ImageSharp.Tests46/Processors/Filters/VignetteTest.cs
deleted file mode 100644
index 3fddad1da..000000000
--- a/tests/ImageSharp.Tests46/Processors/Filters/VignetteTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// <copyright file="VignetteTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class VignetteTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyVignetteFilter()
-        {
-            string path = CreateOutputDirectory("Vignette");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Vignette()
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyVignetteFilterColor()
-        {
-            string path = CreateOutputDirectory("Vignette");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("Color");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Vignette(Color.HotPink)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyVignetteFilterRadius()
-        {
-            string path = CreateOutputDirectory("Vignette");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("Radius");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Vignette(image.Width / 4, image.Height / 4)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Fact]
-        public void ImageShouldApplyVignetteFilterInBox()
-        {
-            string path = CreateOutputDirectory("Vignette");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName("InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Vignette(new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/AutoOrientTests.cs b/tests/ImageSharp.Tests46/Processors/Samplers/AutoOrientTests.cs
deleted file mode 100644
index 97cd71718..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/AutoOrientTests.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// <copyright file="RotateFlipTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-    using Xunit;
-
-    public class AutoOrientTests : FileTestBase
-    {
-        public static readonly TheoryData<RotateType, FlipType, ushort> OrientationValues
-            = new TheoryData<RotateType, FlipType, ushort>
-        {
-            { RotateType.None,      FlipType.None,       0 },
-            { RotateType.None,      FlipType.None,       1 },
-            { RotateType.None,      FlipType.Horizontal, 2 },
-            { RotateType.Rotate180, FlipType.None,       3 },
-            { RotateType.Rotate180, FlipType.Horizontal, 4 },
-            { RotateType.Rotate90,  FlipType.Horizontal, 5 },
-            { RotateType.Rotate270, FlipType.None,       6 },
-            { RotateType.Rotate90,  FlipType.Vertical,   7 },
-            { RotateType.Rotate90,  FlipType.None,       8 },
-        };
-
-        [Theory]
-        [MemberData("OrientationValues")]
-        public void ImageShouldFlip(RotateType rotateType, FlipType flipType, ushort orientation)
-        {
-            string path = CreateOutputDirectory("AutoOrient");
-
-            string file = TestImages.Bmp.F;
-
-            using (FileStream stream = File.OpenRead(file))
-            {
-                string filename = Path.GetFileNameWithoutExtension(file) + "-" + orientation + Path.GetExtension(file);
-
-                Image image = new Image(stream);
-                image.ExifProfile = new ExifProfile();
-                image.ExifProfile.SetValue(ExifTag.Orientation, orientation);
-
-                using (FileStream before = File.OpenWrite($"{path}/before-{filename}"))
-                {
-                    using (FileStream after = File.OpenWrite($"{path}/after-{filename}"))
-                    {
-                        image.RotateFlip(rotateType, flipType)
-                             .Save(before)
-                             .AutoOrient()
-                             .Save(after);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/CropTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/CropTest.cs
deleted file mode 100644
index 9e9dd34db..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/CropTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="CropTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class CropTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyCropSampler()
-        {
-            string path = CreateOutputDirectory("Crop");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Crop(image.Width / 2, image.Height / 2)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/DetectEdgesTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/DetectEdgesTest.cs
deleted file mode 100644
index ce088eac4..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/DetectEdgesTest.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// <copyright file="DetectEdgesTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class DetectEdgesTest : FileTestBase
-    {
-        public static readonly TheoryData<EdgeDetection> DetectEdgesFilters
-        = new TheoryData<EdgeDetection>
-        {
-            EdgeDetection.Kayyali,
-            EdgeDetection.Kirsch,
-            EdgeDetection.Lapacian3X3,
-            EdgeDetection.Lapacian5X5,
-            EdgeDetection.LaplacianOfGaussian,
-            EdgeDetection.Prewitt,
-            EdgeDetection.RobertsCross,
-            EdgeDetection.Robinson,
-            EdgeDetection.Scharr,
-            EdgeDetection.Sobel,
-        };
-
-        [Theory]
-        [MemberData(nameof(DetectEdgesFilters))]
-        public void ImageShouldApplyDetectEdgesFilter(EdgeDetection detector)
-        {
-            string path = CreateOutputDirectory("DetectEdges");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(detector);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.DetectEdges(detector)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("DetectEdgesFilters")]
-        public void ImageShouldApplyDetectEdgesFilterInBox(EdgeDetection detector)
-        {
-            string path = CreateOutputDirectory("DetectEdges");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(detector + "-InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.DetectEdges(detector, new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/EntropyCropTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/EntropyCropTest.cs
deleted file mode 100644
index fdbbc5cde..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/EntropyCropTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="EntropyCropTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class EntropyCropTest : FileTestBase
-    {
-        public static readonly TheoryData<float> EntropyCropValues
-        = new TheoryData<float>
-        {
-            .25f ,
-            .75f ,
-        };
-
-        [Theory]
-        [MemberData("EntropyCropValues")]
-        public void ImageShouldApplyEntropyCropSampler(float value)
-        {
-            string path = CreateOutputDirectory("EntropyCrop");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.EntropyCrop(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/FlipTests.cs b/tests/ImageSharp.Tests46/Processors/Samplers/FlipTests.cs
deleted file mode 100644
index c07071e70..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/FlipTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <copyright file="RotateFlipTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class FlipTests : FileTestBase
-    {
-        public static readonly TheoryData<FlipType> FlipValues
-            = new TheoryData<FlipType>
-        {
-            { FlipType.None },
-            { FlipType.Vertical },
-            { FlipType.Horizontal },
-        };
-
-        [Theory]
-        [MemberData("FlipValues")]
-        public void ImageShouldFlip(FlipType flipType)
-        {
-            string path = CreateOutputDirectory("Flip");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(flipType);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Flip(flipType)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/GuassianBlurTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/GuassianBlurTest.cs
deleted file mode 100644
index cd1cc5638..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/GuassianBlurTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="GuassianBlurTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class GuassianBlurTest : FileTestBase
-    {
-        public static readonly TheoryData<int> GuassianBlurValues
-        = new TheoryData<int>
-        {
-            3 ,
-            5 ,
-        };
-
-        [Theory]
-        [MemberData("GuassianBlurValues")]
-        public void ImageShouldApplyGuassianBlurFilter(int value)
-        {
-            string path = CreateOutputDirectory("GuassianBlur");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.GuassianBlur(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/GuassianSharpenTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/GuassianSharpenTest.cs
deleted file mode 100644
index 5672b5bae..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/GuassianSharpenTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <copyright file="GuassianSharpenTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class GuassianSharpenTest : FileTestBase
-    {
-        public static readonly TheoryData<int> GuassianSharpenValues
-        = new TheoryData<int>
-        {
-            3 ,
-            5 ,
-        };
-
-        [Theory]
-        [MemberData("GuassianSharpenValues")]
-        public void ImageShouldApplyGuassianSharpenFilter(int value)
-        {
-            string path = CreateOutputDirectory("GuassianSharpen");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.GuassianSharpen(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/OilPaintTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/OilPaintTest.cs
deleted file mode 100644
index 8b5ff3f51..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/OilPaintTest.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// <copyright file="OilPaintTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using System.IO;
-
-    using Xunit;
-
-    public class OilPaintTest : FileTestBase
-    {
-        public static readonly TheoryData<Tuple<int, int>> OilPaintValues
-            = new TheoryData<Tuple<int, int>>
-            {
-                new Tuple<int, int>(15,10),
-                new Tuple<int, int>(6,5)
-            };
-
-        [Theory]
-        [MemberData(nameof(OilPaintValues))]
-        public void ImageShouldApplyOilPaintFilter(Tuple<int, int> value)
-        {
-            string path = CreateOutputDirectory("OilPaint");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.OilPaint(value.Item1, value.Item2)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData(nameof(OilPaintValues))]
-        public void ImageShouldApplyOilPaintFilterInBox(Tuple<int, int> value)
-        {
-            string path = CreateOutputDirectory("OilPaint");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value + "-InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.OilPaint(value.Item1, value.Item2, new Rectangle(10, 10, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/PadTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/PadTest.cs
deleted file mode 100644
index 5a33aac2b..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/PadTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// <copyright file="PadTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class PadTest : FileTestBase
-    {
-        [Fact]
-        public void ImageShouldApplyPadSampler()
-        {
-            string path = CreateOutputDirectory("Pad");
-
-            foreach (TestFile file in Files)
-            {
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
-                {
-                    image.Pad(image.Width + 50, image.Height + 50)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/PixelateTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/PixelateTest.cs
deleted file mode 100644
index 397bdef06..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/PixelateTest.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <copyright file="PixelateTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class PixelateTest : FileTestBase
-    {
-        public static readonly TheoryData<int> PixelateValues
-        = new TheoryData<int>
-        {
-            4 ,
-            8
-        };
-
-        [Theory]
-        [MemberData(nameof(PixelateValues))]
-        public void ImageShouldApplyPixelateFilter(int value)
-        {
-            string path = CreateOutputDirectory("Pixelate");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Pixelate(value)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData(nameof(PixelateValues))]
-        public void ImageShouldApplyPixelateFilterInBox(int value)
-        {
-            string path = CreateOutputDirectory("Pixelate");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value + "-InBox");
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Pixelate(value, new Rectangle(10, 10, image.Width / 2, image.Height / 2))
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/ResizeTests.cs b/tests/ImageSharp.Tests46/Processors/Samplers/ResizeTests.cs
deleted file mode 100644
index 876ba7ebc..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/ResizeTests.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-// <copyright file="ResizeTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class ResizeTests : FileTestBase
-    {
-        public static readonly TheoryData<string, IResampler> ReSamplers =
-            new TheoryData<string, IResampler>
-            {
-                { "Bicubic", new BicubicResampler() },
-                { "Triangle", new TriangleResampler() },
-                { "NearestNeighbor", new NearestNeighborResampler() },
-                // Perf: Enable for local testing only
-                //{ "Box", new BoxResampler() },
-                //{ "Lanczos3", new Lanczos3Resampler() },
-                //{ "Lanczos5", new Lanczos5Resampler() },
-                //{ "Lanczos8", new Lanczos8Resampler() },
-                { "MitchellNetravali", new MitchellNetravaliResampler() },
-                //{ "Hermite", new HermiteResampler() },
-                //{ "Spline", new SplineResampler() },
-                //{ "Robidoux", new RobidouxResampler() },
-                //{ "RobidouxSharp", new RobidouxSharpResampler() },
-                //{ "RobidouxSoft", new RobidouxSoftResampler() },
-                //{ "Welch", new WelchResampler() }
-            };
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResize(string name, IResampler sampler)
-        {
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Resize(image.Width / 2, image.Height / 2, sampler, true)
-                    //image.Resize(555, 275, sampler, false)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWidthAndKeepAspect(string name, IResampler sampler)
-        {
-            name = name + "-FixedWidth";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Resize(image.Width / 3, 0, sampler, false)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeHeightAndKeepAspect(string name, IResampler sampler)
-        {
-            name = name + "-FixedHeight";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Resize(0, image.Height / 3, sampler, false)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithCropWidthMode(string name, IResampler sampler)
-        {
-            name = name + "-CropWidth";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(image.Width / 2, image.Height)
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithCropHeightMode(string name, IResampler sampler)
-        {
-            name = name + "-CropHeight";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(image.Width, image.Height / 2)
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithPadMode(string name, IResampler sampler)
-        {
-            name = name + "-Pad";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Size = new Size(image.Width + 200, image.Height),
-                        Mode = ResizeMode.Pad
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithBoxPadMode(string name, IResampler sampler)
-        {
-            name = name + "-BoxPad";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(image.Width + 200, image.Height + 200),
-                        Mode = ResizeMode.BoxPad
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithMaxMode(string name, IResampler sampler)
-        {
-            name = name + "Max";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(300, 300),
-                        Mode = ResizeMode.Max
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithMinMode(string name, IResampler sampler)
-        {
-            name = name + "-Min";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(image.Width - 50, image.Height - 25),
-                        Mode = ResizeMode.Min
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("ReSamplers")]
-        public void ImageShouldResizeWithStretchMode(string name, IResampler sampler)
-        {
-            name = name + "Stretch";
-
-            string path = CreateOutputDirectory("Resize");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(name);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    ResizeOptions options = new ResizeOptions()
-                    {
-                        Sampler = sampler,
-                        Size = new Size(image.Width - 200, image.Height),
-                        Mode = ResizeMode.Stretch
-                    };
-
-                    image.Resize(options)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [InlineData(-2, 0)]
-        [InlineData(-1, 0)]
-        [InlineData(0, 1)]
-        [InlineData(1, 0)]
-        [InlineData(2, 0)]
-        [InlineData(2, 0)]
-        public static void Lanczos3WindowOscillatesCorrectly(float x, float expected)
-        {
-            Lanczos3Resampler sampler = new Lanczos3Resampler();
-            float result = sampler.GetValue(x);
-
-            Assert.Equal(result, expected);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/RotateFlipTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/RotateFlipTest.cs
deleted file mode 100644
index 04704b672..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/RotateFlipTest.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// <copyright file="RotateFlipTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class RotateFlipTest : FileTestBase
-    {
-        public static readonly TheoryData<RotateType, FlipType> RotateFlipValues
-            = new TheoryData<RotateType, FlipType>
-        {
-            { RotateType.None, FlipType.Vertical },
-            { RotateType.None, FlipType.Horizontal },
-            { RotateType.Rotate90, FlipType.None },
-            { RotateType.Rotate180, FlipType.None },
-            { RotateType.Rotate270, FlipType.None },
-        };
-
-        [Theory]
-        [MemberData("RotateFlipValues")]
-        public void ImageShouldRotateFlip(RotateType rotateType, FlipType flipType)
-        {
-            string path = CreateOutputDirectory("RotateFlip");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(rotateType + "-" + flipType);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.RotateFlip(rotateType, flipType)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/RotateTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/RotateTest.cs
deleted file mode 100644
index 96fb39e07..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/RotateTest.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// <copyright file="RotateTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class RotateTest : FileTestBase
-    {
-        public static readonly TheoryData<float> RotateFloatValues
-            = new TheoryData<float>
-        {
-             170 ,
-            -170 ,
-        };
-
-        public static readonly TheoryData<RotateType> RotateEnumValues
-            = new TheoryData<RotateType>
-        {
-            RotateType.None,
-            RotateType.Rotate90,
-            RotateType.Rotate180,
-            RotateType.Rotate270
-        };
-
-        [Theory]
-        [MemberData("RotateFloatValues")]
-        public void ImageShouldApplyRotateSampler(float value)
-        {
-            string path = CreateOutputDirectory("Rotate");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Rotate(value)
-                          .Save(output);
-                }
-            }
-        }
-
-        [Theory]
-        [MemberData("RotateEnumValues")]
-        public void ImageShouldApplyRotateSampler(RotateType value)
-        {
-            string path = CreateOutputDirectory("Rotate");
-
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(value);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Rotate(value)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Processors/Samplers/SkewTest.cs b/tests/ImageSharp.Tests46/Processors/Samplers/SkewTest.cs
deleted file mode 100644
index 11db7e691..000000000
--- a/tests/ImageSharp.Tests46/Processors/Samplers/SkewTest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <copyright file="SkewTest.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-
-    using Xunit;
-
-    public class SkewTest : FileTestBase
-    {
-        public static readonly TheoryData<float, float> SkewValues
-        = new TheoryData<float, float>
-        {
-            { 20, 10 },
-            { -20, -10 }
-        };
-
-        [Theory]
-        [MemberData("SkewValues")]
-        public void ImageShouldApplySkewSampler(float x, float y)
-        {
-            string path = CreateOutputDirectory("Skew");
-
-            // Matches live example 
-            // http://www.w3schools.com/css/tryit.asp?filename=trycss3_transform_skew
-            foreach (TestFile file in Files)
-            {
-                string filename = file.GetFileName(x + "-" + y);
-                Image image = file.CreateImage();
-
-                using (FileStream output = File.OpenWrite($"{path}/{filename}"))
-                {
-                    image.Skew(x, y)
-                          .Save(output);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/Profiles/Exif/ExifProfileTests.cs b/tests/ImageSharp.Tests46/Profiles/Exif/ExifProfileTests.cs
deleted file mode 100644
index fa7347a97..000000000
--- a/tests/ImageSharp.Tests46/Profiles/Exif/ExifProfileTests.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-// <copyright file="ExifProfileTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System;
-    using System.Collections;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using Xunit;
-
-    public class ExifProfileTests
-    {
-        [Fact]
-        public void Constructor()
-        {
-            using (FileStream stream = File.OpenRead(TestImages.Jpeg.Calliphora))
-            {
-                Image image = new Image(stream);
-
-                Assert.Null(image.ExifProfile);
-
-                image.ExifProfile = new ExifProfile();
-                image.ExifProfile.SetValue(ExifTag.Copyright, "Dirk Lemstra");
-
-                image = WriteAndRead(image);
-
-                Assert.NotNull(image.ExifProfile);
-                Assert.Equal(1, image.ExifProfile.Values.Count());
-
-                ExifValue value = image.ExifProfile.Values.FirstOrDefault(val => val.Tag == ExifTag.Copyright);
-                TestValue(value, "Dirk Lemstra");
-            }
-        }
-
-        [Fact]
-        public void ConstructorEmpty()
-        {
-            new ExifProfile((byte[])null);
-            new ExifProfile(new byte[] { });
-        }
-
-        [Fact]
-        public void ConstructorCopy()
-        {
-            Assert.Throws<ArgumentNullException>(() => { new ExifProfile((ExifProfile)null); });
-
-            ExifProfile profile = GetExifProfile();
-
-            ExifProfile clone = new ExifProfile(profile);
-            TestProfile(clone);
-
-            profile.SetValue(ExifTag.ColorSpace, (ushort)2);
-
-            clone = new ExifProfile(profile);
-            TestProfile(clone);
-        }
-
-        [Fact]
-        public void WriteFraction()
-        {
-            using (MemoryStream memStream = new MemoryStream())
-            {
-                double exposureTime = 1.0 / 1600;
-
-                ExifProfile profile = GetExifProfile();
-
-                profile.SetValue(ExifTag.ExposureTime, new Rational(exposureTime));
-
-                Image image = new Image(1, 1);
-                image.ExifProfile = profile;
-
-                image.SaveAsJpeg(memStream);
-
-                memStream.Position = 0;
-                image = new Image(memStream);
-
-                profile = image.ExifProfile;
-                Assert.NotNull(profile);
-
-                ExifValue value = profile.GetValue(ExifTag.ExposureTime);
-                Assert.NotNull(value);
-                Assert.NotEqual(exposureTime, ((Rational)value.Value).ToDouble());
-
-                memStream.Position = 0;
-                profile = GetExifProfile();
-
-                profile.SetValue(ExifTag.ExposureTime, new Rational(exposureTime, true));
-                image.ExifProfile = profile;
-
-                image.SaveAsJpeg(memStream);
-
-                memStream.Position = 0;
-                image = new Image(memStream);
-
-                profile = image.ExifProfile;
-                Assert.NotNull(profile);
-
-                value = profile.GetValue(ExifTag.ExposureTime);
-                Assert.Equal(exposureTime, ((Rational)value.Value).ToDouble());
-            }
-        }
-
-        [Fact]
-        public void ReadWriteInfinity()
-        {
-            using (FileStream stream = File.OpenRead(TestImages.Jpeg.Floorplan))
-            {
-                Image image = new Image(stream);
-                image.ExifProfile.SetValue(ExifTag.ExposureBiasValue, new SignedRational(double.PositiveInfinity));
-
-                image = WriteAndRead(image);
-                ExifValue value = image.ExifProfile.GetValue(ExifTag.ExposureBiasValue);
-                Assert.NotNull(value);
-                Assert.Equal(new SignedRational(double.PositiveInfinity), value.Value);
-
-                image.ExifProfile.SetValue(ExifTag.ExposureBiasValue, new SignedRational(double.NegativeInfinity));
-
-                image = WriteAndRead(image);
-                value = image.ExifProfile.GetValue(ExifTag.ExposureBiasValue);
-                Assert.NotNull(value);
-                Assert.Equal(new SignedRational(double.NegativeInfinity), value.Value);
-
-                image.ExifProfile.SetValue(ExifTag.FlashEnergy, new Rational(double.NegativeInfinity));
-
-                image = WriteAndRead(image);
-                value = image.ExifProfile.GetValue(ExifTag.FlashEnergy);
-                Assert.NotNull(value);
-                Assert.Equal(new Rational(double.PositiveInfinity), value.Value);
-            }
-        }
-
-        [Fact]
-        public void SetValue()
-        {
-            Rational[] latitude = new Rational[] { new Rational(12.3), new Rational(4.56), new Rational(789.0) };
-
-            using (FileStream stream = File.OpenRead(TestImages.Jpeg.Floorplan))
-            {
-                Image image = new Image(stream);
-                image.ExifProfile.SetValue(ExifTag.Software, "ImageSharp");
-
-                ExifValue value = image.ExifProfile.GetValue(ExifTag.Software);
-                TestValue(value, "ImageSharp");
-
-                Assert.Throws<ArgumentException>(() => { value.Value = 15; });
-
-                image.ExifProfile.SetValue(ExifTag.ShutterSpeedValue, new SignedRational(75.55));
-
-                value = image.ExifProfile.GetValue(ExifTag.ShutterSpeedValue);
-
-                TestValue(value, new SignedRational(7555, 100));
-
-                Assert.Throws<ArgumentException>(() => { value.Value = 75; });
-
-                image.ExifProfile.SetValue(ExifTag.XResolution, new Rational(150.0));
-
-                value = image.ExifProfile.GetValue(ExifTag.XResolution);
-                TestValue(value, new Rational(150, 1));
-
-                Assert.Throws<ArgumentException>(() => { value.Value = "ImageSharp"; });
-
-                image.ExifProfile.SetValue(ExifTag.ReferenceBlackWhite, null);
-
-                value = image.ExifProfile.GetValue(ExifTag.ReferenceBlackWhite);
-                TestValue(value, (string)null);
-
-                image.ExifProfile.SetValue(ExifTag.GPSLatitude, latitude);
-
-                value = image.ExifProfile.GetValue(ExifTag.GPSLatitude);
-                TestValue(value, latitude);
-
-                image = WriteAndRead(image);
-
-                Assert.NotNull(image.ExifProfile);
-                Assert.Equal(17, image.ExifProfile.Values.Count());
-
-                value = image.ExifProfile.GetValue(ExifTag.Software);
-                TestValue(value, "ImageSharp");
-
-                value = image.ExifProfile.GetValue(ExifTag.ShutterSpeedValue);
-                TestValue(value, new SignedRational(75.55));
-
-                value = image.ExifProfile.GetValue(ExifTag.XResolution);
-                TestValue(value, new Rational(150.0));
-
-                value = image.ExifProfile.GetValue(ExifTag.ReferenceBlackWhite);
-                Assert.Null(value);
-
-                value = image.ExifProfile.GetValue(ExifTag.GPSLatitude);
-                TestValue(value, latitude);
-
-                image.ExifProfile.Parts = ExifParts.ExifTags;
-
-                image = WriteAndRead(image);
-
-                Assert.NotNull(image.ExifProfile);
-                Assert.Equal(8, image.ExifProfile.Values.Count());
-
-                Assert.NotNull(image.ExifProfile.GetValue(ExifTag.ColorSpace));
-                Assert.True(image.ExifProfile.RemoveValue(ExifTag.ColorSpace));
-                Assert.False(image.ExifProfile.RemoveValue(ExifTag.ColorSpace));
-                Assert.Null(image.ExifProfile.GetValue(ExifTag.ColorSpace));
-
-                Assert.Equal(7, image.ExifProfile.Values.Count());
-            }
-        }
-
-        [Fact]
-        public void Values()
-        {
-            ExifProfile profile = GetExifProfile();
-
-            TestProfile(profile);
-
-            var thumbnail = profile.CreateThumbnail<Color, uint>();
-            Assert.NotNull(thumbnail);
-            Assert.Equal(256, thumbnail.Width);
-            Assert.Equal(170, thumbnail.Height);
-        }
-
-        [Fact]
-        public void WriteTooLargeProfile()
-        {
-            StringBuilder junk = new StringBuilder();
-            for (int i = 0; i < 65500; i++)
-                junk.Append("I");
-
-            Image image = new Image(100, 100);
-            image.ExifProfile = new ExifProfile();
-            image.ExifProfile.SetValue(ExifTag.ImageDescription, junk.ToString());
-
-            using (MemoryStream memStream = new MemoryStream())
-            {
-                Assert.Throws<ImageFormatException>(() => image.SaveAsJpeg(memStream));
-            }
-        }
-
-        private static ExifProfile GetExifProfile()
-        {
-            using (FileStream stream = File.OpenRead(TestImages.Jpeg.Floorplan))
-            {
-                Image image = new Image(stream);
-
-                ExifProfile profile = image.ExifProfile;
-                Assert.NotNull(profile);
-
-                return profile;
-            }
-        }
-
-        private static Image WriteAndRead(Image image)
-        {
-            using (MemoryStream memStream = new MemoryStream())
-            {
-                image.SaveAsJpeg(memStream);
-
-                memStream.Position = 0;
-                return new Image(memStream);
-            }
-        }
-
-        private static void TestProfile(ExifProfile profile)
-        {
-            Assert.NotNull(profile);
-
-            Assert.Equal(16, profile.Values.Count());
-
-            foreach (ExifValue value in profile.Values)
-            {
-                Assert.NotNull(value.Value);
-
-                if (value.Tag == ExifTag.Software)
-                    Assert.Equal("Windows Photo Editor 10.0.10011.16384", value.ToString());
-
-                if (value.Tag == ExifTag.XResolution)
-                    Assert.Equal(new Rational(300.0), value.Value);
-
-                if (value.Tag == ExifTag.PixelXDimension)
-                    Assert.Equal(2338U, value.Value);
-            }
-        }
-
-        private static void TestValue(ExifValue value, string expected)
-        {
-            Assert.NotNull(value);
-            Assert.Equal(expected, value.Value);
-        }
-
-        private static void TestValue(ExifValue value, Rational expected)
-        {
-            Assert.NotNull(value);
-            Assert.Equal(expected, value.Value);
-        }
-
-        private static void TestValue(ExifValue value, SignedRational expected)
-        {
-            Assert.NotNull(value);
-            Assert.Equal(expected, value.Value);
-        }
-
-        private static void TestValue(ExifValue value, Rational[] expected)
-        {
-            Assert.NotNull(value);
-
-            Assert.Equal(expected, (ICollection)value.Value);
-        }
-
-        private static void TestValue(ExifValue value, double expected)
-        {
-            Assert.NotNull(value);
-            Assert.Equal(expected, value.Value);
-        }
-
-        private static void TestValue(ExifValue value, double[] expected)
-        {
-            Assert.NotNull(value);
-
-            Assert.Equal(expected, (ICollection)value.Value);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/Profiles/Exif/ExifTagDescriptionAttributeTests.cs b/tests/ImageSharp.Tests46/Profiles/Exif/ExifTagDescriptionAttributeTests.cs
deleted file mode 100644
index 4f77dc11a..000000000
--- a/tests/ImageSharp.Tests46/Profiles/Exif/ExifTagDescriptionAttributeTests.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// <copyright file="ExifProfileTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using Xunit;
-
-    public class ExifDescriptionAttributeTests
-    {
-        [Fact]
-        public void Test_ExifTag()
-        {
-            var exifProfile = new ExifProfile();
-
-            exifProfile.SetValue(ExifTag.ResolutionUnit, (ushort)1);
-            ExifValue value = exifProfile.GetValue(ExifTag.ResolutionUnit);
-            Assert.Equal("None", value.ToString());
-
-            exifProfile.SetValue(ExifTag.ResolutionUnit, (ushort)2);
-            value = exifProfile.GetValue(ExifTag.ResolutionUnit);
-            Assert.Equal("Inches", value.ToString());
-
-            exifProfile.SetValue(ExifTag.ResolutionUnit, (ushort)3);
-            value = exifProfile.GetValue(ExifTag.ResolutionUnit);
-            Assert.Equal("Centimeter", value.ToString());
-
-            exifProfile.SetValue(ExifTag.ResolutionUnit, (ushort)4);
-            value = exifProfile.GetValue(ExifTag.ResolutionUnit);
-            Assert.Equal("4", value.ToString());
-
-            exifProfile.SetValue(ExifTag.ImageWidth, 123);
-            value = exifProfile.GetValue(ExifTag.ImageWidth);
-            Assert.Equal("123", value.ToString());
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/Profiles/Exif/ExifValueTests.cs b/tests/ImageSharp.Tests46/Profiles/Exif/ExifValueTests.cs
deleted file mode 100644
index e79cb7186..000000000
--- a/tests/ImageSharp.Tests46/Profiles/Exif/ExifValueTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// <copyright file="ExifValueTests.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp.Tests
-{
-    using System.IO;
-    using System.Linq;
-    using Xunit;
-
-    public class ExifValueTests
-    {
-        private static ExifValue GetExifValue()
-        {
-            using (FileStream stream = File.OpenRead(TestImages.Jpeg.Floorplan))
-            {
-                Image image = new Image(stream);
-
-                ExifProfile profile = image.ExifProfile;
-                Assert.NotNull(profile);
-
-                return profile.Values.First();
-            }
-        }
-
-        [Fact]
-        public void IEquatable()
-        {
-            ExifValue first = GetExifValue();
-            ExifValue second = GetExifValue();
-
-            Assert.True(first == second);
-            Assert.True(first.Equals(second));
-            Assert.True(first.Equals((object)second));
-        }
-
-        [Fact]
-        public void Properties()
-        {
-            ExifValue value = GetExifValue();
-
-            Assert.Equal(ExifDataType.Ascii, value.DataType);
-            Assert.Equal(ExifTag.GPSDOP, value.Tag);
-            Assert.Equal(false, value.IsArray);
-            Assert.Equal("Windows Photo Editor 10.0.10011.16384", value.ToString());
-            Assert.Equal("Windows Photo Editor 10.0.10011.16384", value.Value);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/Properties/AssemblyInfo.cs b/tests/ImageSharp.Tests46/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3d57ceff5..000000000
--- a/tests/ImageSharp.Tests46/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ImageSharp.Tests")]
-[assembly: AssemblyDescription("A cross-platform library for processing of image files written in C#")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ImageSharp.Tests")]
-[assembly: AssemblyCopyright("Copyright © James Jackson-South and contributors.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f836e8e6-b4d9-4208-8346-140c74678b91")]
diff --git a/tests/ImageSharp.Tests46/TestFile.cs b/tests/ImageSharp.Tests46/TestFile.cs
deleted file mode 100644
index f7e7f8517..000000000
--- a/tests/ImageSharp.Tests46/TestFile.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// <copyright file="TestImage.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.IO;
-
-namespace ImageSharp.Tests
-{
-    public class TestFile
-    {
-        private readonly Image image;
-        private readonly string file;
-
-        public TestFile(string file)
-        {
-            this.file = file;
-
-            using (FileStream stream = File.OpenRead(file))
-            {
-                this.image = new Image(stream);
-            }
-        }
-
-        public string FileName
-        {
-            get
-            {
-                return Path.GetFileName(this.file);
-            }
-        }
-
-        public string FileNameWithoutExtension
-        {
-            get
-            {
-                return Path.GetFileNameWithoutExtension(this.file);
-            }
-        }
-
-        public string GetFileName(object value)
-        {
-            return this.FileNameWithoutExtension + "-" + value + Path.GetExtension(this.file);
-        }
-
-        public string GetFileNameWithoutExtension(object value)
-        {
-            return this.FileNameWithoutExtension + "-" + value;
-        }
-
-        public Image CreateImage()
-        {
-            return new Image(this.image);
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/TestImages.cs b/tests/ImageSharp.Tests46/TestImages.cs
deleted file mode 100644
index edb2449e8..000000000
--- a/tests/ImageSharp.Tests46/TestImages.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <copyright file="FileTestBase.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-using System.Diagnostics.PerformanceData;
-
-namespace ImageSharp.Tests
-{
-    /// <summary>
-    /// Class that contains all the test images.
-    /// </summary>
-    public static class TestImages
-    {
-        public static class Png
-        {
-            private static readonly string folder = "../../TestImages/Formats/Png/";
-
-            public static string P1 => folder + "pl.png";
-            public static string Pd => folder + "pd.png";
-            public static string Blur => folder + "blur.png";
-            public static string Indexed => folder + "indexed.png";
-            public static string Splash => folder + "splash.png";
-        }
-
-        public static class Jpeg
-        {
-            private const string Folder = "../../TestImages/Formats/Jpg/";
-            public const string Cmyk = Folder + "cmyk.jpg";
-            public const string Exif = Folder + "exif.jpg";
-            public const string Floorplan = Folder + "Floorplan.jpeg";
-            public const string Calliphora = Folder + "Calliphora.jpg";
-            public const string Turtle = Folder + "turtle.jpg";
-            public const string Fb = Folder + "fb.jpg";
-            public const string Progress = Folder + "progress.jpg";
-            public const string GammaDalaiLamaGray = Folder + "gamma_dalai_lama_gray.jpg";
-
-            public const string Geneserath = Folder + "geneserath.jpg";
-
-            public static readonly string[] All = new[]
-            {
-                Cmyk, Exif, Floorplan, Calliphora, Turtle, Fb, Progress, GammaDalaiLamaGray, Geneserath
-            };
-        }
-
-        public static class Bmp
-        {
-            private static readonly string folder = "../../TestImages/Formats/Bmp/";
-
-            public static string Car => folder + "Car.bmp";
-            public static string F => folder + "F.bmp";
-            public static string NegHeight => folder + "neg_height.bmp";
-
-            public static string[] All => new[] {Car, F, NegHeight};
-        }
-
-        public static class Gif
-        {
-            private static readonly string folder = "../../TestImages/Formats/Gif/";
-
-            public static string Rings => folder + "rings.gif";
-            public static string Giphy => folder + "giphy.gif";
-        }
-    }
-}
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/Car.bmp b/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/Car.bmp
deleted file mode 100644
index edaf3a8e4..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/Car.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d3a4a30cd67db6ded1e57126c7ba275404703e64b3dfb1c9c711128c15b0124
-size 810054
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/F.bmp b/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/F.bmp
deleted file mode 100644
index d95598bef..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/F.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6da008d2b285b2db946e6d4ebf8569b0ddd4a05ef273b38304cb65afccac87b3
-size 65502
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/neg_height.bmp b/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/neg_height.bmp
deleted file mode 100644
index d0b99a902..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Bmp/neg_height.bmp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81437b88a5d92fcb545fae4991643a0c73d95d0277dac0b79074971780008c8c
-size 6220854
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Gif/giphy.gif b/tests/ImageSharp.Tests46/TestImages/Formats/Gif/giphy.gif
deleted file mode 100644
index 029afdec6..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Gif/giphy.gif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f42abd9f3e493a0acd5303ab0d37a6179835c5a14364a1f001abd9d9e906f96
-size 53655
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Gif/rings.gif b/tests/ImageSharp.Tests46/TestImages/Formats/Gif/rings.gif
deleted file mode 100644
index acd5d6339..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Gif/rings.gif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:716448da88152225767c024aac498f5b7562b6e8391907cefc9d03dba40050fd
-size 53435
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Calliphora.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Calliphora.jpg
deleted file mode 100644
index aa3fdef01..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Calliphora.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67172fcab405f914587b88cd1106328e6b24ab59d622ba509dcc99509951ff5c
-size 254766
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Floorplan.jpeg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Floorplan.jpeg
deleted file mode 100644
index 6f439d220..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/Floorplan.jpeg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de00b34b78dfa0886c93d8dd5cede27b4940d5c620e44631e77e6dc8838befc3
-size 161577
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/cmyk.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/cmyk.jpg
deleted file mode 100644
index 2fe8f0a61..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/cmyk.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33e3546a64df7fa1d528441926421b193e399a83490a6307762fb7eee9640bf0
-size 611572
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/exif.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/exif.jpg
deleted file mode 100644
index cba862660..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/exif.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a9d04b92d0de5836c59ede8ae421235488e4031e893e07b1fe7e4b78f6a9901
-size 32764
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/fb.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/fb.jpg
deleted file mode 100644
index 7241890e2..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/fb.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93bb4d6281dc1e845db57e836e0dca30b7a4062e81044efb27ad4d8b1a33130c
-size 15787
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg
deleted file mode 100644
index c305caef4..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d92a88b04518e266b98d9d2f5b4eb88f3f91c332d3397ea859bab8cabc41185
-size 84887
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/geneserath.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/geneserath.jpg
deleted file mode 100644
index af0c04a1c..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/geneserath.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c71e5b1ba181a5b17ba9814c2025650de592efabf4062bd77baa3c8e774df007
-size 223841
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/progress.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/progress.jpg
deleted file mode 100644
index 30b214c22..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/progress.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9a1f0da3c5b3a3e7e7f35abe9f5b458163b48ca56226227b3d3cffe06af1971
-size 44884
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/turtle.jpg b/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/turtle.jpg
deleted file mode 100644
index 07d96543b..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Jpg/turtle.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e5c576b0c5e743cfd498b110305268ecbae63c62061ba6c7eb8e060728191f1
-size 55126
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Png/blur.png b/tests/ImageSharp.Tests46/TestImages/Formats/Png/blur.png
deleted file mode 100644
index 2ac488b7c..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Png/blur.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10df946d3d6a9832bacd9ac2587b890c348d17731412c8fd17c34f66f35d9c94
-size 183768
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Png/indexed.png b/tests/ImageSharp.Tests46/TestImages/Formats/Png/indexed.png
deleted file mode 100644
index f06e1cbd6..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Png/indexed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65566cde707c02757a26fb5fb7702be9c53f55c17a1748d81c384559de2d1173
-size 33529
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Png/pd.png b/tests/ImageSharp.Tests46/TestImages/Formats/Png/pd.png
deleted file mode 100644
index 12fde3229..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Png/pd.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91dd938fb916d368738826741551aea694b340ba3362f56200c5d3c5e5510267
-size 1406
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Png/pl.png b/tests/ImageSharp.Tests46/TestImages/Formats/Png/pl.png
deleted file mode 100644
index 15e991284..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Png/pl.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa550e61fe276d2ebee8666d0cbb811449433edb76e01bcd38cb00c1aafc417e
-size 91
diff --git a/tests/ImageSharp.Tests46/TestImages/Formats/Png/splash.png b/tests/ImageSharp.Tests46/TestImages/Formats/Png/splash.png
deleted file mode 100644
index ca4f86bce..000000000
--- a/tests/ImageSharp.Tests46/TestImages/Formats/Png/splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4c13422913f1c1910f8dd607236e79b4a5c7053deb8ce1c8be8372eca7465fb
-size 245033
diff --git a/tests/ImageSharp.Tests46/app.config b/tests/ImageSharp.Tests46/app.config
deleted file mode 100644
index 5e95024db..000000000
--- a/tests/ImageSharp.Tests46/app.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests46/packages.config b/tests/ImageSharp.Tests46/packages.config
deleted file mode 100644
index e96e29cd6..000000000
--- a/tests/ImageSharp.Tests46/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Numerics.Vectors" version="4.1.1" targetFramework="net461" />
-  <package id="xunit" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net461" />
-</packages>
\ No newline at end of file