diff --git a/OpenTracing.sln b/OpenTracing.sln
index d733474..c330e14 100644
--- a/OpenTracing.sln
+++ b/OpenTracing.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26403.7
@@ -13,26 +12,68 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracing.Tests", "test\O
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{5F088F03-B65C-4E50-B1A3-D8FFE2E0A3A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTracing.Examples", "examples\OpenTracing.Examples\OpenTracing.Examples.csproj", "{2D957863-06D4-4279-AE3E-90F3DDD10193}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracing.Examples", "examples\OpenTracing.Examples\OpenTracing.Examples.csproj", "{2D957863-06D4-4279-AE3E-90F3DDD10193}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracing.Mock", "src\OpenTracing.Mock\OpenTracing.Mock.csproj", "{6C47424C-0734-470F-9808-B0495BBD4724}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|x64.Build.0 = Debug|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Debug|x86.Build.0 = Debug|Any CPU
 		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|x64.ActiveCfg = Release|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|x64.Build.0 = Release|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{60B9BDE0-8203-46C9-9373-E06FC82CECB3}.Release|x86.Build.0 = Release|Any CPU
 		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Debug|x86.Build.0 = Debug|Any CPU
 		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|x64.Build.0 = Release|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{F82B4191-F9D1-4656-8585-840E6BA045DD}.Release|x86.Build.0 = Release|Any CPU
 		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Debug|x86.Build.0 = Debug|Any CPU
 		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|x64.Build.0 = Release|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D957863-06D4-4279-AE3E-90F3DDD10193}.Release|x86.Build.0 = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Debug|x86.Build.0 = Debug|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|x64.Build.0 = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C47424C-0734-470F-9808-B0495BBD4724}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -41,5 +82,6 @@ Global
 		{60B9BDE0-8203-46C9-9373-E06FC82CECB3} = {CA88CFB0-F5DF-411B-B083-D54819E9414F}
 		{F82B4191-F9D1-4656-8585-840E6BA045DD} = {FC8B6803-6F66-4F1E-9034-5564B2D4FF9C}
 		{2D957863-06D4-4279-AE3E-90F3DDD10193} = {5F088F03-B65C-4E50-B1A3-D8FFE2E0A3A1}
+		{6C47424C-0734-470F-9808-B0495BBD4724} = {CA88CFB0-F5DF-411B-B083-D54819E9414F}
 	EndGlobalSection
 EndGlobal
diff --git a/examples/OpenTracing.Examples/OpenTracing.Examples.csproj b/examples/OpenTracing.Examples/OpenTracing.Examples.csproj
index de022ca..dd2e5be 100644
--- a/examples/OpenTracing.Examples/OpenTracing.Examples.csproj
+++ b/examples/OpenTracing.Examples/OpenTracing.Examples.csproj
@@ -7,6 +7,7 @@
     <TargetFrameworks>$(TargetFrameworks);net452</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\OpenTracing.Mock\OpenTracing.Mock.csproj" />
     <ProjectReference Include="..\..\src\OpenTracing\OpenTracing.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/OpenTracing/Mock/MockSpan.cs b/src/OpenTracing.Mock/MockSpan.cs
similarity index 100%
rename from src/OpenTracing/Mock/MockSpan.cs
rename to src/OpenTracing.Mock/MockSpan.cs
diff --git a/src/OpenTracing/Mock/MockSpanBuilder.cs b/src/OpenTracing.Mock/MockSpanBuilder.cs
similarity index 100%
rename from src/OpenTracing/Mock/MockSpanBuilder.cs
rename to src/OpenTracing.Mock/MockSpanBuilder.cs
diff --git a/src/OpenTracing/Mock/MockSpanContext.cs b/src/OpenTracing.Mock/MockSpanContext.cs
similarity index 100%
rename from src/OpenTracing/Mock/MockSpanContext.cs
rename to src/OpenTracing.Mock/MockSpanContext.cs
diff --git a/src/OpenTracing/Mock/MockTracer.cs b/src/OpenTracing.Mock/MockTracer.cs
similarity index 100%
rename from src/OpenTracing/Mock/MockTracer.cs
rename to src/OpenTracing.Mock/MockTracer.cs
diff --git a/src/OpenTracing.Mock/OpenTracing.Mock.csproj b/src/OpenTracing.Mock/OpenTracing.Mock.csproj
new file mode 100644
index 0000000..4f89e45
--- /dev/null
+++ b/src/OpenTracing.Mock/OpenTracing.Mock.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <Description>
+      This library contains mock implementations of the .NET implementation of the OpenTracing API. To fully understand this platform API, it's helpful to be familiar with the OpenTracing project and terminology more generally.
+
+      For the time being, mild backwards-incompatible changes may be made without changing the major version number. As OpenTracing and opentracing-csharp mature, backwards compatibility will become more of a priority.
+    </Description>
+    <PackageTags>opentracing;distributed-tracing;tracing;logging</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(OS)'=='Windows_NT'">
+    <TargetFrameworks>$(TargetFrameworks);net45</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenTracing\OpenTracing.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/OpenTracing/Mock/Propagators.cs b/src/OpenTracing.Mock/Propagators.cs
similarity index 100%
rename from src/OpenTracing/Mock/Propagators.cs
rename to src/OpenTracing.Mock/Propagators.cs
diff --git a/test/OpenTracing.Tests/OpenTracing.Tests.csproj b/test/OpenTracing.Tests/OpenTracing.Tests.csproj
index 6827d20..7efa71e 100644
--- a/test/OpenTracing.Tests/OpenTracing.Tests.csproj
+++ b/test/OpenTracing.Tests/OpenTracing.Tests.csproj
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(OS)'=='Windows_NT'">
     <TargetFrameworks>$(TargetFrameworks);net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\OpenTracing.Mock\OpenTracing.Mock.csproj" />
     <ProjectReference Include="..\..\src\OpenTracing\OpenTracing.csproj" />
   </ItemGroup>