diff --git a/pkg/.System.Numerics.Vectors.pkgproj.swp b/pkg/.System.Numerics.Vectors.pkgproj.swp
new file mode 100644
index 0000000..54e4c9f
Binary files /dev/null and b/pkg/.System.Numerics.Vectors.pkgproj.swp differ
diff --git a/pkg/System.Numerics.Vectors.pkgproj b/pkg/System.Numerics.Vectors.pkgproj
deleted file mode 100644
index 43c40ba..0000000
--- a/pkg/System.Numerics.Vectors.pkgproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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')" />
-  <PropertyGroup>
-    <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
-    <MinClientVersion>2.8.6</MinClientVersion>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Numerics.Vectors.csproj">
-      <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Numerics.Vectors.builds" />
-  </ItemGroup>
-  <ItemGroup>
-    <InboxOnTargetFramework Include="MonoAndroid10" />
-    <InboxOnTargetFramework Include="MonoTouch10" />
-    <InboxOnTargetFramework Include="xamarinios10" />
-    <InboxOnTargetFramework Include="xamarinmac20" />
-    <InboxOnTargetFramework Include="xamarintvos10" />
-    <InboxOnTargetFramework Include="xamarinwatchos10" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/tests/Performance/HashCodeTest.cs b/tests/Performance/HashCodeTest.cs
index 4122304..fd4496b 100644
--- a/tests/Performance/HashCodeTest.cs
+++ b/tests/Performance/HashCodeTest.cs
@@ -1,9 +1,10 @@
-using Microsoft.Xunit.Performance;
+//using Microsoft.Xunit.Performance;
 
 namespace System.Numerics.Performance.Tests
 {
     public static class HashCodeTest
     {
+        /*
         [Benchmark(InnerIterationCount = 100000000)]
         public static void HashTest()
         {
@@ -25,5 +26,6 @@ namespace System.Numerics.Performance.Tests
                 }
             }
         }
+        */
     }
 }
diff --git a/tests/Performance/Perf.Vector2.cs b/tests/Performance/Perf.Vector2.cs
index 0e99a79..7cd9833 100644
--- a/tests/Performance/Perf.Vector2.cs
+++ b/tests/Performance/Perf.Vector2.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Xunit.Performance;
+//using Microsoft.Xunit.Performance;
 using Xunit;
 using System.Collections.Generic;
 
@@ -16,6 +16,7 @@ namespace System.Numerics.Tests
                 yield return new object[] { op };
         }
 
+        /*
         [Benchmark]
         [MemberData(nameof(TestOperations))]
         public void Operation(Operations operation)
@@ -27,6 +28,7 @@ namespace System.Numerics.Tests
                 using (iteration.StartMeasurement())
                     ExecuteTest(operation, 1000000, v1, v2);
         }
+        */
 
         public void ExecuteTest(Operations operation, int innerIterations, Vector2 v1, Vector2 v2)
         {
diff --git a/tests/Performance/Perf.Vector3.cs b/tests/Performance/Perf.Vector3.cs
index 0460c98..9f61443 100644
--- a/tests/Performance/Perf.Vector3.cs
+++ b/tests/Performance/Perf.Vector3.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+/*
 using Microsoft.Xunit.Performance;
 using Xunit;
 using System.Numerics;
@@ -102,3 +103,4 @@ namespace System.Numerics.Tests
         }
     }
 }
+*/
diff --git a/tests/Performance/Perf.Vector4.cs b/tests/Performance/Perf.Vector4.cs
index 9941b29..45c8b15 100644
--- a/tests/Performance/Perf.Vector4.cs
+++ b/tests/Performance/Perf.Vector4.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+/*
 using Microsoft.Xunit.Performance;
 using Xunit;
 using System.Numerics;
@@ -97,3 +98,4 @@ namespace System.Numerics.Tests
         }
     }
 }
+*/
diff --git a/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj b/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj
index 14b61e8..66850ee 100644
--- a/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj
+++ b/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj
@@ -1,7 +1,6 @@
 <?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')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -23,6 +22,12 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\src\System\Numerics\ConstantHelper.cs">
       <Link>ConstantHelper.cs</Link>
@@ -41,7 +46,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\pkg\System.Numerics.Vectors.pkgproj">
+    <ProjectReference Include="..\..\src\System.Numerics.DoubleVectors.csproj">
       <Project>{53134b0c-0d57-481b-b84e-d1991e8d54ff}</Project>
       <Name>System.Numerics.Vectors</Name>
     </ProjectReference>
@@ -56,10 +61,26 @@
       <Link>GenerationConfig.ttinclude</Link>
     </None>
     <None Include="app.config" />
-    <None Include="project.json" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)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>$(SolutionDir)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>$(SolutionDir)packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/tests/Performance/packages.config b/tests/Performance/packages.config
new file mode 100644
index 0000000..d0bd528
--- /dev/null
+++ b/tests/Performance/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit" version="2.1.0" targetFramework="net461" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net461" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net461" />
+</packages>
\ No newline at end of file