diff --git a/Unity.WebApi/Properties/AssemblyInfo.cs b/Unity.WebApi/Properties/AssemblyInfo.cs
index 77e8bd8..4d7aaa6 100644
--- a/Unity.WebApi/Properties/AssemblyInfo.cs
+++ b/Unity.WebApi/Properties/AssemblyInfo.cs
@@ -1,14 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Unity.WebApi")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("DevTrends")]
-[assembly: AssemblyProduct("Unity.WebApi")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: Guid("06fd1655-583e-4b28-bbe5-fdded9b9f718")]
-[assembly: AssemblyVersion("5.4.0")]
-[assembly: AssemblyFileVersion("5.4.0")]
\ No newline at end of file
+[assembly: Guid("06fd1655-583e-4b28-bbe5-fdded9b9f718")]
\ No newline at end of file
diff --git a/Unity.WebApi/Unity.WebApi.csproj b/Unity.WebApi/Unity.WebApi.csproj
index 1d9cb8b..9d45a47 100644
--- a/Unity.WebApi/Unity.WebApi.csproj
+++ b/Unity.WebApi/Unity.WebApi.csproj
@@ -1,85 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1F13D576-186D-4908-831D-423285696FF1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Unity.WebApi</RootNamespace>
-    <AssemblyName>Unity.WebApi</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFramework>net45</TargetFramework>
+    <Version>5.5.0</Version>
+    <Authors>Paul Hiles</Authors>
+    <Company>DevTrends</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/devtrends/Unity.WebAPI</PackageProjectUrl>
+    <Description>Unity.WebAPI allows the simple Integration of the Unity IoC container with ASP.NET Web API.</Description>
+    <PackageTags>unity asp.net webapi web api ioc di</PackageTags>
   </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>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <Prefer32Bit>false</Prefer32Bit>
+
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <PublicSign>true</PublicSign>
+    <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Unity.Abstractions, Version=5.11.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.Abstractions.5.11.1\lib\net45\Unity.Abstractions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnityDependencyResolver.cs" />
-    <Compile Include="UnityDependencyScope.cs" />
+    <Content Include="content\**\*.*" Pack="true" PackagePath="content" />
+    <Content Include="..\nuget\Readme.txt" Pack="true" PackagePath="\"/>
   </ItemGroup>
+
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="feedbackhound.snk" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
+    <PackageReference Include="Unity" Version="5.11.7" />
   </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
+
+</Project>
diff --git a/Unity.WebApi/app.config b/Unity.WebApi/app.config
deleted file mode 100644
index 1170609..0000000
--- a/Unity.WebApi/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/nuget/content/App_Start/UnityConfig.cs.pp b/Unity.WebApi/content/App_Start/UnityConfig.cs.pp
similarity index 100%
rename from nuget/content/App_Start/UnityConfig.cs.pp
rename to Unity.WebApi/content/App_Start/UnityConfig.cs.pp
diff --git a/Unity.WebApi/packages.config b/Unity.WebApi/packages.config
deleted file mode 100644
index 0985a14..0000000
--- a/Unity.WebApi/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net45" />
-  <package id="Unity.Abstractions" version="5.11.1" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Unity.WebApi/publickey.snk b/Unity.WebApi/publickey.snk
new file mode 100644
index 0000000..501a2c2
Binary files /dev/null and b/Unity.WebApi/publickey.snk differ
diff --git a/nuget/Build.bat b/nuget/Build.bat
index c193ab9..08a09dc 100644
--- a/nuget/Build.bat
+++ b/nuget/Build.bat
@@ -1,3 +1,2 @@
-nuget pack
-
+dotnet pack %~dp0..\Unity.WebApi\Unity.WebApi.csproj -c Release -o %~dp0
 pause
\ No newline at end of file
diff --git a/nuget/NuGet.exe b/nuget/NuGet.exe
deleted file mode 100644
index be85ec2..0000000
Binary files a/nuget/NuGet.exe and /dev/null differ
diff --git a/nuget/Unity.WebAPI.5.4.0.nupkg b/nuget/Unity.WebAPI.5.4.0.nupkg
deleted file mode 100644
index f87ec85..0000000
Binary files a/nuget/Unity.WebAPI.5.4.0.nupkg and /dev/null differ
diff --git a/nuget/Unity.WebApi.nuspec b/nuget/Unity.WebApi.nuspec
deleted file mode 100644
index b46829a..0000000
--- a/nuget/Unity.WebApi.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Unity.WebAPI</id>
-    <version>5.4.0</version>
-    <authors>Paul Hiles</authors>
-    <owners>DevTrends</owners>
-    <projectUrl>https://github.com/devtrends/Unity.WebAPI</projectUrl>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Unity.WebAPI allows the simple Integration of the Unity IoC container with ASP.NET Web API.</description>
-    <tags>unity asp.net webapi web api ioc di</tags>
-    <dependencies>
-      <dependency id="Unity" version="5.11.1" />
-      <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.7" />
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/nuget/lib/net45/Unity.WebApi.dll b/nuget/lib/net45/Unity.WebApi.dll
deleted file mode 100644
index e3bcf9f..0000000
Binary files a/nuget/lib/net45/Unity.WebApi.dll and /dev/null differ