diff --git a/src/addoncreator/Addon.cs b/src/addoncreator/Addon/AddonFile.cs
similarity index 98%
rename from src/addoncreator/Addon.cs
rename to src/addoncreator/Addon/AddonFile.cs
index ca49d35..a2f8511 100644
--- a/src/addoncreator/Addon.cs
+++ b/src/addoncreator/Addon/AddonFile.cs
@@ -4,12 +4,12 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
-using CRC32;
+using GarrysMod.AddonCreator.Hashing;
 using Newtonsoft.Json;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
-    public class Addon
+    public class AddonFile
     {
         private const byte FormatVersion = 3;
         private const uint AppID = 4000;
@@ -17,9 +17,9 @@ namespace GarrysMod.AddonCreator
         private static readonly byte[] FormatIdent = Encoding.ASCII.GetBytes("GMAD");
 
         /// <summary>
-        ///     Initializes a new instance of <see cref="Addon" />
+        ///     Initializes a new instance of <see cref="AddonFile" />
         /// </summary>
-        public Addon()
+        public AddonFile()
         {
             Files = new Dictionary<string, AddonFileInfo>();
             RequiredContent = new List<string>();
diff --git a/src/addoncreator/AddonFileInfo.cs b/src/addoncreator/Addon/AddonFileInfo.cs
similarity index 85%
rename from src/addoncreator/AddonFileInfo.cs
rename to src/addoncreator/Addon/AddonFileInfo.cs
index b265bc5..8099322 100644
--- a/src/addoncreator/AddonFileInfo.cs
+++ b/src/addoncreator/Addon/AddonFileInfo.cs
@@ -1,6 +1,6 @@
-using CRC32;
+using GarrysMod.AddonCreator.Hashing;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public abstract class AddonFileInfo
     {
diff --git a/src/addoncreator/AddonJson.cs b/src/addoncreator/Addon/AddonJson.cs
similarity index 97%
rename from src/addoncreator/AddonJson.cs
rename to src/addoncreator/Addon/AddonJson.cs
index 79530de..25f5630 100644
--- a/src/addoncreator/AddonJson.cs
+++ b/src/addoncreator/Addon/AddonJson.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public class AddonJson
     {
diff --git a/src/addoncreator/AddonWhitelist.cs b/src/addoncreator/Addon/AddonWhitelist.cs
similarity index 98%
rename from src/addoncreator/AddonWhitelist.cs
rename to src/addoncreator/Addon/AddonWhitelist.cs
index 0edba02..3bb3e1c 100644
--- a/src/addoncreator/AddonWhitelist.cs
+++ b/src/addoncreator/Addon/AddonWhitelist.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public static class AddonWhitelist
     {
diff --git a/src/addoncreator/JsonAddonFileInfo.cs b/src/addoncreator/Addon/JsonAddonFileInfo.cs
similarity index 91%
rename from src/addoncreator/JsonAddonFileInfo.cs
rename to src/addoncreator/Addon/JsonAddonFileInfo.cs
index b6c5f25..2ecacd9 100644
--- a/src/addoncreator/JsonAddonFileInfo.cs
+++ b/src/addoncreator/Addon/JsonAddonFileInfo.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public class JsonAddonFileInfo : AddonFileInfo
     {
diff --git a/src/addoncreator/PhysicalAddonFileInfo.cs b/src/addoncreator/Addon/PhysicalAddonFileInfo.cs
similarity index 91%
rename from src/addoncreator/PhysicalAddonFileInfo.cs
rename to src/addoncreator/Addon/PhysicalAddonFileInfo.cs
index 08e9773..9301d9d 100644
--- a/src/addoncreator/PhysicalAddonFileInfo.cs
+++ b/src/addoncreator/Addon/PhysicalAddonFileInfo.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public class PhysicalAddonFileInfo : AddonFileInfo
     {
diff --git a/src/addoncreator/SegmentedAddonFileInfo.cs b/src/addoncreator/Addon/SegmentedAddonFileInfo.cs
similarity index 96%
rename from src/addoncreator/SegmentedAddonFileInfo.cs
rename to src/addoncreator/Addon/SegmentedAddonFileInfo.cs
index 1be1c52..6c92f95 100644
--- a/src/addoncreator/SegmentedAddonFileInfo.cs
+++ b/src/addoncreator/Addon/SegmentedAddonFileInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace GarrysMod.AddonCreator
+namespace GarrysMod.AddonCreator.Addon
 {
     public class SegmentedAddonFileInfo : AddonFileInfo
     {
diff --git a/src/addoncreator/GarrysMod.AddonCreator.csproj b/src/addoncreator/GarrysMod.AddonCreator.csproj
index e7d1616..d606959 100644
--- a/src/addoncreator/GarrysMod.AddonCreator.csproj
+++ b/src/addoncreator/GarrysMod.AddonCreator.csproj
@@ -52,19 +52,19 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Addon.cs" />
-    <Compile Include="AddonFileInfo.cs" />
-    <Compile Include="AddonJson.cs" />
-    <Compile Include="AddonWhitelist.cs" />
+    <Compile Include="Addon\AddonFile.cs" />
+    <Compile Include="Addon\AddonFileInfo.cs" />
+    <Compile Include="Addon\AddonJson.cs" />
+    <Compile Include="Addon\AddonWhitelist.cs" />
     <Compile Include="Extensions.cs" />
-    <Compile Include="JsonAddonFileInfo.cs" />
-    <Compile Include="OptimizedCRC.cs" />
-    <Compile Include="ParallelCRC.cs" />
-    <Compile Include="PhysicalAddonFileInfo.cs" />
+    <Compile Include="Addon\JsonAddonFileInfo.cs" />
+    <Compile Include="Hashing\OptimizedCRC.cs" />
+    <Compile Include="Hashing\ParallelCRC.cs" />
+    <Compile Include="Addon\PhysicalAddonFileInfo.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SegmentedAddonFileInfo.cs" />
-    <Compile Include="TraditionalCRC.cs" />
+    <Compile Include="Addon\SegmentedAddonFileInfo.cs" />
+    <Compile Include="Hashing\TraditionalCRC.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/addoncreator/OptimizedCRC.cs b/src/addoncreator/Hashing/OptimizedCRC.cs
similarity index 98%
rename from src/addoncreator/OptimizedCRC.cs
rename to src/addoncreator/Hashing/OptimizedCRC.cs
index d86f946..d511ae3 100644
--- a/src/addoncreator/OptimizedCRC.cs
+++ b/src/addoncreator/Hashing/OptimizedCRC.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace CRC32
+namespace GarrysMod.AddonCreator.Hashing
 {
     public class OptimizedCRC
     {
diff --git a/src/addoncreator/ParallelCRC.cs b/src/addoncreator/Hashing/ParallelCRC.cs
similarity index 99%
rename from src/addoncreator/ParallelCRC.cs
rename to src/addoncreator/Hashing/ParallelCRC.cs
index ce0b205..1d438b9 100644
--- a/src/addoncreator/ParallelCRC.cs
+++ b/src/addoncreator/Hashing/ParallelCRC.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace CRC32
+namespace GarrysMod.AddonCreator.Hashing
 {
     public class ParallelCRC
     {
diff --git a/src/addoncreator/TraditionalCRC.cs b/src/addoncreator/Hashing/TraditionalCRC.cs
similarity index 97%
rename from src/addoncreator/TraditionalCRC.cs
rename to src/addoncreator/Hashing/TraditionalCRC.cs
index 31820f7..65ccdec 100644
--- a/src/addoncreator/TraditionalCRC.cs
+++ b/src/addoncreator/Hashing/TraditionalCRC.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace CRC32
+namespace GarrysMod.AddonCreator.Hashing
 {
     public class TraditionalCRC
     {
diff --git a/src/addoncreator/Program.cs b/src/addoncreator/Program.cs
index a5d3315..de0b041 100644
--- a/src/addoncreator/Program.cs
+++ b/src/addoncreator/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using GarrysMod.AddonCreator.Addon;
 
 namespace GarrysMod.AddonCreator
 {
@@ -14,7 +15,7 @@ namespace GarrysMod.AddonCreator
                 {
                     var folder = new DirectoryInfo(args[1]);
                     var output = args[2];
-                    var addon = new Addon();
+                    var addon = new AddonFile();
 
                     // recursively add files
                     foreach (var file in folder.EnumerateFiles("*", SearchOption.AllDirectories))
@@ -37,7 +38,7 @@ namespace GarrysMod.AddonCreator
                 {
                     var gma = args[1];
                     var folder = new DirectoryInfo(args[2]);
-                    var addon = new Addon();
+                    var addon = new AddonFile();
                     addon.Import(gma);
 
                     Console.WriteLine("Loaded addon {0} by {1}, Version {2}", addon.Title, addon.Author, addon.Version);