diff --git a/.gitignore b/.gitignore
index 7403ac2..273c9a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -229,4 +229,5 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
-/packages
\ No newline at end of file
+/packages
+.vs
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs b/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs
index 603c695..0c28804 100644
--- a/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs
+++ b/Obvs.AzureServiceBus.Tests/EndpointProviderFacts.cs
@@ -148,7 +148,7 @@ public async Task CanPublishEndpointEvents()
                     .Returns(mockMessageSender.Object);
 
                 var endpointProvider = new AzureServiceBusEndpointProvider<TestMessage, TestMessage, TestCommand, TestEvent, TestRequest, TestResponse>(
-                    "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object);
+                    "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(typeof(JsonMessageDeserializer<>)), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object);
 
                 var testEvent = new TestSpecificEvent1
                 {
@@ -213,7 +213,7 @@ public async Task CanReceiveEndpointClientEvents()
                     .Returns(mockMessageSender.Object);
 
                 var endpointProvider = new AzureServiceBusEndpointProvider<TestMessage, TestMessage, TestCommand, TestEvent, TestRequest, TestResponse>(
-                    "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object);
+                    "TestEndpoint", _mockMessagingFactory.Object, new JsonMessageSerializer(), new JsonMessageDeserializerFactory(typeof(JsonMessageDeserializer<>)), _messageTypePathMappings, _testAssemblyFilter, _testMessageTypeFilter, _messagePropertyProviderManager, _mockMessageOutgoingPropertiesTable.Object);
 
                 var endpointClient = endpointProvider.CreateEndpointClient();
 
diff --git a/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj b/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj
index 2bbb87a..bb7d022 100644
--- a/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj
+++ b/Obvs.AzureServiceBus.Tests/Obvs.AzureServiceBus.Tests.csproj
@@ -1,149 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{15275F11-AF1B-4787-8B6D-E52ABDB4C705}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Obvs.AzureServiceBus.Tests</RootNamespace>
-    <AssemblyName>Obvs.AzureServiceBus.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFrameworks>net45</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.ServiceBus.3.1.2\lib\net45-full\Microsoft.ServiceBus.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Obvs, Version=3.0.0.47, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Obvs.3.0.0.47\lib\net45\Obvs.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Obvs.Serialization.Json, Version=2.0.0.16, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Obvs.Serialization.Json.2.0.0.16\lib\net45\Obvs.Serialization.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EndpointProviderFacts.cs" />
-    <Compile Include="MessagingEntityVerifierFacts.cs" />
-    <Compile Include="ConfigurationFacts.cs" />
-    <Compile Include="MessagePublisherFacts.cs" />
-    <Compile Include="MessagePropertiesFacts.cs" />
-    <Compile Include="PeekLockMessageControlFacts.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="MessageSourceFacts.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Obvs.AzureServiceBus\Obvs.AzureServiceBus.csproj">
-      <Project>{2c889e39-b633-4ec8-9bf0-4c98db630b0a}</Project>
-      <Name>Obvs.AzureServiceBus</Name>
-    </ProjectReference>
+    <PackageReference Include="WindowsAzure.ServiceBus" Version="3.1.2" />
+    <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.0" />
+    <PackageReference Include="Obvs" Version="4.0.0.1" />
+    <PackageReference Include="Obvs.Serialization.Json" Version="4.0.0.3" />
+    <PackageReference Include="FluentAssertions" Version="4.2.1.0" />
+    <PackageReference Include="nunit" Version="3.8.1" />
+    <PackageReference Include="Moq" Version="4.2.1510.2205" />
+    <PackageReference Include="xunit" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\Obvs.AzureServiceBus\Obvs.AzureServiceBus.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs b/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 977fb78..0000000
--- a/Obvs.AzureServiceBus.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("Obvs.AzureServiceBus.Tests")]
-[assembly: AssemblyDescription("Test for the Azure ServiceBus support for the Obvs framework.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-[assembly: AssemblyCompany("Drew Marsh")]
-[assembly: AssemblyProduct("Obvs.AzureServiceBus")]
-[assembly: AssemblyCopyright("Copyright © Drew Marsh 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: AssemblyVersion("0.1.0.*")]
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus.Tests/packages.config b/Obvs.AzureServiceBus.Tests/packages.config
deleted file mode 100644
index afd7998..0000000
--- a/Obvs.AzureServiceBus.Tests/packages.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.2.1" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
-  <package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
-  <package id="Obvs" version="3.0.0.47" targetFramework="net45" />
-  <package id="Obvs.Serialization.Json" version="2.0.0.16" targetFramework="net45" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="WindowsAzure.ServiceBus" version="3.1.2" targetFramework="net45" />
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus.sln b/Obvs.AzureServiceBus.sln
index 5226a3e..f3a36f6 100644
--- a/Obvs.AzureServiceBus.sln
+++ b/Obvs.AzureServiceBus.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25008.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Obvs.AzureServiceBus", "Obvs.AzureServiceBus\Obvs.AzureServiceBus.csproj", "{2C889E39-B633-4EC8-9BF0-4C98DB630B0A}"
 EndProject
diff --git a/Obvs.AzureServiceBus/MessagePublisher.cs b/Obvs.AzureServiceBus/MessagePublisher.cs
index 648d292..b9bf2ab 100644
--- a/Obvs.AzureServiceBus/MessagePublisher.cs
+++ b/Obvs.AzureServiceBus/MessagePublisher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.ServiceBus.Messaging;
 using Obvs.AzureServiceBus.Infrastructure;
@@ -9,6 +10,9 @@
 using Obvs.Serialization;
 using Obvs.Types;
 
+[assembly: InternalsVisibleTo("Obvs.AzureServiceBus.Tests")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+
 namespace Obvs.AzureServiceBus
 {
     public class MessagePublisher<TMessage> : IMessagePublisher<TMessage>
diff --git a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj
index 2214753..f1240de 100644
--- a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj
+++ b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.csproj
@@ -1,114 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2C889E39-B633-4EC8-9BF0-4C98DB630B0A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Obvs.AzureServiceBus</RootNamespace>
-    <AssemblyName>Obvs.AzureServiceBus</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFrameworks>net45</TargetFrameworks>
+    <Company>Drew Marsh</Company>
+    <Copyright>Copyright © Drew Marsh 2015</Copyright>
+    <Version>1.0.0</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageProjectUrl>https://github.com/drub0y/Obvs.AzureServiceBus</PackageProjectUrl>
+    <PackageReleaseNotes>Updated to Obvs v4.0</PackageReleaseNotes>
+    <Description>AzureServiceBus transport support for Obvs</Description>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.ServiceBus, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.ServiceBus.3.1.2\lib\net45-full\Microsoft.ServiceBus.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Obvs, Version=3.0.0.47, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Obvs.3.0.0.47\lib\net45\Obvs.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <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="Configuration\AzureServiceBusConfigExtensions.cs" />
-    <Compile Include="Configuration\AzureServiceBusEndpointProvider.cs" />
-    <Compile Include="Configuration\AzureServiceBusFluentConfig.cs" />
-    <Compile Include="Configuration\ConfigurationUtilities.cs" />
-    <Compile Include="Configuration\MessageTypeMessagingEntityMappingDetails.cs" />
-    <Compile Include="Infrastructure\IMessageOutgoingPropertiesTable.cs" />
-    <Compile Include="Infrastructure\IMessageBrokeredMessageTable.cs" />
-    <Compile Include="Infrastructure\IMessagingEntityFactory.cs" />
-    <Compile Include="Infrastructure\IMessagingEntityVerifier.cs" />
-    <Compile Include="Infrastructure\MessagePropertiesProvider.cs" />
-    <Compile Include="Infrastructure\MessagingEntityVerifier.cs" />
-    <Compile Include="Infrastructure\PeekLockMessageControl.cs" />
-    <Compile Include="Infrastructure\MessageEntityFactory.cs" />
-    <Compile Include="Configuration\ConfigurationExceptions.cs" />
-    <Compile Include="Configuration\Unconfigured.cs" />
-    <Compile Include="Infrastructure\IMessageReceiver.cs" />
-    <Compile Include="Infrastructure\MessageReceiverWrapper.cs" />
-    <Compile Include="Infrastructure\MessagingFactoryWrapper.cs" />
-    <Compile Include="Infrastructure\IMessagingFactory.cs" />
-    <Compile Include="Infrastructure\NamespaceManagerWrapper.cs" />
-    <Compile Include="Infrastructure\INamespaceManager.cs" />
-    <Compile Include="Infrastructure\IMessageSender.cs" />
-    <Compile Include="Infrastructure\MessageSenderWrapper.cs" />
-    <Compile Include="MessagePropertiesMessageExtensions.cs" />
-    <Compile Include="MessagePublisher.cs" />
-    <Compile Include="MessageSource.cs" />
-    <Compile Include="PeekLockControlMessageExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <None Include="Obvs.AzureServiceBus.nuspec" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <PackageReference Include="WindowsAzure.ServiceBus" Version="3.1.2" />
+    <PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.0" />
+    <PackageReference Include="Obvs" Version="4.0.0.1" />
   </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec b/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec
deleted file mode 100644
index 06db07e..0000000
--- a/Obvs.AzureServiceBus/Obvs.AzureServiceBus.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <metadata>
-        <id>$id$</id>
-        <version>$version$</version>
-        <title>$title$</title>
-        <authors>Drew Marsh (@drub0y)</authors>
-        <projectUrl>https://github.com/drub0y/Obvs.AzureServiceBus/</projectUrl>
-        <licenseUrl>https://github.com/drub0y/Obvs.AzureServiceBus/blob/master/LICENSE.md</licenseUrl>
-        <description>Microsoft Azure Service Bus transport support for the Obvs Framework.</description>
-        <copyright>Copyright 2015</copyright>
-        <tags>Azure Commands Events CQRS Rx Observable</tags>
-        <releaseNotes>
-            FIX: fixing bug outgoing message properties were not actually being applied to the outgoing BrokeredMessage.
-        </releaseNotes>
-    </metadata>
-</package>
diff --git a/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs b/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs
deleted file mode 100644
index 79e6cab..0000000
--- a/Obvs.AzureServiceBus/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("Obvs.AzureServiceBus")]
-[assembly: AssemblyDescription("Azure ServiceBus support for the Obvs framework.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-[assembly: AssemblyCompany("Drew Marsh")]
-[assembly: AssemblyProduct("Obvs.AzureServiceBus")]
-[assembly: AssemblyCopyright("Copyright © Drew Marsh 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: AssemblyVersion("0.15.2.*")]
-[assembly: AssemblyInformationalVersion("0.15.2-beta2")]
-
-[assembly: InternalsVisibleTo("Obvs.AzureServiceBus.Tests")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/Obvs.AzureServiceBus/packages.config b/Obvs.AzureServiceBus/packages.config
deleted file mode 100644
index 53d1f20..0000000
--- a/Obvs.AzureServiceBus/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
-  <package id="Obvs" version="3.0.0.47" targetFramework="net45" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="WindowsAzure.ServiceBus" version="3.1.2" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index d2825f4..369c246 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Obvs.AzureServiceBus [![Join the chat at https://gitter.im/drub0y/Obvs.AzureServiceBus](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drub0y/Obvs.AzureServiceBus?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-An Azure ServiceBus transport support for [the Obvs framework](https://github.com/inter8ection/Obvs).
+An Azure ServiceBus transport support for [the Obvs framework](https://github.com/christopherread/Obvs).
 
 ---