diff --git a/Src/AsyncAwaitBestPractices.MVVM.Netstandard21/AsyncAwaitBestPractices.MVVM.Netstandard21.csproj b/Src/AsyncAwaitBestPractices.MVVM.Netstandard21/AsyncAwaitBestPractices.MVVM.Netstandard21.csproj
deleted file mode 100644
index 3045958..0000000
--- a/Src/AsyncAwaitBestPractices.MVVM.Netstandard21/AsyncAwaitBestPractices.MVVM.Netstandard21.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <DebugSymbols>true</DebugSymbols>
-      <DebugType>portable</DebugType>
-      <DocumentationFile>bin\Release\netstandard2.0\AsyncAwaitBestPractices.MVVM.xml</DocumentationFile>
-    </PropertyGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\AsyncAwaitBestPractices.Netstandard21\AsyncAwaitBestPractices.Netstandard21.csproj" />
-    </ItemGroup>
-    <Import Project="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems')" />
-</Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.MVVM.nuspec b/Src/AsyncAwaitBestPractices.MVVM.nuspec
index 1cb9daf..62cfb9a 100644
--- a/Src/AsyncAwaitBestPractices.MVVM.nuspec
+++ b/Src/AsyncAwaitBestPractices.MVVM.nuspec
@@ -10,9 +10,9 @@
     <projectUrl>https://github.com/brminnick/AsyncAwaitBestPractices</projectUrl>
     <!-- <iconUrl>TBD</iconUrl> -->
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Includes AsyncCommand and IAsyncCommand which allows ICommand to safely be used asynchronously with Task.</description>
+    <description>Includes AsyncCommand and IAsyncCommand which allows ICommand to safely be used asynchronously with Task. Also Includes AsyncValueCommand and IAsyncValueCommand which allows ICommand to safely be used asynchronously with ValueTask</description>
     <summary>Includes AsyncCommand and IAsyncCommand which allows ICommand to safely be used asynchronously with Task.</summary>
-    <tags>task,fire and forget, threading, extensions, system.threading.tasks,async,await</tags>
+    <tags>task, valuetask, fire and forget, threading, extensions, system.threading.tasks, async, await</tags>
     <dependencies>
       <dependency id="AsyncAwaitBestPractices" version="4.0.0-pre1" />
     </dependencies>
@@ -24,15 +24,8 @@
     <copyright>Copyright (c) 2018 Brandon Minnick</copyright>
    </metadata>
    <files>
-
-    <!--.NET Standard 2.0-->
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.MVVM.Netstandard21.pdb" target="lib\netstandard2.1\AsyncAwaitBestPractices.MVVM.pdb" /> 
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.MVVM.Netstandard21.dll" target="lib\netstandard2.1\AsyncAwaitBestPractices.MVVM.dll" /> 
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.MVVM.xml" target="lib\netstandard2.1\AsyncAwaitBestPractices.MVVM.xml" /> 
-    
-    <!--.NET Standard 1.0-->
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.Netstandard10.pdb" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.pdb" /> 
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.Netstandard10.dll" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.dll" /> 
-    <file src="AsyncAwaitBestPractices.MVVM.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.xml" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.xml" /> 
+    <file src="AsyncAwaitBestPractices.MVVM\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.pdb" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.pdb" /> 
+    <file src="AsyncAwaitBestPractices.MVVM\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.dll" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.dll" /> 
+    <file src="AsyncAwaitBestPractices.MVVM\bin\Release\netstandard1.0\AsyncAwaitBestPractices.MVVM.xml" target="lib\netstandard1.0\AsyncAwaitBestPractices.MVVM.xml" /> 
    </files>
 </package>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.MVVM.Netstandard10/AsyncAwaitBestPractices.MVVM.Netstandard10.csproj b/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.csproj
similarity index 62%
rename from Src/AsyncAwaitBestPractices.MVVM.Netstandard10/AsyncAwaitBestPractices.MVVM.Netstandard10.csproj
rename to Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.csproj
index a14a231..44f3d02 100644
--- a/Src/AsyncAwaitBestPractices.MVVM.Netstandard10/AsyncAwaitBestPractices.MVVM.Netstandard10.csproj
+++ b/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard1.0</TargetFramework>
@@ -12,7 +12,6 @@
         <DocumentationFile>bin\Release\netstandard2.0\AsyncAwaitBestPractices.MVVM.xml</DocumentationFile>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\AsyncAwaitBestPractices.Netstandard10\AsyncAwaitBestPractices.Netstandard10.csproj" />
+      <ProjectReference Include="..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.csproj" />
     </ItemGroup>
-    <Import Project="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems')" />
 </Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.projitems b/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.projitems
deleted file mode 100644
index 481c087..0000000
--- a/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.projitems
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>{0A8FD64C-2166-409E-B7EC-F8491D0C5A6F}</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>AsyncAwaitBestPractices.MVVM</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AsyncCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AsyncValueCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IAsyncCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IAsyncValueCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)InvalidCommandParameterException.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.shproj b/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.shproj
deleted file mode 100644
index 0456297..0000000
--- a/Src/AsyncAwaitBestPractices.MVVM/AsyncAwaitBestPractices.MVVM.shproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{0A8FD64C-2166-409E-B7EC-F8491D0C5A6F}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="AsyncAwaitBestPractices.MVVM.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.Netstandard21/AsyncAwaitBestPractices.Netstandard21.csproj b/Src/AsyncAwaitBestPractices.Netstandard21/AsyncAwaitBestPractices.Netstandard21.csproj
deleted file mode 100644
index 3094f7d..0000000
--- a/Src/AsyncAwaitBestPractices.Netstandard21/AsyncAwaitBestPractices.Netstandard21.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>portable</DebugType>
-        <DocumentationFile>bin\Release\netstandard2.1\AsyncAwaitBestPractices.xml</DocumentationFile>
-    </PropertyGroup>
-    <Import Project="..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems')" />
-</Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj b/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj
index beecafe..70740b8 100644
--- a/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj
+++ b/Src/AsyncAwaitBestPractices.UnitTests/AsyncAwaitBestPractices.UnitTests.csproj
@@ -11,6 +11,8 @@
         <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     </ItemGroup>
-    <Import Project="..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems')" />
-    <Import Project="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.projitems')" />
+    <ItemGroup>
+      <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.csproj" />
+      <ProjectReference Include="..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.csproj" />
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.nuspec b/Src/AsyncAwaitBestPractices.nuspec
index f687f11..dc935b1 100644
--- a/Src/AsyncAwaitBestPractices.nuspec
+++ b/Src/AsyncAwaitBestPractices.nuspec
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/brminnick/AsyncAwaitBestPractices</projectUrl>
     <!-- <iconUrl>TBD</iconUrl> -->
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description> An extension method to safely fire-and-forget a Task </description>
+    <description> An extension methods to safely fire-and-forget a Task and a ValueTask</description>
     <summary>
       Task Extensions for System.Threading.Tasks
 
@@ -53,15 +53,8 @@
     <copyright>Copyright (c) 2018 Brandon Minnick</copyright>
    </metadata>
    <files>
-
-    <!--.NET Standard 2.0-->
-    <file src="AsyncAwaitBestPractices.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.Netstandard21.pdb" target="lib\netstandard2.1\AsyncAwaitBestPractices.pdb" /> 
-    <file src="AsyncAwaitBestPractices.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.Netstandard21.dll" target="lib\netstandard2.1\AsyncAwaitBestPractices.dll" /> 
-    <file src="AsyncAwaitBestPractices.Netstandard21\bin\Release\netstandard2.1\AsyncAwaitBestPractices.xml" target="lib\netstandard2.1\AsyncAwaitBestPractices.xml" /> 
-
-    <!--.NET Standard 1.0-->
-    <file src="AsyncAwaitBestPractices.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.Netstandard10.pdb" target="lib\netstandard1.0\AsyncAwaitBestPractices.pdb" /> 
-    <file src="AsyncAwaitBestPractices.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.Netstandard10.dll" target="lib\netstandard1.0\AsyncAwaitBestPractices.dll" /> 
-    <file src="AsyncAwaitBestPractices.Netstandard10\bin\Release\netstandard1.0\AsyncAwaitBestPractices.xml" target="lib\netstandard1.0\AsyncAwaitBestPractices.xml" /> 
+    <file src="AsyncAwaitBestPractices\bin\Release\netstandard1.0\AsyncAwaitBestPractices.pdb" target="lib\netstandard1.0\AsyncAwaitBestPractices.pdb" /> 
+    <file src="AsyncAwaitBestPractices\bin\Release\netstandard1.0\AsyncAwaitBestPractices.dll" target="lib\netstandard1.0\AsyncAwaitBestPractices.dll" /> 
+    <file src="AsyncAwaitBestPractices\bin\Release\netstandard1.0\AsyncAwaitBestPractices.xml" target="lib\netstandard1.0\AsyncAwaitBestPractices.xml" /> 
    </files>
 </package>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices.sln b/Src/AsyncAwaitBestPractices.sln
index 15d0247..39c99b9 100644
--- a/Src/AsyncAwaitBestPractices.sln
+++ b/Src/AsyncAwaitBestPractices.sln
@@ -15,21 +15,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HackerNews.UITests", "Hacke
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HackerNews.Shared", "HackerNews.Shared\HackerNews.Shared.shproj", "{8551B218-5734-4F5C-9D35-25DB859CCFDE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AsyncAwaitBestPractices", "AsyncAwaitBestPractices", "{EC7D49A5-0837-455D-B5D9-6794099942AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.MVVM", "AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.csproj", "{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.MVVM.Netstandard10", "AsyncAwaitBestPractices.MVVM.Netstandard10\AsyncAwaitBestPractices.MVVM.Netstandard10.csproj", "{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AsyncAwaitBestPractices.MVVM", "AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.shproj", "{0A8FD64C-2166-409E-B7EC-F8491D0C5A6F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AsyncAwaitBestPractices.MVVM", "AsyncAwaitBestPractices.MVVM", "{DF862C36-EB14-42AE-ADEB-7226EA0182D6}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AsyncAwaitBestPractices", "AsyncAwaitBestPractices\AsyncAwaitBestPractices.shproj", "{4F2273F3-2540-43A7-A5AE-74E15F68AF40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.Netstandard21", "AsyncAwaitBestPractices.Netstandard21\AsyncAwaitBestPractices.Netstandard21.csproj", "{9DA9E11C-8849-43FF-9400-111448897CB1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.Netstandard10", "AsyncAwaitBestPractices.Netstandard10\AsyncAwaitBestPractices.Netstandard10.csproj", "{30F76488-BF98-4779-AFC4-D1F8E6AB4207}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.MVVM.Netstandard21", "AsyncAwaitBestPractices.MVVM.Netstandard21\AsyncAwaitBestPractices.MVVM.Netstandard21.csproj", "{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices", "AsyncAwaitBestPractices\AsyncAwaitBestPractices.csproj", "{30F76488-BF98-4779-AFC4-D1F8E6AB4207}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncAwaitBestPractices.UnitTests", "AsyncAwaitBestPractices.UnitTests\AsyncAwaitBestPractices.UnitTests.csproj", "{12232293-FE18-4430-94B1-FA1E3E957FFC}"
 EndProject
@@ -103,18 +91,6 @@ Global
 		{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|iPhone.Build.0 = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{9DA9E11C-8849-43FF-9400-111448897CB1}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -127,18 +103,6 @@ Global
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{30F76488-BF98-4779-AFC4-D1F8E6AB4207}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|iPhone.Build.0 = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{12232293-FE18-4430-94B1-FA1E3E957FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12232293-FE18-4430-94B1-FA1E3E957FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12232293-FE18-4430-94B1-FA1E3E957FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -158,12 +122,6 @@ Global
 		{E419B244-E072-4EAB-B1C7-07886925C217} = {2A09E240-E14C-45D9-8BE7-86EC6A5007DE}
 		{CCA4BF8B-7B64-4F7B-9C3A-AE498A65FD43} = {2A09E240-E14C-45D9-8BE7-86EC6A5007DE}
 		{8551B218-5734-4F5C-9D35-25DB859CCFDE} = {2A09E240-E14C-45D9-8BE7-86EC6A5007DE}
-		{0A8FD64C-2166-409E-B7EC-F8491D0C5A6F} = {DF862C36-EB14-42AE-ADEB-7226EA0182D6}
-		{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116} = {DF862C36-EB14-42AE-ADEB-7226EA0182D6}
-		{4F2273F3-2540-43A7-A5AE-74E15F68AF40} = {EC7D49A5-0837-455D-B5D9-6794099942AE}
-		{9DA9E11C-8849-43FF-9400-111448897CB1} = {EC7D49A5-0837-455D-B5D9-6794099942AE}
-		{30F76488-BF98-4779-AFC4-D1F8E6AB4207} = {EC7D49A5-0837-455D-B5D9-6794099942AE}
-		{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53} = {DF862C36-EB14-42AE-ADEB-7226EA0182D6}
 		{12232293-FE18-4430-94B1-FA1E3E957FFC} = {3CDAB3BD-D9EA-4BCD-8FA8-C103F2136337}
 	EndGlobalSection
 EndGlobal
diff --git a/Src/AsyncAwaitBestPractices.Netstandard10/AsyncAwaitBestPractices.Netstandard10.csproj b/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.csproj
similarity index 79%
rename from Src/AsyncAwaitBestPractices.Netstandard10/AsyncAwaitBestPractices.Netstandard10.csproj
rename to Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.csproj
index 1d2a3a3..b0138aa 100644
--- a/Src/AsyncAwaitBestPractices.Netstandard10/AsyncAwaitBestPractices.Netstandard10.csproj
+++ b/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.csproj
@@ -14,5 +14,7 @@
     <ItemGroup>
         <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
     </ItemGroup>
-    <Import Project="..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems" Label="Shared" Condition="Exists('..\AsyncAwaitBestPractices\AsyncAwaitBestPractices.projitems')" />
+    <ItemGroup>
+      <Folder Include="WeakEventManager\" />
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.projitems b/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.projitems
deleted file mode 100644
index 589071b..0000000
--- a/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.projitems
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>{4F2273F3-2540-43A7-A5AE-74E15F68AF40}</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>AsyncAwaitBestPractices</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)WeakEventManager\EventManagerService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WeakEventManager\Subscription.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WeakEventManager\WeakEventManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)InvalidHandleEventException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SafeFireAndForgetExtensions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)WeakEventManager\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.shproj b/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.shproj
deleted file mode 100644
index 2e95e12..0000000
--- a/Src/AsyncAwaitBestPractices/AsyncAwaitBestPractices.shproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{4F2273F3-2540-43A7-A5AE-74E15F68AF40}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="AsyncAwaitBestPractices.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/Src/HackNews.Droid/HackerNews.Droid.csproj b/Src/HackNews.Droid/HackerNews.Droid.csproj
index cb196c8..f6ab20d 100644
--- a/Src/HackNews.Droid/HackerNews.Droid.csproj
+++ b/Src/HackNews.Droid/HackerNews.Droid.csproj
@@ -90,9 +90,9 @@
             <Project>{C3D6DE1F-ED08-4CA0-A092-56785BB3CB4D}</Project>
             <Name>HackerNews</Name>
         </ProjectReference>
-        <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM.Netstandard21\AsyncAwaitBestPractices.MVVM.Netstandard21.csproj">
-          <Project>{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}</Project>
-          <Name>AsyncAwaitBestPractices.MVVM.Netstandard21</Name>
+        <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.csproj">
+          <Project>{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}</Project>
+          <Name>AsyncAwaitBestPractices.MVVM</Name>
         </ProjectReference>
     </ItemGroup>
     <ItemGroup />
diff --git a/Src/HackerNews.iOS/HackerNews.iOS.csproj b/Src/HackerNews.iOS/HackerNews.iOS.csproj
index e3b73aa..bd14c0e 100644
--- a/Src/HackerNews.iOS/HackerNews.iOS.csproj
+++ b/Src/HackerNews.iOS/HackerNews.iOS.csproj
@@ -122,9 +122,9 @@
             <Project>{C3D6DE1F-ED08-4CA0-A092-56785BB3CB4D}</Project>
             <Name>HackerNews</Name>
         </ProjectReference>
-        <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM.Netstandard21\AsyncAwaitBestPractices.MVVM.Netstandard21.csproj">
-          <Project>{12D74485-2C47-4FF2-8CD3-BB0DEB9FDF53}</Project>
-          <Name>AsyncAwaitBestPractices.MVVM.Netstandard21</Name>
+        <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.csproj">
+          <Project>{C13ECD67-1C93-42AE-88A1-3AFA6DD7E116}</Project>
+          <Name>AsyncAwaitBestPractices.MVVM</Name>
         </ProjectReference>
     </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/Src/HackerNews/HackerNews.csproj b/Src/HackerNews/HackerNews.csproj
index d7acf89..0e5d8f2 100644
--- a/Src/HackerNews/HackerNews.csproj
+++ b/Src/HackerNews/HackerNews.csproj
@@ -18,7 +18,7 @@
 	  <Folder Include="Constants\" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM.Netstandard21\AsyncAwaitBestPractices.MVVM.Netstandard21.csproj" />
+	  <ProjectReference Include="..\AsyncAwaitBestPractices.MVVM\AsyncAwaitBestPractices.MVVM.csproj" />
 	</ItemGroup>
 	<Import Project="..\HackerNews.Shared\HackerNews.Shared.projitems" Label="Shared" Condition="Exists('..\HackerNews.Shared\HackerNews.Shared.projitems')" />
 </Project>
\ No newline at end of file