diff --git a/Squirrel.sln b/Squirrel.sln
index 6b33666e..9bad59b4 100644
--- a/Squirrel.sln
+++ b/Squirrel.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel", "src\Squirrel.csproj", "{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel", "src\Squirrel\Squirrel.csproj", "{1436E22A-FE3C-4D68-9A85-9E74DF2E6A92}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squirrel.Tests", "test\Squirrel.Tests.csproj", "{98AEB048-E27D-42F4-9440-505B7F78BAFD}"
 EndProject
diff --git a/src/BinaryPatchUtility.cs b/src/Squirrel/BinaryPatchUtility.cs
similarity index 100%
rename from src/BinaryPatchUtility.cs
rename to src/Squirrel/BinaryPatchUtility.cs
diff --git a/src/ContentType.cs b/src/Squirrel/ContentType.cs
similarity index 100%
rename from src/ContentType.cs
rename to src/Squirrel/ContentType.cs
diff --git a/src/DeltaPackage.cs b/src/Squirrel/DeltaPackage.cs
similarity index 100%
rename from src/DeltaPackage.cs
rename to src/Squirrel/DeltaPackage.cs
diff --git a/src/EnumerableExtensions.cs b/src/Squirrel/EnumerableExtensions.cs
similarity index 100%
rename from src/EnumerableExtensions.cs
rename to src/Squirrel/EnumerableExtensions.cs
diff --git a/src/MarkdownSharp.cs b/src/Squirrel/MarkdownSharp.cs
similarity index 100%
rename from src/MarkdownSharp.cs
rename to src/Squirrel/MarkdownSharp.cs
diff --git a/src/PackageExtensions.cs b/src/Squirrel/PackageExtensions.cs
similarity index 100%
rename from src/PackageExtensions.cs
rename to src/Squirrel/PackageExtensions.cs
diff --git a/src/Properties/AssemblyInfo.cs b/src/Squirrel/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Properties/AssemblyInfo.cs
rename to src/Squirrel/Properties/AssemblyInfo.cs
diff --git a/src/ReleaseEntry.cs b/src/Squirrel/ReleaseEntry.cs
similarity index 100%
rename from src/ReleaseEntry.cs
rename to src/Squirrel/ReleaseEntry.cs
diff --git a/src/ReleaseExtensions.cs b/src/Squirrel/ReleaseExtensions.cs
similarity index 100%
rename from src/ReleaseExtensions.cs
rename to src/Squirrel/ReleaseExtensions.cs
diff --git a/src/ReleasePackage.cs b/src/Squirrel/ReleasePackage.cs
similarity index 100%
rename from src/ReleasePackage.cs
rename to src/Squirrel/ReleasePackage.cs
diff --git a/src/Squirrel.csproj b/src/Squirrel/Squirrel.csproj
similarity index 90%
rename from src/Squirrel.csproj
rename to src/Squirrel/Squirrel.csproj
index 03c38f04..0d9be0aa 100644
--- a/src/Squirrel.csproj
+++ b/src/Squirrel/Squirrel.csproj
@@ -31,17 +31,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Ionic.Zip">
-      <HintPath>..\ext\Ionic.Zip.dll</HintPath>
+      <HintPath>..\..\ext\Ionic.Zip.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.XmlTransform">
-      <HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Core, Version=2.8.50506.491, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="Splat">
-      <HintPath>..\packages\Splat.1.4.0\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.4.0\lib\Net45\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -76,4 +76,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Utility.cs b/src/Squirrel/Utility.cs
similarity index 100%
rename from src/Utility.cs
rename to src/Squirrel/Utility.cs
diff --git a/src/packages.config b/src/Squirrel/packages.config
similarity index 100%
rename from src/packages.config
rename to src/Squirrel/packages.config