Formats per type namespaces

samples/ChangeDefaultEncoderOptions/Program.cs

@@ -3,7 +3,7 @@
 
 using System;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Jpeg;
 
 namespace ChangeDefaultEncoderOptions
 {

src/ImageSharp/Configuration.cs

@@ -7,6 +7,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Gif;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.IO;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/Formats/Bmp/BmpBitsPerPixel.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Enumerates the available bits per pixel for bitmap.

src/ImageSharp/Formats/Bmp/BmpCompression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Defines how the compression type of the image data

src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the bmp format.

src/ImageSharp/Formats/Bmp/BmpConstants.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Defines constants relating to BMPs

src/ImageSharp/Formats/Bmp/BmpDecoder.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Image decoder for generating an image out of a Windows bitmap stream.

src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Performs the bmp decoding operation.

src/ImageSharp/Formats/Bmp/BmpEncoder.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Image encoder for writing an image to a stream as a Windows bitmap.

src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs

@@ -6,7 +6,7 @@ using System.IO;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Image encoder for writing an image to a stream as a Windows bitmap.

src/ImageSharp/Formats/Bmp/BmpFileHeader.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Stores general information about the Bitmap file.

src/ImageSharp/Formats/Bmp/BmpFormat.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the bmp format.

src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Detects bmp file headers

src/ImageSharp/Formats/Bmp/BmpInfoHeader.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// This block of bytes tells the application detailed information

src/ImageSharp/Formats/Bmp/IBmpDecoderOptions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Image decoder options for decoding Windows bitmap streams.

src/ImageSharp/Formats/Bmp/IBmpEncoderOptions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Bmp
 {
     /// <summary>
     /// Configuration options for use during bmp encoding

src/ImageSharp/Formats/Bmp/ImageExtensions.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/Formats/Gif/DisposalMethod.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Provides enumeration for instructing the decoder what to do with the last image

src/ImageSharp/Formats/Gif/GifConfigurationModule.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the gif format.

src/ImageSharp/Formats/Gif/GifConstants.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Constants that define specific points within a gif.

src/ImageSharp/Formats/Gif/GifDecoder.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Decoder for generating an image out of a gif encoded stream.

src/ImageSharp/Formats/Gif/GifDecoderCore.cs

@@ -10,7 +10,7 @@ using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Performs the gif decoding operation.
@@ -521,7 +521,7 @@ namespace SixLabors.ImageSharp.Formats
         /// </summary>
         /// <param name="metaData">The meta data.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void SetFrameMetaData(IMetaData metaData)
+        private void SetFrameMetaData(IFrameMetaData metaData)
         {
             if (this.graphicsControlExtension != null)
             {

src/ImageSharp/Formats/Gif/GifEncoder.cs

@@ -8,7 +8,7 @@ using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Image encoder for writing image data to a stream in gif format.

src/ImageSharp/Formats/Gif/GifEncoderCore.cs

@@ -11,7 +11,7 @@ using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Performs the gif encoding operation.
@@ -288,7 +288,7 @@ namespace SixLabors.ImageSharp.Formats
         /// <param name="metaData">The metadata of the image or frame.</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(IMetaData metaData, EndianBinaryWriter writer, int transparencyIndex)
+        private void WriteGraphicalControlExtension(IFrameMetaData metaData, EndianBinaryWriter writer, int transparencyIndex)
         {
             var extension = new GifGraphicsControlExtension
             {

src/ImageSharp/Formats/Gif/GifFormat.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the gif format.

src/ImageSharp/Formats/Gif/GifImageFormatDetector.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Detects gif file headers

src/ImageSharp/Formats/Gif/IGifDecoderOptions.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Decoder for generating an image out of a gif encoded stream.

src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs

@@ -8,7 +8,7 @@ using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// The configuration options used for encoding gifs

src/ImageSharp/Formats/Gif/ImageExtensions.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/Formats/Gif/LzwDecoder.cs

@@ -5,7 +5,7 @@ using System;
 using System.Buffers;
 using System.IO;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Decompresses and decodes data using the dynamic LZW algorithms.

src/ImageSharp/Formats/Gif/LzwEncoder.cs

@@ -5,7 +5,7 @@ using System;
 using System.Buffers;
 using System.IO;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Encodes and compresses the image data using dynamic Lempel-Ziv compression.

src/ImageSharp/Formats/Gif/PackedField.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Represents a byte of data in a GIF data stream which contains a number

src/ImageSharp/Formats/Gif/Sections/GifGraphicsControlExtension.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// The Graphic Control Extension contains parameters used when

src/ImageSharp/Formats/Gif/Sections/GifImageDescriptor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// Each image in the Data Stream is composed of an Image Descriptor,

src/ImageSharp/Formats/Gif/Sections/GifLogicalScreenDescriptor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Gif
 {
     /// <summary>
     /// The Logical Screen Descriptor contains the parameters

src/ImageSharp/Formats/Jpeg/Common/UnzigData.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg.Common
 {
     /// <summary>
     /// Holds the Jpeg UnZig array in a value/stack type.

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Memory;
 using Block8x8F = SixLabors.ImageSharp.Formats.Jpeg.Common.Block8x8F;
 

src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using Block8x8F = SixLabors.ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder

src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs

@@ -4,6 +4,7 @@
 using System.Buffers;
 using System.IO;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Utils;

src/ImageSharp/Formats/Jpeg/IJpegDecoderOptions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Image decoder for generating an image out of a jpg stream.

src/ImageSharp/Formats/Jpeg/IJpegEncoderOptions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Encoder for writing the data image to a stream in jpeg format.

src/ImageSharp/Formats/Jpeg/ImageExtensions.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the jpeg format.

src/ImageSharp/Formats/Jpeg/JpegDecoder.cs

@@ -5,7 +5,7 @@ using System.IO;
 using SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Image decoder for generating an image out of a jpg stream.

src/ImageSharp/Formats/Jpeg/JpegEncoder.cs

@@ -5,7 +5,7 @@ using System.IO;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Encoder for writing the data image to a stream in jpeg format.

src/ImageSharp/Formats/Jpeg/JpegFormat.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the jpeg format.

src/ImageSharp/Formats/Jpeg/JpegImageFormatDetector.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Detects Jpeg file headers

src/ImageSharp/Formats/Jpeg/JpegSubsample.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Jpeg
 {
     /// <summary>
     /// Enumerates the chroma subsampling method applied to the image.

src/ImageSharp/Formats/Png/Filters/AverageFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// The Average filter uses the average of the two neighboring pixels (left and above) to predict

src/ImageSharp/Formats/Png/Filters/FilterType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// Provides enumeration of the various PNG filter types.

src/ImageSharp/Formats/Png/Filters/NoneFilter.cs

@@ -5,7 +5,7 @@ using System;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// The None filter, the scanline is transmitted unmodified; it is only necessary to

src/ImageSharp/Formats/Png/Filters/PaethFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// The Paeth filter computes a simple linear function of the three neighboring pixels (left, above, upper left),

src/ImageSharp/Formats/Png/Filters/SubFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// The Sub filter transmits the difference between each byte and the value of the corresponding byte

src/ImageSharp/Formats/Png/Filters/UpFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Filters
 {
     /// <summary>
     /// The Up filter is just like the Sub filter except that the pixel immediately above the current pixel,

src/ImageSharp/Formats/Png/IPngDecoderOptions.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// The optioas for decoding png images

src/ImageSharp/Formats/Png/IPngEncoderOptions.cs

@@ -6,7 +6,7 @@ using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// The options availible for manipulating the encoder pipeline

src/ImageSharp/Formats/Png/ImageExtensions.cs

@@ -3,6 +3,7 @@
 
 using System.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp

src/ImageSharp/Formats/Png/PngChunk.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Stores header information about a chunk.

src/ImageSharp/Formats/Png/PngChunkTypes.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Contains a list of possible chunk type identifiers.

src/ImageSharp/Formats/Png/PngColorType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Provides enumeration of available PNG color types.

src/ImageSharp/Formats/Png/PngConfigurationModule.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the png format.

src/ImageSharp/Formats/Png/PngConstants.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Defines png constants defined in the specification.

src/ImageSharp/Formats/Png/PngDecoder.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Encoder for generating an image out of a png encoded stream.

src/ImageSharp/Formats/Png/PngDecoderCore.cs

@@ -8,12 +8,14 @@ using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
+using SixLabors.ImageSharp.Formats.Png.Filters;
+using SixLabors.ImageSharp.Formats.Png.Zlib;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using static SixLabors.ImageSharp.ComparableExtensions;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Performs the png decoding operation.

src/ImageSharp/Formats/Png/PngEncoder.cs

@@ -6,7 +6,7 @@ using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Image encoder for writing image data to a stream in png format.

src/ImageSharp/Formats/Png/PngEncoderCore.cs

@@ -6,12 +6,14 @@ using System.Buffers;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using SixLabors.ImageSharp.Formats.Png.Filters;
+using SixLabors.ImageSharp.Formats.Png.Zlib;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Quantizers;
 using static SixLabors.ImageSharp.ComparableExtensions;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Performs the png encoding operation.

src/ImageSharp/Formats/Png/PngFormat.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the png format.

src/ImageSharp/Formats/Png/PngHeader.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Represents the png header chunk.

src/ImageSharp/Formats/Png/PngImageFormatDetector.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Detects png file headers

src/ImageSharp/Formats/Png/PngInterlaceMode.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png
 {
     /// <summary>
     /// Provides enumeration of available PNG interlace modes.

src/ImageSharp/Formats/Png/Zlib/Adler32.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Zlib
 {
     /// <summary>
     /// Computes Adler32 checksum for a stream of data. An Adler32

src/ImageSharp/Formats/Png/Zlib/Crc32.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Zlib
 {
     /// <summary>
     /// Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:

src/ImageSharp/Formats/Png/Zlib/IChecksum.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Zlib
 {
     /// <summary>
     /// Interface to compute a data checksum used by checked input/output streams.

src/ImageSharp/Formats/Png/Zlib/ZlibDeflateStream.cs

@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using System.IO.Compression;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Zlib
 {
     /// <summary>
     /// Provides methods and properties for compressing streams by using the Zlib Deflate algorithm.

src/ImageSharp/Formats/Png/Zlib/ZlibInflateStream.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Text;
 
-namespace SixLabors.ImageSharp.Formats
+namespace SixLabors.ImageSharp.Formats.Png.Zlib
 {
     /// <summary>
     /// Provides methods and properties for deframing streams from PNGs.

src/ImageSharp/ImageFormats.cs

@@ -2,6 +2,10 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Gif;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.Formats.Png;
 
 namespace SixLabors.ImageSharp
 {

src/ImageSharp/MetaData/IMetaData.cs → src/ImageSharp/MetaData/IFrameMetaData.cs

@@ -2,13 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 
 namespace SixLabors.ImageSharp.MetaData
 {
     /// <summary>
     /// Encapsulates the metadata of an image frame.
     /// </summary>
-    internal interface IMetaData
+    internal interface IFrameMetaData
     {
         /// <summary>
         /// Gets or sets the frame delay for animated images.

src/ImageSharp/MetaData/ImageFrameMetaData.cs

@@ -2,13 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 
 namespace SixLabors.ImageSharp.MetaData
 {
     /// <summary>
     /// Encapsulates the metadata of an image frame.
     /// </summary>
-    public sealed class ImageFrameMetaData : IMetaData
+    public sealed class ImageFrameMetaData : IFrameMetaData
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageFrameMetaData"/> class.

src/ImageSharp/MetaData/ImageMetaData.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 
@@ -11,7 +12,7 @@ namespace SixLabors.ImageSharp.MetaData
     /// <summary>
     /// Encapsulates the metadata of an image.
     /// </summary>
-    public sealed class ImageMetaData : IMetaData
+    public sealed class ImageMetaData : IFrameMetaData
     {
         /// <summary>
         /// The default horizontal resolution value (dots per inch) in x direction.

tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs

@@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
     using ImageSharp.Formats;
     using ImageSharp.Formats.Jpeg.GolangPort;
     using ImageSharp.PixelFormats;
-
+    using SixLabors.ImageSharp.Formats.Jpeg;
     using CoreImage = ImageSharp.Image;
 
     [Config(typeof(Config.Short))]

tests/ImageSharp.Benchmarks/Image/EncodeBmpMultiple.cs

@@ -11,6 +11,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Bmp;
 
     [Config(typeof(Config.Short))]
     public class EncodeBmpMultiple : MultiImageBenchmarkBase.WithImagesPreloaded

tests/ImageSharp.Benchmarks/Image/EncodeGifMultiple.cs

@@ -7,6 +7,7 @@
     using BenchmarkDotNet.Jobs;
 
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Gif;
 
     [Config(typeof(SingleRunConfig))]
     public class EncodeGifMultiple : MultiImageBenchmarkBase.WithImagesPreloaded

tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs

@@ -11,6 +11,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
 
     using SixLabors.ImageSharp;
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Png;
     using SixLabors.ImageSharp.Quantizers;
 
     using CoreImage = ImageSharp.Image;

tests/ImageSharp.Benchmarks/Image/EncodeJpegMultiple.cs

@@ -11,8 +11,8 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Jpeg;
 
-    
     [Config(typeof(Config.Short))] // It's long enough to iterate through multiple files
     public class EncodeJpegMultiple : MultiImageBenchmarkBase.WithImagesPreloaded
     {

tests/ImageSharp.Benchmarks/Image/EncodePng.cs

@@ -12,6 +12,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
     using BenchmarkDotNet.Attributes;
 
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Png;
     using SixLabors.ImageSharp.Quantizers;
     using SixLabors.ImageSharp.Quantizers.Base;
     using CoreImage = ImageSharp.Image;

tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 

tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@@ -3,6 +3,7 @@
 
 using System.Text;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.Primitives;
 using Xunit;

tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs

@@ -3,6 +3,7 @@
 
 using System.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;

tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@@ -15,6 +15,7 @@ namespace SixLabors.ImageSharp.Tests
     using System.Linq;
 
     using SixLabors.ImageSharp.Formats;
+    using SixLabors.ImageSharp.Formats.Jpeg;
     using SixLabors.ImageSharp.Formats.Jpeg.GolangPort;
     using SixLabors.ImageSharp.PixelFormats;
     using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;

tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.Primitives;

tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Numerics;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 using Xunit.Abstractions;

tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs

@@ -11,6 +11,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
+    using SixLabors.ImageSharp.Formats.Png;
     using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
 
     // TODO: Fix all bugs, and re enable Skipped and commented stuff !!!

tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;

tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs

@@ -6,6 +6,7 @@ using Xunit;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
+using SixLabors.ImageSharp.Formats.Png;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Png
 {

tests/ImageSharp.Tests/Image/ImageTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 

tests/ImageSharp.Tests/MetaData/ImageFrameMetaDataTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using Xunit;
 

tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;

tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

@@ -12,6 +12,10 @@ using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
 namespace SixLabors.ImageSharp.Tests
 {
     using System.Runtime.InteropServices;
+    using SixLabors.ImageSharp.Formats.Bmp;
+    using SixLabors.ImageSharp.Formats.Gif;
+    using SixLabors.ImageSharp.Formats.Jpeg;
+    using SixLabors.ImageSharp.Formats.Png;
 
     public static class TestEnvironment
     {

tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs

@@ -5,6 +5,8 @@ using System;
 using System.IO;
 
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats.Gif;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
 using Xunit;
 using Xunit.Abstractions;