diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.Generated.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.Generated.cs
rename to src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.Generated.tt b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.Generated.tt
rename to src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Block8x8F.cs
rename to src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
diff --git a/src/ImageSharp/Formats/Jpeg/JpegConstants.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/JpegConstants.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/JpegConstants.cs
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index 8733131a7..3f268020b 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -53,6 +53,10 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
+    <None Update="Formats\Jpeg\Common\Block8x8F.Generated.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
+    </None>
     <None Update="Formats\Jpeg\Components\Block8x8F.Generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Block8x8F.Generated.cs</LastGenOutput>
@@ -78,6 +82,11 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="Formats\Jpeg\Common\Block8x8F.Generated.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Block8x8F.Generated.tt</DependentUpon>
+    </Compile>
     <Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>