diff --git a/ManagedFusion.Testing.msbuild b/ManagedFusion.Testing.msbuild
new file mode 100644
index 0000000..ef57849
--- /dev/null
+++ b/ManagedFusion.Testing.msbuild
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
+	<UsingTask TaskName="NUnitTeamCity" AssemblyFile="$(teamcity_dotnet_nunitlauncher_msbuild_task)" />
+
+	<ItemGroup>
+		<MainProjects Include="src\**\*.csproj" />
+		<TestProjects Include="test\**\*.csproj" />
+		<AllProjects Include="@(MainProjects);@(TestProjects)" />
+	</ItemGroup>
+
+	<PropertyGroup>
+		<AssemblyName>ManagedFusion.Testing</AssemblyName>
+		<AssemblyInfo>src\Properties\AssemblyInfo.cs</AssemblyInfo>
+		<PackageBuildPath>build</PackageBuildPath>
+		<PackageId>$(AssemblyName)</PackageId>
+		<NuGetExe>lib\nuget.exe</NuGetExe>
+		<NuPackage>$(PackageBuildPath)\$(PackageId).$(build_number).nupkg</NuPackage>
+	</PropertyGroup>
+
+	<Target Name="CleanPackage">
+		<RemoveDir Directories="$(PackageBuildPath)" Condition="Exists($(PackageBuildPath))"/>
+	</Target>
+
+	<Target Name="Clean" DependsOnTargets="CleanPackage">
+		<TeamCityProgressMessage Text="Cleaning Projects" />
+		<MSBuild Projects="@(AllProjects)" Targets="Clean"/>
+	</Target>
+
+	<Target Name="SetVersion" DependsOnTargets="Clean">
+		<TeamCityProgressMessage Text="Update Version" />
+		<FileUpdate
+			Files="$(AssemblyInfo)"
+			Regex='\[assembly: (Assembly(File)?Version)\("([0-9\.\*]+)"\)\]'
+			ReplacementText='[assembly: $1("$(build_number)")]' />
+	</Target>
+
+	<Target Name="Test" DependsOnTargets="SetVersion">
+		<TeamCityProgressMessage Text="Building Tests" />
+		<MSBuild Projects="@(TestProjects)" Targets="Rebuild" Properties="Configuration=Release">
+			<Output TaskParameter="TargetOutputs" ItemName="TestOutput"/>
+		</MSBuild>
+
+		<TeamCityProgressMessage Text="Running Tests" />
+		<NUnitTeamCity Assemblies="@(TestOutput)" NUnitVersion="NUnit-2.5.9" />
+	</Target>
+
+	<Target Name="Build" DependsOnTargets="SetVersion">
+		<TeamCityProgressMessage Text="Building Projects" />
+		<MSBuild Projects="@(MainProjects)" Targets="Rebuild" Properties="Configuration=Release" />
+	</Target>
+
+	<Target Name="Package" DependsOnTargets="Build">
+		<TeamCityProgressMessage Text="Packaging NuGet" />
+
+		<ItemGroup>
+			<AssembliesToPackage Include="src\bin\**\$(AssemblyName).dll" />
+			<AssembliesToPackage Include="src\bin\**\$(AssemblyName).pdb" />
+		</ItemGroup>
+
+		<Copy SourceFiles="@(AssembliesToPackage)" DestinationFolder="$(PackageBuildPath)" />
+
+		<Exec Command="$(NuGetExe) update" />
+		<Exec Command="$(NuGetExe) pack -sym src/$(AssemblyName).csproj -o $(PackageBuildPath)" />
+	</Target>
+
+	<Target Name="Deploy" DependsOnTargets="Package">
+		<TeamCityProgressMessage Text="Deploying NuGet" />
+
+		<Exec Command="$(NuGetExe) push $(NuPackage) $(package_key)" />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/ManagedFusion.Testing.sln b/ManagedFusion.Testing.sln
index d063bd2..c1e7877 100644
--- a/ManagedFusion.Testing.sln
+++ b/ManagedFusion.Testing.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedFusion.Testing", "src\ManagedFusion.Testing.csproj", "{2D10A682-5BDD-4B7B-8AA9-EEE0514B3E33}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0654ACF3-5CF7-46B3-A1BB-D9C7C9A7E9D3}"
+	ProjectSection(SolutionItems) = preProject
+		ManagedFusion.Testing.msbuild = ManagedFusion.Testing.msbuild
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/ManagedFusion.Testing.suo b/ManagedFusion.Testing.suo
index 6e2a028..90a1829 100644
Binary files a/ManagedFusion.Testing.suo and b/ManagedFusion.Testing.suo differ
diff --git a/lib/Moq.dll b/lib/Moq.dll
deleted file mode 100644
index 3d3b8cc..0000000
Binary files a/lib/Moq.dll and /dev/null differ
diff --git a/src/ManagedFusion.Testing.csproj b/src/ManagedFusion.Testing.csproj
index a5f8298..538f2b5 100644
--- a/src/ManagedFusion.Testing.csproj
+++ b/src/ManagedFusion.Testing.csproj
@@ -31,24 +31,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq">
-      <HintPath>..\lib\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Http.cs" />
     <Compile Include="Mvc.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ManagedFusion.Testing.nuspec" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/nuget/ManagedFusion.Testing.nuspec b/src/ManagedFusion.Testing.nuspec
similarity index 59%
rename from nuget/ManagedFusion.Testing.nuspec
rename to src/ManagedFusion.Testing.nuspec
index aabb3d3..6e10605 100644
--- a/nuget/ManagedFusion.Testing.nuspec
+++ b/src/ManagedFusion.Testing.nuspec
@@ -2,17 +2,25 @@
 <package>
 	<metadata>
 		<id>ManagedFusion.Testing</id>
-		<version>1.0.0</version>
+		<version>$version$</version>
 		<title>Managed Fusion Testing Framework</title>
 		<authors>Nick Berardi</authors>
-		<owners>nberardi</owners>
+		<owners>Managed Fusion, LLC</owners>
 		<description>Managed Fusion Testing Framework contains common mocking senarios that help setup tests</description>	
 		<summary>Managed Fusion Testing Framework contains common mocking senarios that help setup tests.</summary>
 		<language>en-US</language>
 		<projectUrl>https://github.com/managedfusion/managedfusion-testing</projectUrl>
-		<licenseUrl>https://github.com/managedfusion/managedfusion/raw/master/LICENSE.txt</licenseUrl>
+		<licenseUrl>https://github.com/managedfusion/managedfusion-testing/raw/master/LICENSE.txt</licenseUrl>
 		<iconUrl>https://github.com/managedfusion/managedfusion-testing/raw/master/nuget/ManagedFusion.Logo.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<tags>managedfusion testing nunit msunit xunit mock moq .net35 .net40</tags>
+		<dependencies>
+			<dependency id="Moq" version="(4.0,)" />
+		</dependencies>
+		<frameworkAssemblies>
+			<frameworkAssembly assemblyName="System.Web" targetFramework="net40" />
+			<frameworkAssembly assemblyName="System.Web.Mvc" targetFramework="net40" />
+			<frameworkAssembly assemblyName="MIcrosoft.CSharp" targetFramework="net40" />
+		</frameworkAssemblies>
 	</metadata>
 </package>
\ No newline at end of file
diff --git a/src/packages.config b/src/packages.config
new file mode 100644
index 0000000..6ec355e
--- /dev/null
+++ b/src/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.0.10827" />
+</packages>
\ No newline at end of file