diff --git a/PactNet.Tests/Properties/AssemblyInfo.cs b/PactNet.Tests/Properties/AssemblyInfo.cs
index dd703f8e..1b4e4fb1 100644
--- a/PactNet.Tests/Properties/AssemblyInfo.cs
+++ b/PactNet.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Concord.Tests")]
+[assembly: AssemblyTitle("PactNet.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Concord.Tests")]
+[assembly: AssemblyProduct("PactNet.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/PactNet.sln b/PactNet.sln
index d55c4a2c..e95fb7ca 100644
--- a/PactNet.sln
+++ b/PactNet.sln
@@ -3,16 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PactNet", "PactNet\PactNet.csproj", "{7024B146-2CB2-4DE2-B079-58CF9C44640B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.Api.Web", "Provider.Api.Web\Provider.Api.Web.csproj", "{E85C47D3-F985-4C1F-A598-A4AEB5740DA2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.Api.Web", "Samples\EventApi\Provider.Api.Web\Provider.Api.Web.csproj", "{E85C47D3-F985-4C1F-A598-A4AEB5740DA2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.Api.Web.Tests", "Provider.Api.Web.Tests\Provider.Api.Web.Tests.csproj", "{9FAFB3C5-5872-470A-98A5-19603EDF1D1A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider.Api.Web.Tests", "Samples\EventApi\Provider.Api.Web.Tests\Provider.Api.Web.Tests.csproj", "{9FAFB3C5-5872-470A-98A5-19603EDF1D1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Consumer", "Consumer\Consumer.csproj", "{4DF20682-F8DD-4271-86CA-17FA2B3D8D29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Consumer", "Samples\EventApi\Consumer\Consumer.csproj", "{4DF20682-F8DD-4271-86CA-17FA2B3D8D29}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Consumer.Tests", "Consumer.Tests\Consumer.Tests.csproj", "{588A65B8-0FCB-48D9-92A8-4338E608F714}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Consumer.Tests", "Samples\EventApi\Consumer.Tests\Consumer.Tests.csproj", "{588A65B8-0FCB-48D9-92A8-4338E608F714}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PactNet.Tests", "PactNet.Tests\PactNet.Tests.csproj", "{658C5A6B-64AF-4602-8E34-5074BD32CC1D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{3EF642AB-53B8-4964-BB52-3C3477556154}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EventApi", "EventApi", "{CE4F7673-F9D8-4ED6-B4A0-630B93DC0668}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,4 +51,11 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CE4F7673-F9D8-4ED6-B4A0-630B93DC0668} = {3EF642AB-53B8-4964-BB52-3C3477556154}
+		{4DF20682-F8DD-4271-86CA-17FA2B3D8D29} = {CE4F7673-F9D8-4ED6-B4A0-630B93DC0668}
+		{588A65B8-0FCB-48D9-92A8-4338E608F714} = {CE4F7673-F9D8-4ED6-B4A0-630B93DC0668}
+		{E85C47D3-F985-4C1F-A598-A4AEB5740DA2} = {CE4F7673-F9D8-4ED6-B4A0-630B93DC0668}
+		{9FAFB3C5-5872-470A-98A5-19603EDF1D1A} = {CE4F7673-F9D8-4ED6-B4A0-630B93DC0668}
+	EndGlobalSection
 EndGlobal
diff --git a/PactNet/Properties/AssemblyInfo.cs b/PactNet/Properties/AssemblyInfo.cs
index 5c95cfa8..99cc4e95 100644
--- a/PactNet/Properties/AssemblyInfo.cs
+++ b/PactNet/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Concord")]
+[assembly: AssemblyTitle("PactNet")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Concord")]
+[assembly: AssemblyProduct("PactNet")]
 [assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Consumer.Tests/Consumer.Tests.csproj b/Samples/EventApi/Consumer.Tests/Consumer.Tests.csproj
similarity index 93%
rename from Consumer.Tests/Consumer.Tests.csproj
rename to Samples/EventApi/Consumer.Tests/Consumer.Tests.csproj
index 75843ac2..092cece7 100644
--- a/Consumer.Tests/Consumer.Tests.csproj
+++ b/Samples/EventApi/Consumer.Tests/Consumer.Tests.csproj
@@ -39,7 +39,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit">
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+      <HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -50,7 +50,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PactNet\PactNet.csproj">
+    <ProjectReference Include="..\..\..\PactNet\PactNet.csproj">
       <Project>{7024b146-2cb2-4de2-b079-58cf9c44640b}</Project>
       <Name>PactNet</Name>
     </ProjectReference>
diff --git a/Consumer.Tests/EventsApiConsumerTests.cs b/Samples/EventApi/Consumer.Tests/EventsApiConsumerTests.cs
similarity index 100%
rename from Consumer.Tests/EventsApiConsumerTests.cs
rename to Samples/EventApi/Consumer.Tests/EventsApiConsumerTests.cs
diff --git a/Consumer.Tests/Properties/AssemblyInfo.cs b/Samples/EventApi/Consumer.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Consumer.Tests/Properties/AssemblyInfo.cs
rename to Samples/EventApi/Consumer.Tests/Properties/AssemblyInfo.cs
diff --git a/Consumer.Tests/packages.config b/Samples/EventApi/Consumer.Tests/packages.config
similarity index 100%
rename from Consumer.Tests/packages.config
rename to Samples/EventApi/Consumer.Tests/packages.config
diff --git a/Consumer/Consumer.csproj b/Samples/EventApi/Consumer/Consumer.csproj
similarity index 94%
rename from Consumer/Consumer.csproj
rename to Samples/EventApi/Consumer/Consumer.csproj
index 675c7771..ae87c3a0 100644
--- a/Consumer/Consumer.csproj
+++ b/Samples/EventApi/Consumer/Consumer.csproj
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Consumer/DateTimeFactory.cs b/Samples/EventApi/Consumer/DateTimeFactory.cs
similarity index 100%
rename from Consumer/DateTimeFactory.cs
rename to Samples/EventApi/Consumer/DateTimeFactory.cs
diff --git a/Consumer/EventsApiClient.cs b/Samples/EventApi/Consumer/EventsApiClient.cs
similarity index 100%
rename from Consumer/EventsApiClient.cs
rename to Samples/EventApi/Consumer/EventsApiClient.cs
diff --git a/Consumer/Properties/AssemblyInfo.cs b/Samples/EventApi/Consumer/Properties/AssemblyInfo.cs
similarity index 100%
rename from Consumer/Properties/AssemblyInfo.cs
rename to Samples/EventApi/Consumer/Properties/AssemblyInfo.cs
diff --git a/Consumer/packages.config b/Samples/EventApi/Consumer/packages.config
similarity index 100%
rename from Consumer/packages.config
rename to Samples/EventApi/Consumer/packages.config
diff --git a/Provider.Api.Web.Tests/EventAPITests.cs b/Samples/EventApi/Provider.Api.Web.Tests/EventAPITests.cs
similarity index 100%
rename from Provider.Api.Web.Tests/EventAPITests.cs
rename to Samples/EventApi/Provider.Api.Web.Tests/EventAPITests.cs
diff --git a/Provider.Api.Web.Tests/Properties/AssemblyInfo.cs b/Samples/EventApi/Provider.Api.Web.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Provider.Api.Web.Tests/Properties/AssemblyInfo.cs
rename to Samples/EventApi/Provider.Api.Web.Tests/Properties/AssemblyInfo.cs
diff --git a/Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj b/Samples/EventApi/Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj
similarity index 84%
rename from Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj
rename to Samples/EventApi/Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj
index 33404b78..c225e927 100644
--- a/Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj
+++ b/Samples/EventApi/Provider.Api.Web.Tests/Provider.Api.Web.Tests.csproj
@@ -32,17 +32,17 @@
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Testing">
-      <HintPath>..\packages\Microsoft.Owin.Testing.2.1.0\lib\net45\Microsoft.Owin.Testing.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.Testing.2.1.0\lib\net45\Microsoft.Owin.Testing.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -53,7 +53,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit">
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+      <HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -65,7 +65,7 @@
       <Project>{e85c47d3-f985-4c1f-a598-a4aeb5740da2}</Project>
       <Name>Provider.Api.Web</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PactNet\PactNet.csproj">
+    <ProjectReference Include="..\..\..\PactNet\PactNet.csproj">
       <Project>{7024b146-2cb2-4de2-b079-58cf9c44640b}</Project>
       <Name>PactNet</Name>
     </ProjectReference>
diff --git a/Provider.Api.Web.Tests/app.config b/Samples/EventApi/Provider.Api.Web.Tests/app.config
similarity index 100%
rename from Provider.Api.Web.Tests/app.config
rename to Samples/EventApi/Provider.Api.Web.Tests/app.config
diff --git a/Provider.Api.Web.Tests/packages.config b/Samples/EventApi/Provider.Api.Web.Tests/packages.config
similarity index 100%
rename from Provider.Api.Web.Tests/packages.config
rename to Samples/EventApi/Provider.Api.Web.Tests/packages.config
diff --git a/Provider.Api.Web/Controllers/EventsController.cs b/Samples/EventApi/Provider.Api.Web/Controllers/EventsController.cs
similarity index 100%
rename from Provider.Api.Web/Controllers/EventsController.cs
rename to Samples/EventApi/Provider.Api.Web/Controllers/EventsController.cs
diff --git a/Provider.Api.Web/Controllers/TestController.cs b/Samples/EventApi/Provider.Api.Web/Controllers/TestController.cs
similarity index 100%
rename from Provider.Api.Web/Controllers/TestController.cs
rename to Samples/EventApi/Provider.Api.Web/Controllers/TestController.cs
diff --git a/Provider.Api.Web/Properties/AssemblyInfo.cs b/Samples/EventApi/Provider.Api.Web/Properties/AssemblyInfo.cs
similarity index 100%
rename from Provider.Api.Web/Properties/AssemblyInfo.cs
rename to Samples/EventApi/Provider.Api.Web/Properties/AssemblyInfo.cs
diff --git a/Provider.Api.Web/Provider.Api.Web.csproj b/Samples/EventApi/Provider.Api.Web/Provider.Api.Web.csproj
similarity index 81%
rename from Provider.Api.Web/Provider.Api.Web.csproj
rename to Samples/EventApi/Provider.Api.Web/Provider.Api.Web.csproj
index 642a2368..9686c25b 100644
--- a/Provider.Api.Web/Provider.Api.Web.csproj
+++ b/Samples/EventApi/Provider.Api.Web/Provider.Api.Web.csproj
@@ -39,38 +39,38 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac">
-      <HintPath>..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
+      <HintPath>..\..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.Owin">
-      <HintPath>..\packages\Autofac.Owin.3.0.1\lib\net45\Autofac.Integration.Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Autofac.Owin.3.0.1\lib\net45\Autofac.Integration.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.WebApi, Version=3.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Autofac.WebApi2.3.3.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
+      <HintPath>..\..\..\packages\Autofac.WebApi2.3.3.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.WebApi.Owin">
-      <HintPath>..\packages\Autofac.WebApi2.Owin.3.0.1\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Autofac.WebApi2.Owin.3.0.1\lib\net45\Autofac.Integration.WebApi.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.2.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Host.SystemWeb">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.2.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.Host.SystemWeb.2.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Hosting">
-      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin">
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.1.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.1.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
@@ -83,10 +83,10 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Http, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.1.2\lib\net45\System.Web.Http.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.1.2\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Http.Owin">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.1.2\lib\net45\System.Web.Http.Owin.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Owin.5.1.2\lib\net45\System.Web.Http.Owin.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
diff --git a/Provider.Api.Web/Startup.cs b/Samples/EventApi/Provider.Api.Web/Startup.cs
similarity index 100%
rename from Provider.Api.Web/Startup.cs
rename to Samples/EventApi/Provider.Api.Web/Startup.cs
diff --git a/Provider.Api.Web/Web.Debug.config b/Samples/EventApi/Provider.Api.Web/Web.Debug.config
similarity index 100%
rename from Provider.Api.Web/Web.Debug.config
rename to Samples/EventApi/Provider.Api.Web/Web.Debug.config
diff --git a/Provider.Api.Web/Web.Release.config b/Samples/EventApi/Provider.Api.Web/Web.Release.config
similarity index 100%
rename from Provider.Api.Web/Web.Release.config
rename to Samples/EventApi/Provider.Api.Web/Web.Release.config
diff --git a/Provider.Api.Web/Web.config b/Samples/EventApi/Provider.Api.Web/Web.config
similarity index 100%
rename from Provider.Api.Web/Web.config
rename to Samples/EventApi/Provider.Api.Web/Web.config
diff --git a/Provider.Api.Web/packages.config b/Samples/EventApi/Provider.Api.Web/packages.config
similarity index 100%
rename from Provider.Api.Web/packages.config
rename to Samples/EventApi/Provider.Api.Web/packages.config