diff --git a/GarrysMod.AddonCreator.sln b/GarrysMod.AddonCreator.sln
index b9742fe..18d120f 100644
--- a/GarrysMod.AddonCreator.sln
+++ b/GarrysMod.AddonCreator.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarrysMod.AddonCreator", "GarrysMod.AddonCreator\GarrysMod.AddonCreator.csproj", "{E33D031D-7866-40F9-9362-2776CB4A7B5B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarrysMod.AddonCreator", "src\addoncreator\GarrysMod.AddonCreator.csproj", "{E33D031D-7866-40F9-9362-2776CB4A7B5B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/GarrysMod.AddonCreator/Addon.cs b/src/addoncreator/Addon.cs
similarity index 100%
rename from GarrysMod.AddonCreator/Addon.cs
rename to src/addoncreator/Addon.cs
diff --git a/GarrysMod.AddonCreator/AddonFileInfo.cs b/src/addoncreator/AddonFileInfo.cs
similarity index 100%
rename from GarrysMod.AddonCreator/AddonFileInfo.cs
rename to src/addoncreator/AddonFileInfo.cs
diff --git a/GarrysMod.AddonCreator/BinaryCodecExt.cs b/src/addoncreator/BinaryCodecExt.cs
similarity index 100%
rename from GarrysMod.AddonCreator/BinaryCodecExt.cs
rename to src/addoncreator/BinaryCodecExt.cs
diff --git a/GarrysMod.AddonCreator/GarrysMod.AddonCreator.csproj b/src/addoncreator/GarrysMod.AddonCreator.csproj
similarity index 100%
rename from GarrysMod.AddonCreator/GarrysMod.AddonCreator.csproj
rename to src/addoncreator/GarrysMod.AddonCreator.csproj
diff --git a/GarrysMod.AddonCreator/JsonAddonFileInfo.cs b/src/addoncreator/JsonAddonFileInfo.cs
similarity index 100%
rename from GarrysMod.AddonCreator/JsonAddonFileInfo.cs
rename to src/addoncreator/JsonAddonFileInfo.cs
diff --git a/GarrysMod.AddonCreator/OptimizedCRC.cs b/src/addoncreator/OptimizedCRC.cs
similarity index 100%
rename from GarrysMod.AddonCreator/OptimizedCRC.cs
rename to src/addoncreator/OptimizedCRC.cs
diff --git a/GarrysMod.AddonCreator/ParallelCRC.cs b/src/addoncreator/ParallelCRC.cs
similarity index 100%
rename from GarrysMod.AddonCreator/ParallelCRC.cs
rename to src/addoncreator/ParallelCRC.cs
diff --git a/GarrysMod.AddonCreator/PhysicalAddonFileInfo.cs b/src/addoncreator/PhysicalAddonFileInfo.cs
similarity index 100%
rename from GarrysMod.AddonCreator/PhysicalAddonFileInfo.cs
rename to src/addoncreator/PhysicalAddonFileInfo.cs
diff --git a/GarrysMod.AddonCreator/Program.cs b/src/addoncreator/Program.cs
similarity index 100%
rename from GarrysMod.AddonCreator/Program.cs
rename to src/addoncreator/Program.cs
diff --git a/GarrysMod.AddonCreator/Properties/AssemblyInfo.cs b/src/addoncreator/Properties/AssemblyInfo.cs
similarity index 100%
rename from GarrysMod.AddonCreator/Properties/AssemblyInfo.cs
rename to src/addoncreator/Properties/AssemblyInfo.cs
diff --git a/GarrysMod.AddonCreator/SegmentedAddonFileInfo.cs b/src/addoncreator/SegmentedAddonFileInfo.cs
similarity index 100%
rename from GarrysMod.AddonCreator/SegmentedAddonFileInfo.cs
rename to src/addoncreator/SegmentedAddonFileInfo.cs
diff --git a/GarrysMod.AddonCreator/TraditionalCRC.cs b/src/addoncreator/TraditionalCRC.cs
similarity index 100%
rename from GarrysMod.AddonCreator/TraditionalCRC.cs
rename to src/addoncreator/TraditionalCRC.cs
diff --git a/GarrysMod.AddonCreator/packages.config b/src/addoncreator/packages.config
similarity index 100%
rename from GarrysMod.AddonCreator/packages.config
rename to src/addoncreator/packages.config