diff --git a/BurnOutSharp.Builder/BFPK.cs b/BurnOutSharp.Builders/BFPK.cs
similarity index 99%
rename from BurnOutSharp.Builder/BFPK.cs
rename to BurnOutSharp.Builders/BFPK.cs
index 314c080d..a221a0dd 100644
--- a/BurnOutSharp.Builder/BFPK.cs
+++ b/BurnOutSharp.Builders/BFPK.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using BurnOutSharp.Models.BFPK;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public class BFPK
     {
diff --git a/BurnOutSharp.Builder/BurnOutSharp.Builder.csproj b/BurnOutSharp.Builders/BurnOutSharp.Builders.csproj
similarity index 100%
rename from BurnOutSharp.Builder/BurnOutSharp.Builder.csproj
rename to BurnOutSharp.Builders/BurnOutSharp.Builders.csproj
diff --git a/BurnOutSharp.Builder/Extensions.cs b/BurnOutSharp.Builders/Extensions.cs
similarity index 99%
rename from BurnOutSharp.Builder/Extensions.cs
rename to BurnOutSharp.Builders/Extensions.cs
index 7aa7bd88..f861c68b 100644
--- a/BurnOutSharp.Builder/Extensions.cs
+++ b/BurnOutSharp.Builders/Extensions.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Xml.Serialization;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public static class Extensions
     {
diff --git a/BurnOutSharp.Builder/LinearExecutable.cs b/BurnOutSharp.Builders/LinearExecutable.cs
similarity index 98%
rename from BurnOutSharp.Builder/LinearExecutable.cs
rename to BurnOutSharp.Builders/LinearExecutable.cs
index 8fb2c534..68d1d619 100644
--- a/BurnOutSharp.Builder/LinearExecutable.cs
+++ b/BurnOutSharp.Builders/LinearExecutable.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using BurnOutSharp.Models.LinearExecutable;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public static class LinearExecutable
     {
diff --git a/BurnOutSharp.Builder/MSDOS.cs b/BurnOutSharp.Builders/MSDOS.cs
similarity index 99%
rename from BurnOutSharp.Builder/MSDOS.cs
rename to BurnOutSharp.Builders/MSDOS.cs
index 088339b5..dd0362f7 100644
--- a/BurnOutSharp.Builder/MSDOS.cs
+++ b/BurnOutSharp.Builders/MSDOS.cs
@@ -2,7 +2,7 @@
 using BurnOutSharp.Models.MSDOS;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public static class MSDOS
     {
diff --git a/BurnOutSharp.Builder/MicrosoftCabinet.cs b/BurnOutSharp.Builders/MicrosoftCabinet.cs
similarity index 99%
rename from BurnOutSharp.Builder/MicrosoftCabinet.cs
rename to BurnOutSharp.Builders/MicrosoftCabinet.cs
index 79cc6d4c..58de048f 100644
--- a/BurnOutSharp.Builder/MicrosoftCabinet.cs
+++ b/BurnOutSharp.Builders/MicrosoftCabinet.cs
@@ -4,7 +4,7 @@ using System.Text;
 using BurnOutSharp.Models.MicrosoftCabinet;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     // TODO: Add multi-cabinet reading
     public class MicrosoftCabinet
diff --git a/BurnOutSharp.Builder/MoPaQ.cs b/BurnOutSharp.Builders/MoPaQ.cs
similarity index 99%
rename from BurnOutSharp.Builder/MoPaQ.cs
rename to BurnOutSharp.Builders/MoPaQ.cs
index 6bbc2556..7501503b 100644
--- a/BurnOutSharp.Builder/MoPaQ.cs
+++ b/BurnOutSharp.Builders/MoPaQ.cs
@@ -4,7 +4,7 @@ using System.IO;
 using BurnOutSharp.Models.MoPaQ;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public class MoPaQ
     {
diff --git a/BurnOutSharp.Builder/NewExecutable.cs b/BurnOutSharp.Builders/NewExecutable.cs
similarity index 99%
rename from BurnOutSharp.Builder/NewExecutable.cs
rename to BurnOutSharp.Builders/NewExecutable.cs
index 2c2ac630..0af78bf3 100644
--- a/BurnOutSharp.Builder/NewExecutable.cs
+++ b/BurnOutSharp.Builders/NewExecutable.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using BurnOutSharp.Models.NewExecutable;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public static class NewExecutable
     {
diff --git a/BurnOutSharp.Builder/PortableExecutable.cs b/BurnOutSharp.Builders/PortableExecutable.cs
similarity index 99%
rename from BurnOutSharp.Builder/PortableExecutable.cs
rename to BurnOutSharp.Builders/PortableExecutable.cs
index bf4c5d98..a5489546 100644
--- a/BurnOutSharp.Builder/PortableExecutable.cs
+++ b/BurnOutSharp.Builders/PortableExecutable.cs
@@ -6,7 +6,7 @@ using System.Text;
 using BurnOutSharp.Models.PortableExecutable;
 using BurnOutSharp.Utilities;
 
-namespace BurnOutSharp.Builder
+namespace BurnOutSharp.Builders
 {
     public static class PortableExecutable
     {
diff --git a/BurnOutSharp.Wrappers/BFPK.cs b/BurnOutSharp.Wrappers/BFPK.cs
index 4d444b65..db4a00b4 100644
--- a/BurnOutSharp.Wrappers/BFPK.cs
+++ b/BurnOutSharp.Wrappers/BFPK.cs
@@ -79,7 +79,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Builder.BFPK.ParseArchive(data);
+            var archive = Builders.BFPK.ParseArchive(data);
             if (archive == null)
                 return null;
 
diff --git a/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj b/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj
index fd437ddb..c0c3470a 100644
--- a/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj
+++ b/BurnOutSharp.Wrappers/BurnOutSharp.Wrappers.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\BurnOutSharp.ASN1\BurnOutSharp.ASN1.csproj" />
-    <ProjectReference Include="..\BurnOutSharp.Builder\BurnOutSharp.Builder.csproj" />
+    <ProjectReference Include="..\BurnOutSharp.Builders\BurnOutSharp.Builders.csproj" />
     <ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj" />
   </ItemGroup>
 
diff --git a/BurnOutSharp.Wrappers/LinearExecutable.cs b/BurnOutSharp.Wrappers/LinearExecutable.cs
index 41aca6ca..d53d4d86 100644
--- a/BurnOutSharp.Wrappers/LinearExecutable.cs
+++ b/BurnOutSharp.Wrappers/LinearExecutable.cs
@@ -325,7 +325,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Builder.LinearExecutable.ParseExecutable(data);
+            var executable = Builders.LinearExecutable.ParseExecutable(data);
             if (executable == null)
                 return null;
 
diff --git a/BurnOutSharp.Wrappers/MSDOS.cs b/BurnOutSharp.Wrappers/MSDOS.cs
index 5d78a4fc..8f42f45d 100644
--- a/BurnOutSharp.Wrappers/MSDOS.cs
+++ b/BurnOutSharp.Wrappers/MSDOS.cs
@@ -129,7 +129,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Builder.MSDOS.ParseExecutable(data);
+            var executable = Builders.MSDOS.ParseExecutable(data);
             if (executable == null)
                 return null;
 
diff --git a/BurnOutSharp.Wrappers/MicrosoftCabinet.cs b/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
index 541f915b..93a4ecec 100644
--- a/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
+++ b/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
@@ -141,7 +141,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var cabinet = Builder.MicrosoftCabinet.ParseCabinet(data);
+            var cabinet = Builders.MicrosoftCabinet.ParseCabinet(data);
             if (cabinet == null)
                 return null;
 
diff --git a/BurnOutSharp.Wrappers/NewExecutable.cs b/BurnOutSharp.Wrappers/NewExecutable.cs
index 3729ce57..eee98626 100644
--- a/BurnOutSharp.Wrappers/NewExecutable.cs
+++ b/BurnOutSharp.Wrappers/NewExecutable.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using static BurnOutSharp.Builder.Extensions;
+using static BurnOutSharp.Builders.Extensions;
 
 namespace BurnOutSharp.Wrappers
 {
@@ -257,7 +257,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Builder.NewExecutable.ParseExecutable(data);
+            var executable = Builders.NewExecutable.ParseExecutable(data);
             if (executable == null)
                 return null;
 
diff --git a/BurnOutSharp.Wrappers/PortableExecutable.cs b/BurnOutSharp.Wrappers/PortableExecutable.cs
index 93caa807..af9a0de9 100644
--- a/BurnOutSharp.Wrappers/PortableExecutable.cs
+++ b/BurnOutSharp.Wrappers/PortableExecutable.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Xml;
 using BurnOutSharp.ASN1;
 using BurnOutSharp.Utilities;
-using static BurnOutSharp.Builder.Extensions;
+using static BurnOutSharp.Builders.Extensions;
 
 namespace BurnOutSharp.Wrappers
 {
@@ -933,7 +933,7 @@ namespace BurnOutSharp.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Builder.PortableExecutable.ParseExecutable(data);
+            var executable = Builders.PortableExecutable.ParseExecutable(data);
             if (executable == null)
                 return null;
 
diff --git a/BurnOutSharp.sln b/BurnOutSharp.sln
index 39541e9c..b65b5d0d 100644
--- a/BurnOutSharp.sln
+++ b/BurnOutSharp.sln
@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Models", "BurnOutSharp.Models\BurnOutSharp.Models.csproj", "{44939210-BDC2-4250-BC0F-0AB8F316F09D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Builder", "BurnOutSharp.Builder\BurnOutSharp.Builder.csproj", "{7577733A-CC8D-4E7C-8B6D-FFC7EC1B3D07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Builders", "BurnOutSharp.Builders\BurnOutSharp.Builders.csproj", "{7577733A-CC8D-4E7C-8B6D-FFC7EC1B3D07}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp.Wrappers", "BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj", "{35BD489F-E58D-45DD-9929-DC4B32414750}"
 EndProject
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index 744b106e..8fea709f 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -61,7 +61,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="..\BurnOutSharp.Builder\BurnOutSharp.Builder.csproj">
+    <ProjectReference Include="..\BurnOutSharp.Builders\BurnOutSharp.Builders.csproj">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 203875b5..2148eb3a 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\BurnOutSharp\BurnOutSharp.csproj" />
-    <ProjectReference Include="..\BurnOutSharp.Builder\BurnOutSharp.Builder.csproj" />
+    <ProjectReference Include="..\BurnOutSharp.Builders\BurnOutSharp.Builders.csproj" />
     <ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj" />
     <ProjectReference Include="..\BurnOutSharp.Utilities\BurnOutSharp.Utilities.csproj" />
     <ProjectReference Include="..\BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj" />