diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
index 130b5856c0..2b8cb0f721 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
@@ -11,6 +11,8 @@ namespace ImageSharp.Formats.Jpg
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
+
     /// <summary>
     /// DCT code Ported from https://github.com/norishigefukushima/dct_simd
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
index 63453da21a..1bb66d6a9d 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
@@ -2,8 +2,10 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg.Components
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components
 {
+    using ImageSharp.Formats.Jpg;
+
     /// <summary>
     /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
     /// Useful for decoder/encoder operations allocating a block for each Jpeg component.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
index 5729fe46d6..de90ea999c 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
@@ -4,11 +4,13 @@
 // </copyright>
 // ReSharper disable InconsistentNaming
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.Formats.Jpg;
+
     /// <summary>
     /// Contains forward and inverse DCT implementations
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs
index 02f585be02..99ed593372 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bits.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.CompilerServices;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
index 0e57e98d89..89f228adb1 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Bytes.cs
@@ -2,7 +2,7 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
     using System.Buffers;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs
index 5b53db1901..a633ef6ffc 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/Component.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
     /// Represents a single color component
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs
index 89fc115ea3..3a87274209 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/ComponentScan.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.InteropServices;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
index 900d77ec46..2a9fe6f0ea 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
@@ -3,9 +3,9 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
-    using System;
+    using ImageSharp.Formats.Jpg;
 
     /// <summary>
     /// A structure to store unprocessed <see cref="Block8x8F"/> instances and their coordinates while scanning the image.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs
index 8b82184faf..e8ce9c6030 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderErrorCode.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     /// <summary>
     /// Represents "recoverable" decoder errors.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs
index 9ce5ea4146..07c5afadb0 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecoderThrowHelper.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
     using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs
index 5ed25ef049..0d7a14e371 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/EOFException.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs
index 390e5dd150..108fdbd4b6 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/HuffmanTree.cs
@@ -2,7 +2,7 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
     using System.Buffers;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
index 60042d36f8..a9633c9771 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/InputProcessor.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
     using System.IO;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
index 71472c00fc..0204dea6fd 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
@@ -3,11 +3,11 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
-    using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
index 342ce299ce..2cc1e5916c 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
@@ -2,10 +2,12 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
+    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
index 7b910cdd24..a6b3ddc3b7 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
@@ -3,10 +3,12 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.InteropServices;
 
+    using ImageSharp.Formats.Jpg;
+
     /// <content>
     /// Conains the definition of <see cref="ComputationData"/>
     /// </content>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
index 52e25f3a81..44f743501e 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
@@ -3,8 +3,10 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
+    using ImageSharp.Formats.Jpg;
+
     /// <content>
     /// Conains the definition of <see cref="DataPointers"/>
     /// </content>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
index 7d2e6d4414..68ebe64bce 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
@@ -3,12 +3,12 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 // ReSharper disable InconsistentNaming
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
-    using System;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs
index f8c157237d..2190c07bd0 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/MissingFF00Exception.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs
index c9cc327b86..745ff6781a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrImage.cs
@@ -2,12 +2,12 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System;
-    using System.Buffers;
 
     using ImageSharp.Memory;
+
     using SixLabors.Primitives;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs
index 5c9e8f9fc3..b9f4d0c811 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/YCbCrToRgbTables.cs
@@ -3,9 +3,10 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.CompilerServices;
+
     using ImageSharp.PixelFormats;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs
index 3875cc12fe..837eaee9d4 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffIndex.cs
@@ -2,7 +2,7 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     /// <summary>
     /// Enumerates the Huffman tables
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs
index d0003b919d..3c98f11d1c 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanLut.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     /// <summary>
     /// A compiled look-up table representation of a huffmanSpec.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs
index a0eea6e718..9b0861a803 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/HuffmanSpec.cs
@@ -2,7 +2,7 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     /// <summary>
     ///     The Huffman encoding specifications.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs
index 5a469e0e9d..550462f974 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/QuantIndex.cs
@@ -2,7 +2,7 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     /// <summary>
     ///     Enumerates the quantization tables
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
index 94173d3e43..c2c05ea38a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Encoder/RgbToYCbCrTables.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder
 {
     using System.Runtime.CompilerServices;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs
index 99c0399dcc..2a824a2d73 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats
+namespace ImageSharp.Formats.Jpeg.GolangPort
 {
     using System.Collections.Generic;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
index 0ce927e516..028d079b0f 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats
+namespace ImageSharp.Formats.Jpeg.GolangPort
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
     using System.Runtime.CompilerServices;
     using System.Threading.Tasks;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
     using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
     using ImageSharp.PixelFormats;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index d2b7d2d7c4..92a4be52fc 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -3,15 +3,16 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats
+namespace ImageSharp.Formats.Jpeg.GolangPort
 {
     using System.Buffers;
-    using System.Collections.Generic;
     using System.IO;
-    using System.Linq;
     using System.Runtime.CompilerServices;
+
+    using ImageSharp.Formats.Jpeg.GolangPort.Components;
+    using ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
-    using ImageSharp.Formats.Jpg.Components;
     using ImageSharp.PixelFormats;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs
index afb8e07007..53be00b985 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/JpegUtils.cs
@@ -2,9 +2,8 @@
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
-    using System;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs
index 99d1c3e04e..721890708a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpan.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
     using System.Runtime.CompilerServices;
 
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs
index 45ecfc0920..fce8f706bd 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Utils/MutableSpanExtensions.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.GolangPort.Utils
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
index 6c6561468f..f04e8d2e07 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
@@ -9,6 +9,7 @@ namespace ImageSharp.Formats
     using System.Collections.Generic;
     using System.IO;
 
+    using ImageSharp.Formats.Jpeg.GolangPort;
     using ImageSharp.PixelFormats;
 
     /// <summary>
diff --git a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
index 23cd5d8752..6f6e1eec32 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegFormat.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Formats
 {
     using System.Collections.Generic;
 
+    using ImageSharp.Formats.Jpeg.GolangPort;
+
     /// <summary>
     /// Registers the image encoders, decoders and mime type detectors for the jpeg format.
     /// </summary>
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs b/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs
index ebcdf972ae..90816ec13f 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodeJpegMultiple.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Benchmarks.Image
     using BenchmarkDotNet.Attributes;
 
     using ImageSharp.Formats;
+    using ImageSharp.Formats.Jpeg.GolangPort;
     using ImageSharp.PixelFormats;
 
     using CoreImage = ImageSharp.Image;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
index 01501a33d4..1d96043c96 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
@@ -14,6 +14,8 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats;
+    using ImageSharp.Formats.Jpeg.GolangPort.Components;
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
 
     using Xunit;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 234f4dcdc9..672c83895d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -11,7 +11,7 @@ namespace ImageSharp.Tests
     using System.Linq;
 
     using ImageSharp.Formats;
-   
+    using ImageSharp.Formats.Jpeg.GolangPort;
     using ImageSharp.PixelFormats;
     using ImageSharp.Tests.TestUtilities.ImageComparison;
 
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
index 252b01138b..7956462ab5 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
@@ -13,6 +13,7 @@ namespace ImageSharp.Tests
     using System;
     using System.Diagnostics;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
 
     public class JpegUtilityTestFixture : MeasureFixture
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
index 1075c46921..f79b689d14 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
@@ -9,6 +9,7 @@ namespace ImageSharp.Tests
     using System;
     using System.Numerics;
 
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
     using ImageSharp.PixelFormats;
 
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
index e76a11cec9..d3d6e4e703 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
@@ -12,6 +12,7 @@ namespace ImageSharp.Tests
     using System.Runtime.CompilerServices;
 
     using ImageSharp.Formats;
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
 
     /// <summary>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
index 50b94bc24c..67f9a1182c 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
@@ -6,6 +6,7 @@
 // ReSharper disable InconsistentNaming
 namespace ImageSharp.Tests.Formats.Jpg
 {
+    using ImageSharp.Formats.Jpeg.GolangPort.Utils;
     using ImageSharp.Formats.Jpg;
 
     using Xunit;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
index b911e11846..c23836143d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
@@ -5,6 +5,7 @@
 
 namespace ImageSharp.Tests
 {
+    using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
     using ImageSharp.Formats.Jpg;
     using SixLabors.Primitives;
     using Xunit;