diff --git a/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/Cinephile.ViewModels.csproj b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/Cinephile.ViewModels.csproj
new file mode 100644
index 0000000000..2bdd0a4e2d
--- /dev/null
+++ b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/Cinephile.ViewModels.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netstandard2.0
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/xamarin-forms/Cinephile/Cinephile/ViewModels/MovieDetailViewModel.cs b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/MovieDetailViewModel.cs
similarity index 100%
rename from samples/xamarin-forms/Cinephile/Cinephile/ViewModels/MovieDetailViewModel.cs
rename to samples/xamarin-forms/Cinephile/Cinephile.ViewModels/MovieDetailViewModel.cs
diff --git a/samples/xamarin-forms/Cinephile/Cinephile/ViewModels/UpcomingMoviesCellViewModel.cs b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/UpcomingMoviesCellViewModel.cs
similarity index 100%
rename from samples/xamarin-forms/Cinephile/Cinephile/ViewModels/UpcomingMoviesCellViewModel.cs
rename to samples/xamarin-forms/Cinephile/Cinephile.ViewModels/UpcomingMoviesCellViewModel.cs
diff --git a/samples/xamarin-forms/Cinephile/Cinephile/ViewModels/UpcomingMoviesListViewModel.cs b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/UpcomingMoviesListViewModel.cs
similarity index 100%
rename from samples/xamarin-forms/Cinephile/Cinephile/ViewModels/UpcomingMoviesListViewModel.cs
rename to samples/xamarin-forms/Cinephile/Cinephile.ViewModels/UpcomingMoviesListViewModel.cs
diff --git a/samples/xamarin-forms/Cinephile/Cinephile/ViewModels/ViewModelBase.cs b/samples/xamarin-forms/Cinephile/Cinephile.ViewModels/ViewModelBase.cs
similarity index 100%
rename from samples/xamarin-forms/Cinephile/Cinephile/ViewModels/ViewModelBase.cs
rename to samples/xamarin-forms/Cinephile/Cinephile.ViewModels/ViewModelBase.cs
diff --git a/samples/xamarin-forms/Cinephile/Cinephile.sln b/samples/xamarin-forms/Cinephile/Cinephile.sln
index 0d7f3c2838..deb4566fd3 100644
--- a/samples/xamarin-forms/Cinephile/Cinephile.sln
+++ b/samples/xamarin-forms/Cinephile/Cinephile.sln
@@ -16,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cinephile.UnitTests", "Cine
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F7F1F417-87A0-41F7-9F14-F46A772BDAF7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cinephile.ViewModels", "Cinephile.ViewModels\Cinephile.ViewModels.csproj", "{42AFC9D3-D010-44B3-85FC-E1AE52F70511}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -87,6 +89,18 @@ Global
{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhone.Build.0 = Release|Any CPU
{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{65DFE289-C949-48A5-AD74-6B93E3ECCCE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|Any CPU.Build.0 = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhone.Build.0 = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {42AFC9D3-D010-44B3-85FC-E1AE52F70511}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj b/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj
index 4e4f5e7cb1..69baf3f114 100644
--- a/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj
+++ b/samples/xamarin-forms/Cinephile/Cinephile/Cinephile.csproj
@@ -9,14 +9,13 @@
-
-
-
-
+
+
+
diff --git a/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj b/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj
index cbf0e286c3..b864473a2a 100644
--- a/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj
+++ b/samples/xamarin-forms/Cinephile/Droid/Cinephile.Droid.csproj
@@ -77,6 +77,8 @@
+
+
@@ -84,11 +86,13 @@
+
+ 4.4.0
+
-
-
- $(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
-
-
-
+
+
+ $(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll
+
+