diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..63bb3a8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,33 @@
+root = true
+
+[*]
+end_of_line = crlf
+tab_width = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.xml]
+indent_style = tab
+
+[*.xaml]
+indent_style = tab
+
+[{*.cs, *.ts}]
+indent_style = tab
+
+[*.json]
+indent_style = tab
+
+[*.*proj]
+indent_style = tab
+tab_width = 2
+indent_size = 2
+
+[*.js]
+indent_style = space
+
+[*.yml]
+indent_style = space
+
+[*.md]
+indent_style = space
diff --git a/.gitignore b/.gitignore
index 01940b2..b067d18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,7 @@ bld/
 # Visual Studio 2015 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-**/wwwroot/playground
+wwwroot
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -153,7 +152,7 @@ publish/
 PublishScripts/
 
 # NuGet Packages
-#*.nupkg
+*.nupkg
 # The packages folder can be ignored because of Package Restore
 **/packages/*
 # except build/, which is used as an MSBuild target.
@@ -259,4 +258,4 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
\ No newline at end of file
+*.pyc
diff --git a/NugetPackages/universalimageloader.1.9.5.8565.nupkg b/NugetPackages/universalimageloader.1.9.5.8565.nupkg
deleted file mode 100644
index 4f47a05..0000000
Binary files a/NugetPackages/universalimageloader.1.9.5.8565.nupkg and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/Controllers/HomeController.cs b/Uno.UI.Demo.AspnetShell/Controllers/HomeController.cs
deleted file mode 100644
index 69523c8..0000000
--- a/Uno.UI.Demo.AspnetShell/Controllers/HomeController.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Uno.UI.Demo.AspnetShell.Models;
-
-namespace Uno.UI.Demo.AspnetShell.Controllers
-{
-	public class HomeController : Controller
-	{
-		public IActionResult Index()
-		{
-			return View();
-		}
-
-		public IActionResult Error()
-		{
-			return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-		}
-	}
-}
diff --git a/Uno.UI.Demo.AspnetShell/Models/ErrorViewModel.cs b/Uno.UI.Demo.AspnetShell/Models/ErrorViewModel.cs
deleted file mode 100644
index 0760e8a..0000000
--- a/Uno.UI.Demo.AspnetShell/Models/ErrorViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Uno.UI.Demo.AspnetShell.Models
-{
-    public class ErrorViewModel
-    {
-        public string RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}
\ No newline at end of file
diff --git a/Uno.UI.Demo.AspnetShell/Program.cs b/Uno.UI.Demo.AspnetShell/Program.cs
deleted file mode 100644
index 491613f..0000000
--- a/Uno.UI.Demo.AspnetShell/Program.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Uno.UI.Demo.AspnetShell
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            BuildWebHost(args).Run();
-        }
-
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
-                .Build();
-    }
-}
diff --git a/Uno.UI.Demo.AspnetShell/Views/Home/Index.cshtml b/Uno.UI.Demo.AspnetShell/Views/Home/Index.cshtml
deleted file mode 100644
index d625cfd..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/Home/Index.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-<a href="Playground/index.html">Playground...</a>
diff --git a/Uno.UI.Demo.AspnetShell/Views/Shared/Error.cshtml b/Uno.UI.Demo.AspnetShell/Views/Shared/Error.cshtml
deleted file mode 100644
index ec2ea6b..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/Shared/Error.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@model ErrorViewModel
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (Model.ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@Model.RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
-</p>
diff --git a/Uno.UI.Demo.AspnetShell/Views/Shared/_Layout.cshtml b/Uno.UI.Demo.AspnetShell/Views/Shared/_Layout.cshtml
deleted file mode 100644
index e4fdad2..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,29 +0,0 @@
-@using System.Reflection
-@using Microsoft.DotNet.PlatformAbstractions
-@{
-    var version = typeof(Program)
-        .GetTypeInfo()
-        .Assembly
-        .GetCustomAttribute<AssemblyFileVersionAttribute>()
-        ?.Version
-            ?? "0.0-dev";
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<title>@ViewData["Title"]Uno</title>
-
-    <link rel="icon" type="image/png" href="~/images/favicon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="~/images/favicon24.png" sizes="24x24">
-    <link rel="icon" type="image/png" href="~/images/favicon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="~/images/favicon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="~/images/favicon256.png" sizes="256x256">
-</head>
-<body>
-	@RenderBody()
-
-	@RenderSection("Scripts", required: false)
-</body>
-</html>
diff --git a/Uno.UI.Demo.AspnetShell/Views/Shared/_ValidationScriptsPartial.cshtml b/Uno.UI.Demo.AspnetShell/Views/Shared/_ValidationScriptsPartial.cshtml
deleted file mode 100644
index a699aaf..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/Shared/_ValidationScriptsPartial.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<environment include="Development">
-    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
-</environment>
-<environment exclude="Development">
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"
-            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
-            asp-fallback-test="window.jQuery && window.jQuery.validator"
-            crossorigin="anonymous"
-            integrity="sha384-Fnqn3nxp3506LP/7Y3j/25BlWeA3PXTyT1l78LjECcPaKCV12TsZP7yyMxOe/G/k">
-    </script>
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.6/jquery.validate.unobtrusive.min.js"
-            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
-            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
-            crossorigin="anonymous"
-            integrity="sha384-JrXK+k53HACyavUKOsL+NkmSesD2P+73eDMrbTtTk0h4RmOF8hF8apPlkp26JlyH">
-    </script>
-</environment>
diff --git a/Uno.UI.Demo.AspnetShell/Views/_ViewImports.cshtml b/Uno.UI.Demo.AspnetShell/Views/_ViewImports.cshtml
deleted file mode 100644
index 210d6bd..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using Uno.UI.Demo.AspnetShell
-@using Uno.UI.Demo.AspnetShell.Models
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Uno.UI.Demo.AspnetShell/Views/_ViewStart.cshtml b/Uno.UI.Demo.AspnetShell/Views/_ViewStart.cshtml
deleted file mode 100644
index a5f1004..0000000
--- a/Uno.UI.Demo.AspnetShell/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/favicon.ico b/Uno.UI.Demo.AspnetShell/wwwroot/favicon.ico
deleted file mode 100644
index 664023c..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/favicon.ico and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/googlebbe0bf0f35d3c279.html b/Uno.UI.Demo.AspnetShell/wwwroot/googlebbe0bf0f35d3c279.html
deleted file mode 100644
index 0d9a427..0000000
--- a/Uno.UI.Demo.AspnetShell/wwwroot/googlebbe0bf0f35d3c279.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: googlebbe0bf0f35d3c279.html
\ No newline at end of file
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon16.png b/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon16.png
deleted file mode 100644
index 1781dda..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon16.png and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon24.png b/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon24.png
deleted file mode 100644
index b433714..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon24.png and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon256.png b/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon256.png
deleted file mode 100644
index 4080d52..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon256.png and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon32.png b/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon32.png
deleted file mode 100644
index e786487..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon32.png and /dev/null differ
diff --git a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon48.png b/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon48.png
deleted file mode 100644
index c9bcac2..0000000
Binary files a/Uno.UI.Demo.AspnetShell/wwwroot/images/favicon48.png and /dev/null differ
diff --git a/Uno.UI.Demo.Shared/Samples/Animations.xaml b/Uno.UI.Demo.Shared/Samples/Animations.xaml
deleted file mode 100644
index e8e135d..0000000
--- a/Uno.UI.Demo.Shared/Samples/Animations.xaml
+++ /dev/null
@@ -1,113 +0,0 @@
-<UserControl x:Class="Uno.UI.Demo.Samples.Animations"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:local="using:Uno.UI.Demo.Samples"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 mc:Ignorable="">
-	<ScrollViewer>
-		<StackPanel Style="{StaticResource SamplePanelStyle}">
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="AnimationTests">
-					<VisualState x:Name="Animated">
-						<Storyboard>
-							<!-- Animation 1 -->
-							<DoubleAnimation Storyboard.TargetProperty="Angle"
-											 Storyboard.TargetName="RotateTransform1"
-											 From="0"
-											 To="360"
-											 Duration="0:0:3" />
-							<DoubleAnimation Storyboard.TargetProperty="Opacity"
-											 Storyboard.TargetName="Rectangle1"
-											 To="0"
-											 Duration="0:0:2" />
-							<!-- Animation 2 -->
-							<DoubleAnimation Storyboard.TargetProperty="ScaleX"
-											 Storyboard.TargetName="ScaleTransform1"
-											 To="0.5"
-											 Duration="0:0:2">
-								<DoubleAnimation.EasingFunction>
-									<BounceEase Bounces="2"
-												Bounciness="3" />
-								</DoubleAnimation.EasingFunction>
-							</DoubleAnimation>
-							<DoubleAnimation Storyboard.TargetProperty="ScaleY"
-											 Storyboard.TargetName="ScaleTransform1"
-											 To="0.5"
-											 Duration="0:0:2">
-								<DoubleAnimation.EasingFunction>
-									<BounceEase Bounces="2"
-												Bounciness="3" />
-								</DoubleAnimation.EasingFunction>
-							</DoubleAnimation>
-							<!-- Animation 3 -->
-							<DoubleAnimation Storyboard.TargetProperty="Y"
-											 Storyboard.TargetName="TranslateTransform1"
-											 From="0"
-											 To="150"
-											 Duration="0:0:2">
-								<DoubleAnimation.EasingFunction>
-									<BounceEase Bounces="2"
-												Bounciness="3" />
-								</DoubleAnimation.EasingFunction>
-							</DoubleAnimation>
-							<DoubleAnimation Storyboard.TargetProperty="X"
-											 Storyboard.TargetName="TranslateTransform2"
-											 From="0"
-											 To="150"
-											 Duration="0:0:2">
-								<DoubleAnimation.EasingFunction>
-									<CubicEase EasingMode="EaseInOut" />
-								</DoubleAnimation.EasingFunction>
-							</DoubleAnimation>
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="NotAnimated" />
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-
-			<TextBlock  Style="{StaticResource SampleSectionTextBlockStyle}"
-						TextWrapping="Wrap"
-						Text="Animations using VisualStates, DoubleAnimations, EasingFunctions and RenderTransforms" />
-
-			<Button Content="Click me!"
-					Click="Button_Click" />
-
-			<Rectangle Fill="{StaticResource Color13Brush}"
-					   Width="100"
-					   Height="100"
-					   x:Name="Rectangle1"
-					   Opacity="1">
-				<Rectangle.RenderTransform>
-					<RotateTransform CenterX="50"
-									 CenterY="50"
-									 x:Name="RotateTransform1" />
-				</Rectangle.RenderTransform>
-			</Rectangle>
-			<Rectangle Fill="{StaticResource Color16Brush}"
-					   Width="100"
-					   Height="100">
-				<Rectangle.RenderTransform>
-					<ScaleTransform CenterX="50"
-									CenterY="50"
-									x:Name="ScaleTransform1" />
-
-				</Rectangle.RenderTransform>
-			</Rectangle>
-
-			<Rectangle Fill="{StaticResource Color15Brush}"
-					   Width="100"
-					   Height="100">
-				<Rectangle.RenderTransform>
-					<TranslateTransform x:Name="TranslateTransform1" />
-				</Rectangle.RenderTransform>
-			</Rectangle>
-			<Rectangle Fill="{StaticResource Color14Brush}"
-					   Width="100"
-					   Height="100">
-				<Rectangle.RenderTransform>
-					<TranslateTransform x:Name="TranslateTransform2" />
-				</Rectangle.RenderTransform>
-			</Rectangle>
-		</StackPanel>
-	</ScrollViewer>
-</UserControl>
diff --git a/Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.shproj b/Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.shproj
deleted file mode 100644
index 89282be..0000000
--- a/Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.shproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </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" />
-  <PropertyGroup />
-  <Import Project="Uno.UI.Demo.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-  <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-	</ItemGroup>
-</Project>
diff --git a/Uno.UI.Demo.WASM/WasmScripts/GoogleAnalytics.js b/Uno.UI.Demo.WASM/WasmScripts/GoogleAnalytics.js
deleted file mode 100644
index c3409ca..0000000
--- a/Uno.UI.Demo.WASM/WasmScripts/GoogleAnalytics.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var Uno;
-(function (Uno) {
-	var UI;
-	(function (UI) {
-		var Demo;
-		(function (Demo) {
-			var Analytics = /** @class */ (function () {
-				function Analytics() {
-				}
-				Analytics.reportPageView = function (screenName, appName) {
-					if (appName === void 0) { appName = "Uno.UI.Demo.Playground"; }
-					if (Analytics.init(screenName, appName)) {
-						return "ok";
-					}
-					var gtag = window.gtag;
-					if (gtag) {
-						gtag("event", "screen_view", {
-							screen_name: screenName,
-							app_name: appName
-						});
-					}
-					else {
-						console.error("Google Analytics not present, can't report page view for " + screenName + ".");
-					}
-					return "ok";
-				};
-				Analytics.init = function (screenName, appName) {
-					if (Analytics.isLoaded) {
-						return false;
-					}
-					var script = "\n\twindow.dataLayer = window.dataLayer || [];\n\tfunction gtag() { dataLayer.push(arguments); }\n\tgtag('js', new Date());\n\tgtag('config', 'UA-26688675-3');\n\tgtag(\"event\", \"screen_view\", {screen_name: \"" + screenName + "\", app_name: \"" + appName + "\"});";
-					var script1 = document.createElement("script");
-					script1.type = "text/javascript";
-					script1.src = "https://www.googletagmanager.com/gtag/js?id=UA-26688675-3";
-					document.body.appendChild(script1);
-					var script2 = document.createElement("script");
-					script2.type = "text/javascript";
-					script2.innerText = script;
-					document.body.appendChild(script2);
-					Analytics.isLoaded = true;
-					return true;
-				};
-				Analytics.isLoaded = false;
-				return Analytics;
-			}());
-			Demo.Analytics = Analytics;
-		})(Demo = UI.Demo || (UI.Demo = {}));
-	})(UI = Uno.UI || (Uno.UI = {}));
-})(Uno || (Uno = {}));
diff --git a/gitversion.yml b/gitversion.yml
new file mode 100644
index 0000000..aa7f738
--- /dev/null
+++ b/gitversion.yml
@@ -0,0 +1,15 @@
+assembly-versioning-scheme: MajorMinorPatch
+mode: ContinuousDeployment
+next-version: 1.3.0
+continuous-delivery-fallback-tag: ""
+branches:
+  master:
+    tag: dev
+  stable:
+    tag: 
+  dev/.*?/(.*?):
+    tag: dev.{BranchName}
+  projects/(.*?):
+    tag: proj-{BranchName}
+ignore:
+  sha: []
\ No newline at end of file
diff --git a/nuget.config b/nuget.config
deleted file mode 100644
index 5c623a0..0000000
--- a/nuget.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
-  <packageSources>
-    <add key="LocalCache" value=".\NugetPackages" />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="Microsoft and .NET" value="https://www.nuget.org/api/v2/curated-feeds/microsoftdotnet/" />
-  </packageSources>
-  <disabledPackageSources>
-    <add key="Microsoft and .NET" value="true" />
-  </disabledPackageSources>
-</configuration>
\ No newline at end of file
diff --git a/src/Build/Build.csproj b/src/Build/Build.csproj
new file mode 100644
index 0000000..52a66be
--- /dev/null
+++ b/src/Build/Build.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+		<GetVersion>false</GetVersion>
+		<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
+	</PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\.vsts-ci.yml" Link=".vsts-ci.yml" />
+    <None Include="build.proj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GitVersionTask" Version="3.6.5" />
+    <PackageReference Include="MSBuildTasks" Version="1.5.0.235" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Build/ReleaseNotes.txt b/src/Build/ReleaseNotes.txt
new file mode 100644
index 0000000..2787b19
--- /dev/null
+++ b/src/Build/ReleaseNotes.txt
@@ -0,0 +1 @@
+Uno Gallery
\ No newline at end of file
diff --git a/src/Build/build.proj b/src/Build/build.proj
new file mode 100644
index 0000000..64ff06d
--- /dev/null
+++ b/src/Build/build.proj
@@ -0,0 +1,34 @@
+<Project DefaultTargets="UpdateVersion">
+	<Import Project="obj\Build.csproj.nuget.g.props" Condition="Exists('obj\Build.csproj.nuget.g.props')" />
+	<Import Project="obj\Build.csproj.nuget.g.targets" Condition="Exists('obj\Build.csproj.nuget.g.targets')" />
+
+  <Target Name="UpdateVersion" DependsOnTargets="GetVersion">
+		
+	<Message Text="Updating versions" />
+		
+	<XmlUpdate XmlFileName="..\Uno.Playground.iOS\Info.plist" 
+							 XPath="//plist/dict/key[text() = 'CFBundleShortVersionString']/following-sibling::string[1]" 
+							 Value="$(GITVERSION_MAJOR).$(GITVERSION_MINOR)" />
+		
+	<XmlUpdate XmlFileName="..\Uno.Playground.iOS\Info.plist" 
+							 XPath="//plist/dict/key[text() = 'CFBundleVersion']/following-sibling::string[1]" 
+							 Value="$(GITVERSION_COMMITSSINCEVERSIONSOURCE)" />
+
+		<XmlUpdate
+			XmlFileName="..\Uno.Playground.Droid\Properties\AndroidManifest.xml"
+			XPath="/manifest/@android:versionCode"
+			Value="$(GITVERSION_COMMITSSINCEVERSIONSOURCE)"
+			Namespace="http://schemas.android.com/apk/res/android"
+			Prefix="android" />
+
+		<XmlUpdate
+			XmlFileName="..\Uno.Playground.UWP\package.appxmanifest"
+			XPath="/x:Package/x:Identity/@Version"
+			Value="$(GITVERSION_MAJOR).$(GITVERSION_MINOR).$(GITVERSION_COMMITSSINCEVERSIONSOURCE).0"
+			Namespace="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+			Prefix="x"/>
+		
+	<Message Text="Assm: Ver $(GITVERSION_MAJOR).$(GITVERSION_MINOR).$(GITVERSION_COMMITSSINCEVERSIONSOURCE)" />
+  </Target>
+
+</Project>
diff --git a/src/Uno.Playground.Api/Constants.cs b/src/Uno.Playground.Api/Constants.cs
new file mode 100644
index 0000000..3ee813f
--- /dev/null
+++ b/src/Uno.Playground.Api/Constants.cs
@@ -0,0 +1,8 @@
+namespace Uno.UI.Demo.Api
+{
+	internal static class Constants
+	{
+		internal const string SamplesTableName = "Samples";
+		internal const string DefaultCategoryIdForSaving = "default";
+	}
+}
diff --git a/src/Uno.Playground.Api/Helpers/HttpRequestMessageExtensions.cs b/src/Uno.Playground.Api/Helpers/HttpRequestMessageExtensions.cs
new file mode 100644
index 0000000..2204db0
--- /dev/null
+++ b/src/Uno.Playground.Api/Helpers/HttpRequestMessageExtensions.cs
@@ -0,0 +1,26 @@
+using System.Net.Http;
+using System.ServiceModel.Channels;
+using System.Web;
+
+namespace Uno.UI.Demo.AspnetShell.Helpers
+{
+	public static class HttpRequestMessageExtensions
+	{
+		public static string GetClientIp(this HttpRequestMessage request)
+		{
+			if (request.Properties.ContainsKey("MS_HttpContext"))
+			{
+				return ((HttpContextWrapper)request.Properties["MS_HttpContext"]).Request.UserHostAddress;
+			}
+
+			if (request.Properties.ContainsKey(RemoteEndpointMessageProperty.Name))
+			{
+				RemoteEndpointMessageProperty prop;
+				prop = (RemoteEndpointMessageProperty)request.Properties[RemoteEndpointMessageProperty.Name];
+				return prop.Address;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/Helpers/TableQueryExtensions.cs b/src/Uno.Playground.Api/Helpers/TableQueryExtensions.cs
new file mode 100644
index 0000000..192444b
--- /dev/null
+++ b/src/Uno.Playground.Api/Helpers/TableQueryExtensions.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Storage.Table;
+
+namespace Uno.UI.Demo.Api.Helpers
+{
+	public static class TableQueryExtensions
+	{
+		public static TableQuery<T> SelectColumn<T>(
+			this TableQuery<T> tableQuery,
+			string column)
+			where T : ITableEntity, new()
+		{
+			if (tableQuery.SelectColumns == null)
+			{
+				tableQuery.SelectColumns = new List<string>();
+			}
+
+			tableQuery.SelectColumns.Add(column);
+
+			return tableQuery;
+		}
+
+		public static Task<TableQuerySegment<T>> ExecuteQuery<T>(
+			this CloudTable cloudTable,
+			TableQuery<T> query,
+			CancellationToken ct)
+			where T : ITableEntity, new()
+		{
+			return cloudTable.ExecuteQuerySegmentedAsync(
+				query,
+				token: null,
+				requestOptions: null,
+				operationContext: null,
+				cancellationToken: ct);
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/Models/Sample.cs b/src/Uno.Playground.Api/Models/Sample.cs
new file mode 100644
index 0000000..75e5e72
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/Sample.cs
@@ -0,0 +1,52 @@
+using Microsoft.WindowsAzure.Storage.Table;
+
+namespace Uno.UI.Demo.Api.Models
+{
+	public class Sample : TableEntity
+	{
+		public Sample()
+		{
+			PartitionKey = nameof(Sample);
+		}
+
+		public Sample(string id) : this()
+		{
+			RowKey = id;
+			ETag = "*";
+		}
+
+		[IgnoreProperty]
+		public string Id => RowKey;
+
+		public string Category { get; set; }
+
+		public string Title { get; set; }
+
+		public string Description { get; set; }
+
+		public string Xaml { get; set; }
+
+		public string Data { get; set; }
+
+		[IgnoreProperty]
+		public string[] ParsedKeywords
+		{
+			get => Keywords?.Split(';') ?? new string[] {};
+			set => Keywords = value == null ? "" : string.Join(";", value);
+		}
+
+		public string Keywords { get; set; }
+
+		public string IpAddress { get; set; }
+
+		public string App { get; set; }
+
+		public string UserAgent { get; set; }
+
+		public long ListingOrder { get; set; } = 0;
+
+		public string PathData { get; set; }
+
+		public string AccentPathData { get; set; }
+	}
+}
diff --git a/src/Uno.Playground.Api/Models/SampleCategory.cs b/src/Uno.Playground.Api/Models/SampleCategory.cs
new file mode 100644
index 0000000..dd4aaa1
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/SampleCategory.cs
@@ -0,0 +1,29 @@
+using Microsoft.WindowsAzure.Storage.Table;
+
+namespace Uno.UI.Demo.Api.Models
+{
+	public class SampleCategory : TableEntity
+	{
+		public SampleCategory()
+		{
+			PartitionKey = nameof(SampleCategory);
+		}
+
+		public SampleCategory(string id) : this()
+		{
+			RowKey = id;
+			ETag = "*";
+		}
+
+		[IgnoreProperty]
+		public string Id => RowKey;
+
+		public string Title { get; set; }
+
+		public long ListingOrder { get; set; } = 0;
+
+		public string PathData { get; set; }
+
+		public string AccentPathData { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Uno.Playground.Api/Models/SampleCategoryViewModel.cs b/src/Uno.Playground.Api/Models/SampleCategoryViewModel.cs
new file mode 100644
index 0000000..4e53ed1
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/SampleCategoryViewModel.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace Uno.UI.Demo.Api.Models
+{
+	public class SampleCategoryViewModel
+	{
+		private readonly SampleCategory _category;
+
+		public SampleCategoryViewModel(SampleCategory category, IEnumerable<Sample> samples)
+		{
+			_category = category;
+			Samples = samples
+				.Where(s => s.Category.Equals(category.Id))
+				.Select(s => new SampleViewModel(s)).ToArray();
+		}
+
+		public string CategoryId => _category.Id;
+
+		public string Title => _category.Title;
+
+		public string DefaultIconPath => _category.PathData;
+
+		public string DefaultIconAccentPath => _category.AccentPathData;
+
+		public SampleViewModel[] Samples { get; }
+
+		[IgnoreDataMember]
+		public int SamplesHash
+		{
+			get
+			{
+				var sum = 0;
+				foreach (var s in Samples)
+				{
+					unchecked
+					{
+						sum += GetEtagHash(s.Etag);
+					}
+				}
+
+				return sum;
+			}
+		}
+
+		private static int GetEtagHash(string s)
+		{
+			unchecked
+			{
+				var r = 0;
+
+				foreach (var c in s)
+				{
+					r += c;
+				}
+
+				return r;
+
+			}
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/Models/SampleDetailViewModel.cs b/src/Uno.Playground.Api/Models/SampleDetailViewModel.cs
new file mode 100644
index 0000000..dc5f9fc
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/SampleDetailViewModel.cs
@@ -0,0 +1,24 @@
+namespace Uno.UI.Demo.Api.Models
+{
+	public class SampleDetailViewModel
+	{
+		private readonly Sample _sample;
+
+		public SampleDetailViewModel(Sample sample)
+		{
+			_sample = sample;
+		}
+
+		public string Id => _sample.Id;
+
+		public string Title => _sample.Title ?? "";
+
+		public string Description => _sample.Description ?? "";
+
+		public string Category => _sample.Category;
+
+		public string Xaml => _sample.Xaml ?? "";
+
+		public string Data => _sample.Data ?? "";
+	}
+}
diff --git a/src/Uno.Playground.Api/Models/SampleSaveRequest.cs b/src/Uno.Playground.Api/Models/SampleSaveRequest.cs
new file mode 100644
index 0000000..bc8ae7a
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/SampleSaveRequest.cs
@@ -0,0 +1,13 @@
+namespace Uno.UI.Demo.Api.Models
+{
+	public class SampleSaveRequest
+	{
+		public string App { get; set; }
+		public string Category { get; set; }
+		public string Title { get; set; }
+		public string Xaml { get; set; }
+		public string Data { get; set; }
+		public string PathData { get; set; }
+		public string AccentPathData { get; set; }
+	}
+}
diff --git a/src/Uno.Playground.Api/Models/SampleViewModel.cs b/src/Uno.Playground.Api/Models/SampleViewModel.cs
new file mode 100644
index 0000000..007aa6c
--- /dev/null
+++ b/src/Uno.Playground.Api/Models/SampleViewModel.cs
@@ -0,0 +1,29 @@
+using System.Runtime.Serialization;
+
+namespace Uno.UI.Demo.Api.Models
+{
+	public partial class SampleViewModel
+	{
+		private readonly Sample _sample;
+
+		public SampleViewModel(Sample sample)
+		{
+			_sample = sample;
+		}
+
+		public string Id => _sample.Id;
+
+		public string Title => _sample.Title ?? "(no title)";
+
+		public string Description => _sample.Description ?? "";
+
+		public string[] Keywords => _sample.ParsedKeywords ?? new string[] { };
+
+		public string IconPath => _sample.PathData;
+
+		public string IconAccentPath => _sample.AccentPathData;
+
+		[IgnoreDataMember]
+		public string Etag => _sample.ETag;
+	}
+}
\ No newline at end of file
diff --git a/src/Uno.Playground.Api/SampleGet.cs b/src/Uno.Playground.Api/SampleGet.cs
new file mode 100644
index 0000000..9dbbd34
--- /dev/null
+++ b/src/Uno.Playground.Api/SampleGet.cs
@@ -0,0 +1,41 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table.Queryable;
+using Uno.UI.Demo.Api.Helpers;
+using Uno.UI.Demo.Api.Models;
+
+namespace Uno.UI.Demo.Api
+{
+	public static class SampleGet
+	{
+		[FunctionName("SampleGet")]
+		public static async Task<HttpResponseMessage> Run(
+			[HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "samples/{id}")]
+			HttpRequestMessage req,
+			[Table(Constants.SamplesTableName)] CloudTable table,
+			TraceWriter log,
+			string id,
+			CancellationToken ct)
+		{
+			var sampleQuery = table
+				.CreateQuery<Sample>()
+				.Where(smpl => smpl.PartitionKey.Equals(nameof(Sample)) && smpl.RowKey.Equals(id))
+				.AsTableQuery();
+
+			var queryResult = await table.ExecuteQuery(sampleQuery, ct);
+
+			var sample = queryResult.Select(s => new SampleDetailViewModel(s)).FirstOrDefault();
+
+			return sample == null
+				? req.CreateErrorResponse(HttpStatusCode.NotFound, "Sample not found")
+				: req.CreateResponse(HttpStatusCode.OK, sample);
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/SamplePost.cs b/src/Uno.Playground.Api/SamplePost.cs
new file mode 100644
index 0000000..317675e
--- /dev/null
+++ b/src/Uno.Playground.Api/SamplePost.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Http;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.WindowsAzure.Storage.Table;
+using Newtonsoft.Json;
+using Uno.UI.Demo.Api.Models;
+using Uno.UI.Demo.AspnetShell.Helpers;
+
+namespace Uno.UI.Demo.Api
+{
+	public static class SamplePost
+	{
+		[FunctionName("SamplePost")]
+		public static async Task<HttpResponseMessage> Run(
+			[HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = "samples")]
+			HttpRequestMessage req,
+			[Table(Constants.SamplesTableName)] CloudTable table,
+			TraceWriter log,
+			CancellationToken ct)
+		{
+			var saveRequest =
+				JsonConvert.DeserializeObject<SampleSaveRequest>(await req.Content.ReadAsStringAsync());
+
+			if (saveRequest == null)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.BadRequest, "Request payload required.");
+			}
+
+			var id = Guid.NewGuid().ToString("N").Substring(24); // 8 characters is enough
+
+			if (saveRequest.Xaml == null || saveRequest.Xaml.Length < 5)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.BadRequest, "Xaml required.");
+			}
+
+			if (saveRequest.Xaml.Length > 512 * 1024)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Xaml too big.");
+			}
+
+			if (saveRequest.Data != null && saveRequest.Data.Length > 16 * 1024)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Data too big.");
+			}
+
+			if (saveRequest.Title != null && saveRequest.Title.Length > 255)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Title too big.");
+			}
+
+			if (saveRequest.App != null && saveRequest.App.Length > 255)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "App name too big.");
+			}
+
+			var sample = new Sample(id)
+			{
+				Data = saveRequest.Data,
+				Xaml = saveRequest.Xaml,
+				Category = Constants.DefaultCategoryIdForSaving,
+				Title = saveRequest.Title,
+				IpAddress = req.GetClientIp(),
+				UserAgent = req.Headers.UserAgent.ToString(),
+				App = saveRequest.App
+			};
+
+			var operation = new TableBatchOperation();
+			operation.Insert(sample);
+			await table.ExecuteBatchAsync(operation, null, null, ct);
+
+			return req.CreateResponse(HttpStatusCode.OK, id);
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/SampleSave.cs b/src/Uno.Playground.Api/SampleSave.cs
new file mode 100644
index 0000000..28525c1
--- /dev/null
+++ b/src/Uno.Playground.Api/SampleSave.cs
@@ -0,0 +1,129 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table.Queryable;
+using Newtonsoft.Json;
+using Uno.UI.Demo.Api.Helpers;
+using Uno.UI.Demo.Api.Models;
+using Uno.UI.Demo.AspnetShell.Helpers;
+
+namespace Uno.UI.Demo.Api
+{
+	public static class SampleSave
+	{
+		[FunctionName("SampleSave")]
+		public static async Task<HttpResponseMessage> Run(
+			[HttpTrigger(AuthorizationLevel.Admin, "put", Route = "samples/{id}")]
+			HttpRequestMessage req,
+			[Table(Constants.SamplesTableName)] CloudTable table,
+			string id,
+			TraceWriter log,
+			CancellationToken ct)
+		{
+			var clientIp = req.GetClientIp();
+
+			var saveRequest =
+				JsonConvert.DeserializeObject<SampleSaveRequest>(await req.Content.ReadAsStringAsync());
+
+
+			var existingQuery = table
+				.CreateQuery<Sample>()
+				.Where(smpl => smpl.PartitionKey.Equals(nameof(Sample)) && smpl.RowKey.Equals(id))
+				.AsTableQuery();
+
+			var existing = (await table.ExecuteQuery(existingQuery, ct)).FirstOrDefault();
+			var sample = existing ?? new Sample(id);
+
+			var exists = existing != null;
+
+			if (saveRequest == null)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.BadRequest, "Request payload required.");
+			}
+
+			if (!exists && (saveRequest.Xaml == null || saveRequest.Xaml.Length < 5))
+			{
+				return req.CreateErrorResponse(HttpStatusCode.BadRequest, "Xaml required.");
+			}
+
+			if (saveRequest.Xaml != null && saveRequest.Xaml.Length > 512 * 1024)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Xaml too big.");
+			}
+
+			if (saveRequest.Data != null && saveRequest.Data.Length > 16 * 1024)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Data too big.");
+			}
+
+			if (saveRequest.Title != null && saveRequest.Title.Length > 255)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "Title too big.");
+			}
+
+			if (saveRequest.App != null && saveRequest.App.Length > 255)
+			{
+				return req.CreateErrorResponse(HttpStatusCode.RequestEntityTooLarge, "App name too big.");
+			}
+
+
+			if (!string.IsNullOrWhiteSpace(saveRequest.Data))
+			{
+				sample.Data = saveRequest.Data;
+			}
+
+			if (!string.IsNullOrWhiteSpace(saveRequest.Xaml))
+			{
+				sample.Xaml = saveRequest.Xaml;
+			}
+
+			if (string.IsNullOrWhiteSpace(sample.Category) || !string.IsNullOrWhiteSpace(saveRequest.Category))
+			{
+				sample.Category = saveRequest.Category ?? Constants.DefaultCategoryIdForSaving;
+			}
+			if (!string.IsNullOrWhiteSpace(saveRequest.Title))
+			{
+				sample.Title = saveRequest.Title;
+			}
+			if (string.IsNullOrWhiteSpace(sample.IpAddress))
+			{
+				sample.IpAddress = clientIp;
+			}
+			if (string.IsNullOrWhiteSpace(sample.UserAgent))
+			{
+				sample.UserAgent = req.Headers.UserAgent.ToString();
+			}
+			if (!string.IsNullOrWhiteSpace(saveRequest.App))
+			{
+				sample.App = saveRequest.App;
+			}
+			if (!string.IsNullOrWhiteSpace(saveRequest.PathData))
+			{
+				sample.PathData = saveRequest.PathData;
+			}
+			if (!string.IsNullOrWhiteSpace(saveRequest.AccentPathData))
+			{
+				sample.AccentPathData = saveRequest.AccentPathData;
+			}
+
+			var operation = new TableBatchOperation();
+			if (existing == null)
+			{
+				operation.Insert(sample);
+			}
+			else
+			{
+				operation.Merge(sample);
+			}
+			await table.ExecuteBatchAsync(operation, null, null, ct);
+
+			return req.CreateResponse(HttpStatusCode.OK, id);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Uno.Playground.Api/SamplesGet.cs b/src/Uno.Playground.Api/SamplesGet.cs
new file mode 100644
index 0000000..41092e3
--- /dev/null
+++ b/src/Uno.Playground.Api/SamplesGet.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs;
+using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
+using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table.Queryable;
+using Uno.UI.Demo.Api.Helpers;
+using Uno.UI.Demo.Api.Models;
+
+namespace Uno.UI.Demo.Api
+{
+	public static class SamplesGet
+	{
+		[FunctionName("SamplesGet")]
+		public static async Task<HttpResponseMessage> Run(
+			[HttpTrigger(AuthorizationLevel.Anonymous, "get", Route = "samples")]
+			HttpRequestMessage req,
+			[Table(Constants.SamplesTableName)] CloudTable table,
+			TraceWriter log,
+			CancellationToken ct)
+		{
+
+			var categoriesQuery = table
+				.CreateQuery<SampleCategory>()
+				.Where(cat => cat.PartitionKey.Equals(nameof(SampleCategory)) && !cat.RowKey.Equals(Constants.DefaultCategoryIdForSaving))
+				.AsTableQuery()
+				.SelectColumn(nameof(SampleCategory.Title));
+
+			var categories = (await table.ExecuteQuery(categoriesQuery, ct))
+				.OrderBy(cat => cat.ListingOrder)
+				.ThenBy(cat => cat.Title)
+				.ThenBy(cat => cat.Id)
+				.ToArray();
+
+			var result = new List<SampleCategoryViewModel>(categories.Length);
+
+			var etagSb = new StringBuilder();
+
+			etagSb.Append('"');
+
+			foreach (var category in categories)
+			{
+				var samplesQuery = table
+					.CreateQuery<Sample>()
+					.Where(smpl => smpl.PartitionKey.Equals(nameof(Sample)) && smpl.Category.Equals(category.Id))
+					.AsTableQuery()
+					.SelectColumn(nameof(Sample.Category))
+					.SelectColumn(nameof(Sample.Title))
+					.SelectColumn(nameof(Sample.Description))
+					.SelectColumn(nameof(Sample.Keywords));
+
+				var samples = (await table.ExecuteQuery(samplesQuery, ct))
+					.OrderBy(cat => cat.ListingOrder)
+					.ThenBy(cat => cat.Title)
+					.ThenBy(cat => cat.Id)
+					.ToArray();
+
+				var categoryVm = new SampleCategoryViewModel(category, samples);
+				result.Add(categoryVm);
+				etagSb.Append(categoryVm.SamplesHash.ToString("X"));
+			}
+
+			etagSb.Append('"');
+
+			var etag = etagSb.ToString();
+
+			if (req.Headers.IfMatch.Any(im => im.Tag.Equals(etag, StringComparison.OrdinalIgnoreCase)))
+			{
+				return req.CreateResponse(HttpStatusCode.NotModified);
+			}
+
+			var response = req.CreateResponse(HttpStatusCode.OK, result.ToArray());
+			response.Headers.CacheControl =
+				new CacheControlHeaderValue
+				{
+					NoCache = false,
+					Private = false,
+					MaxAge = TimeSpan.FromHours(0.5),
+					MustRevalidate = false,
+					NoStore = false,
+					NoTransform = true,
+					MaxStale = true
+				};
+			response.Headers.ETag = new EntityTagHeaderValue(etag, false);
+
+			return response;
+		}
+	}
+}
diff --git a/src/Uno.Playground.Api/Uno.Playground.Api.csproj b/src/Uno.Playground.Api/Uno.Playground.Api.csproj
new file mode 100644
index 0000000..c974688
--- /dev/null
+++ b/src/Uno.Playground.Api/Uno.Playground.Api.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>    
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/Uno.Playground.Api/host.json b/src/Uno.Playground.Api/host.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/src/Uno.Playground.Api/host.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/src/Uno.Playground.AspnetShell/.gitignore b/src/Uno.Playground.AspnetShell/.gitignore
new file mode 100644
index 0000000..6f67bda
--- /dev/null
+++ b/src/Uno.Playground.AspnetShell/.gitignore
@@ -0,0 +1,5 @@
+wwwroot/*
+
+!wwwroot/*.ico
+!wwwroot/google*
+
diff --git a/src/Uno.Playground.AspnetShell/Program.cs b/src/Uno.Playground.AspnetShell/Program.cs
new file mode 100644
index 0000000..85b044b
--- /dev/null
+++ b/src/Uno.Playground.AspnetShell/Program.cs
@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Uno.UI.Demo.AspnetShell
+{
+	public class Program
+	{
+		public static void Main(string[] args)
+		{
+			BuildWebHost(args).Run();
+		}
+
+		public static IWebHost BuildWebHost(string[] args) =>
+			WebHost.CreateDefaultBuilder(args)
+				.UseStartup<Startup>()
+				.Build();
+	}
+}
diff --git a/Uno.UI.Demo.AspnetShell/Properties/launchSettings.json b/src/Uno.Playground.AspnetShell/Properties/launchSettings.json
similarity index 100%
rename from Uno.UI.Demo.AspnetShell/Properties/launchSettings.json
rename to src/Uno.Playground.AspnetShell/Properties/launchSettings.json
diff --git a/Uno.UI.Demo.AspnetShell/Startup.cs b/src/Uno.Playground.AspnetShell/Startup.cs
similarity index 71%
rename from Uno.UI.Demo.AspnetShell/Startup.cs
rename to src/Uno.Playground.AspnetShell/Startup.cs
index 3f21c4a..c2cef76 100644
--- a/Uno.UI.Demo.AspnetShell/Startup.cs
+++ b/src/Uno.Playground.AspnetShell/Startup.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -10,15 +11,11 @@ using Microsoft.AspNetCore.Rewrite;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Table;
 
 namespace Uno.UI.Demo.AspnetShell
 {
 	public class Startup
 	{
-		private const string PlaygroundHost = "playground.platform.uno";
-
 		public Startup(IConfiguration configuration)
 		{
 			Configuration = configuration;
@@ -29,7 +26,10 @@ namespace Uno.UI.Demo.AspnetShell
 		// This method gets called by the runtime. Use this method to add services to the container.
 		public void ConfigureServices(IServiceCollection services)
 		{
-			services.AddMvc();
+			services.AddResponseCompression(c =>
+			{
+				c.EnableForHttps = true;
+			});
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -42,28 +42,23 @@ namespace Uno.UI.Demo.AspnetShell
 			}
 			else
 			{
-				app.UseExceptionHandler("/Home/Error");
+				app.UseExceptionHandler("/error.html");
 			}
 
+			app.UseResponseCompression();
+
 			// Static content
+			app.UseDefaultFiles();
 			app.UseStaticFiles(new StaticFileOptions
 			{
 				ContentTypeProvider = CreateContentTypeProvider(),
-				OnPrepareResponse = ConfigureCacheControl,
-			});
-
-			// MVC (dynamic) content
-			app.UseMvc(routes =>
-			{
-				routes.MapRoute(
-					name: "default",
-					template: "{controller=Home}/{action=Index}/{id?}");
+				OnPrepareResponse = ConfigureCacheControl
 			});
 		}
 
 		private static void ConfigureCacheControl(StaticFileResponseContext ctx)
 		{
-			if (ctx.File.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
+			if (ctx.File.Name.EndsWith(".clr", StringComparison.OrdinalIgnoreCase))
 			{
 				// Cache managed files for a year, based on this update:
 				// https://github.com/nventive/Uno.Wasm.Bootstrap/commit/f4859452c715c54ac40b968a303a242b0399d59a
@@ -73,9 +68,14 @@ namespace Uno.UI.Demo.AspnetShell
 
 		private FileExtensionContentTypeProvider CreateContentTypeProvider()
 		{
-			var provider = new FileExtensionContentTypeProvider();
-			provider.Mappings[".wasm"] = "application/wasm";
-			provider.Mappings[".dll"] = "application/octet-stream";
+			var provider = new FileExtensionContentTypeProvider
+			{
+				Mappings =
+				{
+					[".wasm"] = "application/wasm",
+					[".clr"] = "application/octet-stream"
+				}
+			};
 			return provider;
 		}
 	}
diff --git a/Uno.UI.Demo.AspnetShell/Uno.UI.Demo.AspnetShell.csproj b/src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj
similarity index 66%
rename from Uno.UI.Demo.AspnetShell/Uno.UI.Demo.AspnetShell.csproj
rename to src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj
index f9c7b21..60df49a 100644
--- a/Uno.UI.Demo.AspnetShell/Uno.UI.Demo.AspnetShell.csproj
+++ b/src/Uno.Playground.AspnetShell/Uno.Playground.AspnetShell.csproj
@@ -1,9 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<TargetFramework>netcoreapp2.0</TargetFramework>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Remove="wwwroot\playground\**" />
+	  <Content Remove="wwwroot\playground\**" />
+	  <EmbeddedResource Remove="wwwroot\playground\**" />
+	  <None Remove="wwwroot\playground\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.7" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
@@ -13,8 +20,4 @@
 		<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="wwwroot\playground\" />
-	</ItemGroup>
-
 </Project>
diff --git a/Uno.UI.Demo.AspnetShell/appsettings.Development.json b/src/Uno.Playground.AspnetShell/appsettings.Development.json
similarity index 100%
rename from Uno.UI.Demo.AspnetShell/appsettings.Development.json
rename to src/Uno.Playground.AspnetShell/appsettings.Development.json
diff --git a/Uno.UI.Demo.AspnetShell/appsettings.json b/src/Uno.Playground.AspnetShell/appsettings.json
similarity index 98%
rename from Uno.UI.Demo.AspnetShell/appsettings.json
rename to src/Uno.Playground.AspnetShell/appsettings.json
index 963dcce..8d8fbbe 100644
--- a/Uno.UI.Demo.AspnetShell/appsettings.json
+++ b/src/Uno.Playground.AspnetShell/appsettings.json
@@ -7,4 +7,4 @@
 	},
 	"ConnectionStrings": {
 	}
-}
\ No newline at end of file
+}
diff --git a/Uno.UI.Demo.Droid/Assets/AboutAssets.txt b/src/Uno.Playground.Droid/Assets/AboutAssets.txt
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/AboutAssets.txt
rename to src/Uno.Playground.Droid/Assets/AboutAssets.txt
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Bold.ttf b/src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Bold.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Bold.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Bold.ttf
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-ExtraBold.ttf b/src/Uno.Playground.Droid/Assets/Fonts/OpenSans-ExtraBold.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-ExtraBold.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/OpenSans-ExtraBold.ttf
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Light.ttf b/src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Light.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Light.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Light.ttf
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Regular.ttf b/src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Regular.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Regular.ttf
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Semibold.ttf b/src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/OpenSans-Semibold.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/OpenSans-Semibold.ttf
diff --git a/Uno.UI.Demo.Droid/Assets/Fonts/winjs-symbols.ttf b/src/Uno.Playground.Droid/Assets/Fonts/winjs-symbols.ttf
similarity index 100%
rename from Uno.UI.Demo.Droid/Assets/Fonts/winjs-symbols.ttf
rename to src/Uno.Playground.Droid/Assets/Fonts/winjs-symbols.ttf
diff --git a/Uno.UI.Demo.Droid/Environment.conf b/src/Uno.Playground.Droid/Environment.conf
similarity index 100%
rename from Uno.UI.Demo.Droid/Environment.conf
rename to src/Uno.Playground.Droid/Environment.conf
diff --git a/Uno.UI.Demo.Droid/Main.cs b/src/Uno.Playground.Droid/Main.cs
similarity index 100%
rename from Uno.UI.Demo.Droid/Main.cs
rename to src/Uno.Playground.Droid/Main.cs
diff --git a/Uno.UI.Demo.Droid/MainActivity.cs b/src/Uno.Playground.Droid/MainActivity.cs
similarity index 100%
rename from Uno.UI.Demo.Droid/MainActivity.cs
rename to src/Uno.Playground.Droid/MainActivity.cs
diff --git a/Uno.UI.Demo.Droid/Properties/AndroidManifest.xml b/src/Uno.Playground.Droid/Properties/AndroidManifest.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Properties/AndroidManifest.xml
rename to src/Uno.Playground.Droid/Properties/AndroidManifest.xml
diff --git a/Uno.UI.Demo.Droid/Properties/AssemblyInfo.cs b/src/Uno.Playground.Droid/Properties/AssemblyInfo.cs
similarity index 100%
rename from Uno.UI.Demo.Droid/Properties/AssemblyInfo.cs
rename to src/Uno.Playground.Droid/Properties/AssemblyInfo.cs
diff --git a/Uno.UI.Demo.Droid/Resources/AboutResources.txt b/src/Uno.Playground.Droid/Resources/AboutResources.txt
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/AboutResources.txt
rename to src/Uno.Playground.Droid/Resources/AboutResources.txt
diff --git a/Uno.UI.Demo.Droid/Resources/DO_NOT_INCLUDE_DRAWABLES.md b/src/Uno.Playground.Droid/Resources/DO_NOT_INCLUDE_DRAWABLES.md
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/DO_NOT_INCLUDE_DRAWABLES.md
rename to src/Uno.Playground.Droid/Resources/DO_NOT_INCLUDE_DRAWABLES.md
diff --git a/Uno.UI.Demo.Droid/Resources/color/ActionBarTextColorSelector.xml b/src/Uno.Playground.Droid/Resources/color/ActionBarTextColorSelector.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/color/ActionBarTextColorSelector.xml
rename to src/Uno.Playground.Droid/Resources/color/ActionBarTextColorSelector.xml
diff --git a/Uno.UI.Demo.Droid/Resources/drawable-mdpi/SplashScreen.png b/src/Uno.Playground.Droid/Resources/drawable-mdpi/SplashScreen.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable-mdpi/SplashScreen.png
rename to src/Uno.Playground.Droid/Resources/drawable-mdpi/SplashScreen.png
diff --git a/Uno.UI.Demo.Droid/Resources/drawable-v24/ic_launcher_foreground.xml b/src/Uno.Playground.Droid/Resources/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable-v24/ic_launcher_foreground.xml
rename to src/Uno.Playground.Droid/Resources/drawable-v24/ic_launcher_foreground.xml
diff --git a/Uno.UI.Demo.Droid/Resources/drawable-xhdpi/SplashScreen.png b/src/Uno.Playground.Droid/Resources/drawable-xhdpi/SplashScreen.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable-xhdpi/SplashScreen.png
rename to src/Uno.Playground.Droid/Resources/drawable-xhdpi/SplashScreen.png
diff --git a/Uno.UI.Demo.Droid/Resources/drawable-xxhdpi/SplashScreen.png b/src/Uno.Playground.Droid/Resources/drawable-xxhdpi/SplashScreen.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable-xxhdpi/SplashScreen.png
rename to src/Uno.Playground.Droid/Resources/drawable-xxhdpi/SplashScreen.png
diff --git a/Uno.UI.Demo.Droid/Resources/drawable/ic_launcher_background.xml b/src/Uno.Playground.Droid/Resources/drawable/ic_launcher_background.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable/ic_launcher_background.xml
rename to src/Uno.Playground.Droid/Resources/drawable/ic_launcher_background.xml
diff --git a/Uno.UI.Demo.Droid/Resources/drawable/splash.xml b/src/Uno.Playground.Droid/Resources/drawable/splash.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/drawable/splash.xml
rename to src/Uno.Playground.Droid/Resources/drawable/splash.xml
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml b/src/Uno.Playground.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml
rename to src/Uno.Playground.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/src/Uno.Playground.Droid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
rename to src/Uno.Playground.Droid/Resources/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher.png b/src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher.png
rename to src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png b/src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
rename to src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher_round.png b/src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
rename to src/Uno.Playground.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher.png b/src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher.png
rename to src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png b/src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
rename to src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher_round.png b/src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
rename to src/Uno.Playground.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher.png b/src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png b/src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher.png b/src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png b/src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png b/src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
rename to src/Uno.Playground.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/Uno.UI.Demo.Droid/Resources/values/Styles.xml b/src/Uno.Playground.Droid/Resources/values/Styles.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/values/Styles.xml
rename to src/Uno.Playground.Droid/Resources/values/Styles.xml
diff --git a/Uno.UI.Demo.Droid/Resources/values/ic_launcher_background.xml b/src/Uno.Playground.Droid/Resources/values/ic_launcher_background.xml
similarity index 100%
rename from Uno.UI.Demo.Droid/Resources/values/ic_launcher_background.xml
rename to src/Uno.Playground.Droid/Resources/values/ic_launcher_background.xml
diff --git a/Uno.UI.Demo.Droid/Uno.UI.Demo.Droid.csproj b/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj
similarity index 99%
rename from Uno.UI.Demo.Droid/Uno.UI.Demo.Droid.csproj
rename to src/Uno.Playground.Droid/Uno.Playground.Droid.csproj
index 90d3cab..358f08e 100644
--- a/Uno.UI.Demo.Droid/Uno.UI.Demo.Droid.csproj
+++ b/src/Uno.Playground.Droid/Uno.Playground.Droid.csproj
@@ -89,7 +89,7 @@
       <Version>1.22.0-dev.23</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.29.1-aobfwasm.2834</Version>
+      <Version>1.30.1-aobfwasm.2873</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
diff --git a/Uno.UI.Demo.Shared/Analytics.cs b/src/Uno.Playground.Shared/Analytics.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Analytics.cs
rename to src/Uno.Playground.Shared/Analytics.cs
diff --git a/Uno.UI.Demo.Shared/Analytics.others.cs b/src/Uno.Playground.Shared/Analytics.others.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Analytics.others.cs
rename to src/Uno.Playground.Shared/Analytics.others.cs
diff --git a/Uno.UI.Demo.Shared/Analytics.wasm.cs b/src/Uno.Playground.Shared/Analytics.wasm.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Analytics.wasm.cs
rename to src/Uno.Playground.Shared/Analytics.wasm.cs
diff --git a/Uno.UI.Demo.Shared/App.xaml b/src/Uno.Playground.Shared/App.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/App.xaml
rename to src/Uno.Playground.Shared/App.xaml
diff --git a/Uno.UI.Demo.Shared/App.xaml.cs b/src/Uno.Playground.Shared/App.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/App.xaml.cs
rename to src/Uno.Playground.Shared/App.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/check.scale-400.png b/src/Uno.Playground.Shared/Assets/Icons/check.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/check.scale-400.png
rename to src/Uno.Playground.Shared/Assets/Icons/check.scale-400.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/check.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/check.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/check.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/check.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/menu.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/menu.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/menu.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/menu.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/search.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/search.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/search.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/search.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/star_empty.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/star_empty.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/star_empty.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/star_empty.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/star_full.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/star_full.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-150/star_full.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-150/star_full.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/check.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/check.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/check.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/check.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/menu.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/menu.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/menu.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/menu.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/search.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/search.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/search.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/search.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/star_empty.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/star_empty.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/star_empty.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/star_empty.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/star_full.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/star_full.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-200/star_full.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-200/star_full.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/check.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/check.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/check.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/check.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/menu.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/menu.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/menu.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/menu.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/search.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/search.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/search.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/search.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/star_empty.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/star_empty.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/star_empty.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/star_empty.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/star_full.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/star_full.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-300/star_full.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-300/star_full.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/check.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/check.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/check.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/check.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/menu.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/menu.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/menu.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/menu.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/search.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/search.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/search.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/search.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/star_empty.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/star_empty.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/star_empty.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/star_empty.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/star_full.png b/src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/star_full.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-android/scale-400/star_full.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-android/scale-400/star_full.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/check.scale-200.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/check.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/check.scale-200.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/check.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/check.scale-300.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/check.scale-300.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/check.scale-300.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/check.scale-300.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/menu.scale-200.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/menu.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/menu.scale-200.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/menu.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/menu.scale-300.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/menu.scale-300.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/menu.scale-300.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/menu.scale-300.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/search.scale-200.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/search.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/search.scale-200.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/search.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/search.scale-300.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/search.scale-300.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/search.scale-300.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/search.scale-300.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_empty.scale-200.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_empty.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_empty.scale-200.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_empty.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_empty.scale-300.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_empty.scale-300.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_empty.scale-300.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_empty.scale-300.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_full.scale-200.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_full.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_full.scale-200.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_full.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_full.scale-300.png b/src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_full.scale-300.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/custom-ios/star_full.scale-300.png
rename to src/Uno.Playground.Shared/Assets/Icons/custom-ios/star_full.scale-300.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/menu.scale-400.png b/src/Uno.Playground.Shared/Assets/Icons/menu.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/menu.scale-400.png
rename to src/Uno.Playground.Shared/Assets/Icons/menu.scale-400.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/search.scale-400.png b/src/Uno.Playground.Shared/Assets/Icons/search.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/search.scale-400.png
rename to src/Uno.Playground.Shared/Assets/Icons/search.scale-400.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/star_empty.scale-400.png b/src/Uno.Playground.Shared/Assets/Icons/star_empty.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/star_empty.scale-400.png
rename to src/Uno.Playground.Shared/Assets/Icons/star_empty.scale-400.png
diff --git a/Uno.UI.Demo.Shared/Assets/Icons/star_full.scale-400.png b/src/Uno.Playground.Shared/Assets/Icons/star_full.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Icons/star_full.scale-400.png
rename to src/Uno.Playground.Shared/Assets/Icons/star_full.scale-400.png
diff --git a/Uno.UI.Demo.Shared/Assets/Post01.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post01.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post01.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post01.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post02.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post02.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post02.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post02.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post03.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post03.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post03.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post03.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post04.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post04.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post04.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post04.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post05.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post05.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post05.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post05.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post06.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post06.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post06.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post06.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post07.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post07.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post07.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post07.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post08.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post08.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post08.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post08.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post09.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post09.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post09.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post09.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post10.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post10.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post10.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post10.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post11.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post11.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post11.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post11.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/Post12.scale-200.jpg b/src/Uno.Playground.Shared/Assets/Post12.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/Post12.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/Post12.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileGirl01.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileGirl01.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileGirl01.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileGirl01.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileGirl02.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileGirl02.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileGirl02.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileGirl02.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileGirl03.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileGirl03.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileGirl03.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileGirl03.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileMan01.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileMan01.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileMan01.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileMan01.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileMan02.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileMan02.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileMan02.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileMan02.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/ProfileMan03.scale-200.jpg b/src/Uno.Playground.Shared/Assets/ProfileMan03.scale-200.jpg
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/ProfileMan03.scale-200.jpg
rename to src/Uno.Playground.Shared/Assets/ProfileMan03.scale-200.jpg
diff --git a/Uno.UI.Demo.Shared/Assets/TestCard.png b/src/Uno.Playground.Shared/Assets/TestCard.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/TestCard.png
rename to src/Uno.Playground.Shared/Assets/TestCard.png
diff --git a/Uno.UI.Demo.Shared/Assets/UnoLogo.scale-200.png b/src/Uno.Playground.Shared/Assets/UnoLogo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.Shared/Assets/UnoLogo.scale-200.png
rename to src/Uno.Playground.Shared/Assets/UnoLogo.scale-200.png
diff --git a/Uno.UI.Demo.Shared/Behaviors/DynamicAnimation.cs b/src/Uno.Playground.Shared/Behaviors/DynamicAnimation.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Behaviors/DynamicAnimation.cs
rename to src/Uno.Playground.Shared/Behaviors/DynamicAnimation.cs
diff --git a/Uno.UI.Demo.Shared/Behaviors/ItemsWrapGridBehavior.cs b/src/Uno.Playground.Shared/Behaviors/ItemsWrapGridBehavior.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Behaviors/ItemsWrapGridBehavior.cs
rename to src/Uno.Playground.Shared/Behaviors/ItemsWrapGridBehavior.cs
diff --git a/Uno.UI.Demo.Shared/CodeBox.cs b/src/Uno.Playground.Shared/CodeBox.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/CodeBox.cs
rename to src/Uno.Playground.Shared/CodeBox.cs
diff --git a/Uno.UI.Demo.Shared/CodeBox.xaml b/src/Uno.Playground.Shared/CodeBox.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/CodeBox.xaml
rename to src/Uno.Playground.Shared/CodeBox.xaml
diff --git a/Uno.UI.Demo.Shared/Converters/BoolToDefaultValueConverter.cs b/src/Uno.Playground.Shared/Converters/BoolToDefaultValueConverter.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Converters/BoolToDefaultValueConverter.cs
rename to src/Uno.Playground.Shared/Converters/BoolToDefaultValueConverter.cs
diff --git a/Uno.UI.Demo.Shared/Converters/EmptyStringToBoolConverter.cs b/src/Uno.Playground.Shared/Converters/EmptyStringToBoolConverter.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Converters/EmptyStringToBoolConverter.cs
rename to src/Uno.Playground.Shared/Converters/EmptyStringToBoolConverter.cs
diff --git a/Uno.UI.Demo.Shared/Converters/IntToMod4DefaultValueConverter.cs b/src/Uno.Playground.Shared/Converters/IntToMod4DefaultValueConverter.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Converters/IntToMod4DefaultValueConverter.cs
rename to src/Uno.Playground.Shared/Converters/IntToMod4DefaultValueConverter.cs
diff --git a/Uno.UI.Demo.Shared/Converters/SampleGroupTypeToColorBrushConverter.cs b/src/Uno.Playground.Shared/Converters/SampleGroupTypeToColorBrushConverter.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Converters/SampleGroupTypeToColorBrushConverter.cs
rename to src/Uno.Playground.Shared/Converters/SampleGroupTypeToColorBrushConverter.cs
diff --git a/Uno.UI.Demo.Shared/DefaultStyles.xaml b/src/Uno.Playground.Shared/DefaultStyles.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/DefaultStyles.xaml
rename to src/Uno.Playground.Shared/DefaultStyles.xaml
diff --git a/Uno.UI.Demo.Shared/Icons.xaml b/src/Uno.Playground.Shared/Icons.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Icons.xaml
rename to src/Uno.Playground.Shared/Icons.xaml
diff --git a/Uno.UI.Demo.Shared/Sample.cs b/src/Uno.Playground.Shared/Sample.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Sample.cs
rename to src/Uno.Playground.Shared/Sample.cs
diff --git a/Uno.UI.Demo.Shared/SampleCategory.cs b/src/Uno.Playground.Shared/SampleCategory.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/SampleCategory.cs
rename to src/Uno.Playground.Shared/SampleCategory.cs
diff --git a/Uno.UI.Demo.Shared/SampleForDisplay.cs b/src/Uno.Playground.Shared/SampleForDisplay.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/SampleForDisplay.cs
rename to src/Uno.Playground.Shared/SampleForDisplay.cs
diff --git a/Uno.UI.Demo.Shared/SamplePage.xaml b/src/Uno.Playground.Shared/SamplePage.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/SamplePage.xaml
rename to src/Uno.Playground.Shared/SamplePage.xaml
diff --git a/Uno.UI.Demo.Shared/SamplePage.xaml.cs b/src/Uno.Playground.Shared/SamplePage.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/SamplePage.xaml.cs
rename to src/Uno.Playground.Shared/SamplePage.xaml.cs
diff --git a/src/Uno.Playground.Shared/Samples/Animations.xaml b/src/Uno.Playground.Shared/Samples/Animations.xaml
new file mode 100644
index 0000000..cbe1da4
--- /dev/null
+++ b/src/Uno.Playground.Shared/Samples/Animations.xaml
@@ -0,0 +1,113 @@
+<UserControl x:Class="Uno.UI.Demo.Samples.Animations"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:local="using:Uno.UI.Demo.Samples"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 mc:Ignorable="">
+	<ScrollViewer>
+		<VisualStateManager.VisualStateGroups>
+			<VisualStateGroup x:Name="AnimationTests">
+				<VisualState x:Name="Animated">
+					<Storyboard>
+						<!-- Animation 1 -->
+						<DoubleAnimation Storyboard.TargetProperty="Angle"
+											Storyboard.TargetName="RotateTransform1"
+											From="0"
+											To="360"
+											Duration="0:0:3" />
+						<DoubleAnimation Storyboard.TargetProperty="Opacity"
+											Storyboard.TargetName="Rectangle1"
+											To="0"
+											Duration="0:0:2" />
+						<!-- Animation 2 -->
+						<DoubleAnimation Storyboard.TargetProperty="ScaleX"
+											Storyboard.TargetName="ScaleTransform1"
+											To="0.5"
+											Duration="0:0:2">
+							<DoubleAnimation.EasingFunction>
+								<BounceEase Bounces="2"
+											Bounciness="3" />
+							</DoubleAnimation.EasingFunction>
+						</DoubleAnimation>
+						<DoubleAnimation Storyboard.TargetProperty="ScaleY"
+											Storyboard.TargetName="ScaleTransform1"
+											To="0.5"
+											Duration="0:0:2">
+							<DoubleAnimation.EasingFunction>
+								<BounceEase Bounces="2"
+											Bounciness="3" />
+							</DoubleAnimation.EasingFunction>
+						</DoubleAnimation>
+						<!-- Animation 3 -->
+						<DoubleAnimation Storyboard.TargetProperty="Y"
+											Storyboard.TargetName="TranslateTransform1"
+											From="0"
+											To="150"
+											Duration="0:0:2">
+							<DoubleAnimation.EasingFunction>
+								<BounceEase Bounces="2"
+											Bounciness="3" />
+							</DoubleAnimation.EasingFunction>
+						</DoubleAnimation>
+						<DoubleAnimation Storyboard.TargetProperty="X"
+											Storyboard.TargetName="TranslateTransform2"
+											From="0"
+											To="150"
+											Duration="0:0:2">
+							<DoubleAnimation.EasingFunction>
+								<CubicEase EasingMode="EaseInOut" />
+							</DoubleAnimation.EasingFunction>
+						</DoubleAnimation>
+					</Storyboard>
+				</VisualState>
+				<VisualState x:Name="NotAnimated" />
+			</VisualStateGroup>
+		</VisualStateManager.VisualStateGroups>
+
+		<StackPanel Style="{StaticResource SamplePanelStyle}">
+			<TextBlock  Style="{StaticResource SampleSectionTextBlockStyle}"
+						TextWrapping="Wrap"
+						Text="Animations using VisualStates, DoubleAnimations, EasingFunctions and RenderTransforms" />
+
+			<Button Content="Click me!"
+					Click="Button_Click" />
+
+			<Rectangle Fill="{StaticResource Color13Brush}"
+					   Width="100"
+					   Height="100"
+					   x:Name="Rectangle1"
+					   Opacity="1">
+				<Rectangle.RenderTransform>
+					<RotateTransform CenterX="50"
+									 CenterY="50"
+									 x:Name="RotateTransform1" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+			<Rectangle Fill="{StaticResource Color16Brush}"
+					   Width="100"
+					   Height="100">
+				<Rectangle.RenderTransform>
+					<ScaleTransform CenterX="50"
+									CenterY="50"
+									x:Name="ScaleTransform1" />
+
+				</Rectangle.RenderTransform>
+			</Rectangle>
+
+			<Rectangle Fill="{StaticResource Color15Brush}"
+					   Width="100"
+					   Height="100">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="TranslateTransform1" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+			<Rectangle Fill="{StaticResource Color14Brush}"
+					   Width="100"
+					   Height="100">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="TranslateTransform2" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+		</StackPanel>
+	</ScrollViewer>
+</UserControl>
diff --git a/Uno.UI.Demo.Shared/Samples/Animations.xaml.cs b/src/Uno.Playground.Shared/Samples/Animations.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Animations.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Animations.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Brushes.xaml b/src/Uno.Playground.Shared/Samples/Brushes.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Brushes.xaml
rename to src/Uno.Playground.Shared/Samples/Brushes.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Brushes.xaml.cs b/src/Uno.Playground.Shared/Samples/Brushes.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Brushes.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Brushes.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Button.xaml b/src/Uno.Playground.Shared/Samples/Button.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Button.xaml
rename to src/Uno.Playground.Shared/Samples/Button.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Button.xaml.cs b/src/Uno.Playground.Shared/Samples/Button.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Button.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Button.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/CheckBox.xaml b/src/Uno.Playground.Shared/Samples/CheckBox.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/CheckBox.xaml
rename to src/Uno.Playground.Shared/Samples/CheckBox.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/CheckBox.xaml.cs b/src/Uno.Playground.Shared/Samples/CheckBox.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/CheckBox.xaml.cs
rename to src/Uno.Playground.Shared/Samples/CheckBox.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/CommandBar.xaml b/src/Uno.Playground.Shared/Samples/CommandBar.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/CommandBar.xaml
rename to src/Uno.Playground.Shared/Samples/CommandBar.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/CommandBar.xaml.cs b/src/Uno.Playground.Shared/Samples/CommandBar.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/CommandBar.xaml.cs
rename to src/Uno.Playground.Shared/Samples/CommandBar.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/FlipView.xaml b/src/Uno.Playground.Shared/Samples/FlipView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/FlipView.xaml
rename to src/Uno.Playground.Shared/Samples/FlipView.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/FlipView.xaml.cs b/src/Uno.Playground.Shared/Samples/FlipView.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/FlipView.xaml.cs
rename to src/Uno.Playground.Shared/Samples/FlipView.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Form.xaml b/src/Uno.Playground.Shared/Samples/Form.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Form.xaml
rename to src/Uno.Playground.Shared/Samples/Form.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Form.xaml.cs b/src/Uno.Playground.Shared/Samples/Form.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Form.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Form.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/GridView.xaml b/src/Uno.Playground.Shared/Samples/GridView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/GridView.xaml
rename to src/Uno.Playground.Shared/Samples/GridView.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/GridView.xaml.cs b/src/Uno.Playground.Shared/Samples/GridView.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/GridView.xaml.cs
rename to src/Uno.Playground.Shared/Samples/GridView.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Homies.xaml b/src/Uno.Playground.Shared/Samples/Homies.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Homies.xaml
rename to src/Uno.Playground.Shared/Samples/Homies.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Homies.xaml.cs b/src/Uno.Playground.Shared/Samples/Homies.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Homies.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Homies.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/HyperlinkButton.xaml b/src/Uno.Playground.Shared/Samples/HyperlinkButton.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/HyperlinkButton.xaml
rename to src/Uno.Playground.Shared/Samples/HyperlinkButton.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/HyperlinkButton.xaml.cs b/src/Uno.Playground.Shared/Samples/HyperlinkButton.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/HyperlinkButton.xaml.cs
rename to src/Uno.Playground.Shared/Samples/HyperlinkButton.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Image.xaml b/src/Uno.Playground.Shared/Samples/Image.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Image.xaml
rename to src/Uno.Playground.Shared/Samples/Image.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Image.xaml.cs b/src/Uno.Playground.Shared/Samples/Image.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Image.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Image.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/ListView.xaml b/src/Uno.Playground.Shared/Samples/ListView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ListView.xaml
rename to src/Uno.Playground.Shared/Samples/ListView.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/ListView.xaml.cs b/src/Uno.Playground.Shared/Samples/ListView.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ListView.xaml.cs
rename to src/Uno.Playground.Shared/Samples/ListView.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/MessageDialog.xaml b/src/Uno.Playground.Shared/Samples/MessageDialog.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/MessageDialog.xaml
rename to src/Uno.Playground.Shared/Samples/MessageDialog.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/MessageDialog.xaml.cs b/src/Uno.Playground.Shared/Samples/MessageDialog.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/MessageDialog.xaml.cs
rename to src/Uno.Playground.Shared/Samples/MessageDialog.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Panels.xaml b/src/Uno.Playground.Shared/Samples/Panels.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Panels.xaml
rename to src/Uno.Playground.Shared/Samples/Panels.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Panels.xaml.cs b/src/Uno.Playground.Shared/Samples/Panels.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Panels.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Panels.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/PasswordBox.xaml b/src/Uno.Playground.Shared/Samples/PasswordBox.xaml
similarity index 97%
rename from Uno.UI.Demo.Shared/Samples/PasswordBox.xaml
rename to src/Uno.Playground.Shared/Samples/PasswordBox.xaml
index 3ba9643..9b2e754 100644
--- a/Uno.UI.Demo.Shared/Samples/PasswordBox.xaml
+++ b/src/Uno.Playground.Shared/Samples/PasswordBox.xaml
@@ -20,7 +20,6 @@
 			<TextBlock Style="{StaticResource SampleSectionTextBlockStyle}"
 					   Text="Animated" />
 			<PasswordBox Header="Animated"
-						 Password="Password"
 						 Style="{StaticResource AnimatedPasswordBoxStyle}" />
 
 		</StackPanel>
diff --git a/Uno.UI.Demo.Shared/Samples/PasswordBox.xaml.cs b/src/Uno.Playground.Shared/Samples/PasswordBox.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/PasswordBox.xaml.cs
rename to src/Uno.Playground.Shared/Samples/PasswordBox.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Playground.xaml b/src/Uno.Playground.Shared/Samples/Playground.xaml
similarity index 78%
rename from Uno.UI.Demo.Shared/Samples/Playground.xaml
rename to src/Uno.Playground.Shared/Samples/Playground.xaml
index a2233fa..e0abc6d 100644
--- a/Uno.UI.Demo.Shared/Samples/Playground.xaml
+++ b/src/Uno.Playground.Shared/Samples/Playground.xaml
@@ -36,9 +36,12 @@
 		</DataTemplate>
 	</Page.Resources>
 
-	<Grid Background="#242424" toolkit:VisibleBoundsPadding.PaddingMask="Top" Name="root">
+	<Grid Background="#242424"
+		  toolkit:VisibleBoundsPadding.PaddingMask="Top"
+		  Name="root">
 		<Grid.RowDefinitions>
-			<RowDefinition Height="72" x:Name="toolbarRow" />
+			<RowDefinition Height="72"
+						   x:Name="toolbarRow" />
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 		<Grid.ColumnDefinitions>
@@ -50,25 +53,23 @@
 
 		<!--ToolBar START-->
 		<StackPanel Orientation="Horizontal">
-			<Button 
-				Name="backButton"
-				Visibility="Collapsed"
-				Height="40"
-				Width="40"
-				VerticalAlignment="Stretch"
-				HorizontalAlignment="Stretch"
-				Padding="0"
-				Margin="0"
-				Background="Transparent"
-				Click="OnBackClicked">
-				<Path 
-					Data="M1 6h14M1 6l3.748-4.685M1 6l4.243 4.243"
-					Stroke="White"
-					StrokeThickness="2"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					Stretch="Uniform"
-					Width="22" />
+			<Button Name="backButton"
+					Visibility="Collapsed"
+					Height="40"
+					Width="40"
+					VerticalAlignment="Stretch"
+					HorizontalAlignment="Stretch"
+					Padding="0"
+					Margin="0"
+					Background="Transparent"
+					Click="OnBackClicked">
+				<Path Data="M1 6h14M1 6l3.748-4.685M1 6l4.243 4.243"
+					  Stroke="White"
+					  StrokeThickness="2"
+					  HorizontalAlignment="Center"
+					  VerticalAlignment="Center"
+					  Stretch="Uniform"
+					  Width="22" />
 			</Button>
 			<Button Height="72"
 					Width="72"
@@ -82,13 +83,29 @@
 					  Margin="0"
 					  Fill="{StaticResource Color08Brush}" />
 			</Button>
-			<TextBlock wasm:Text="Uno Playground"
-					   android:Text="Playground"
+
+			<TextBlock android:Text="Playground"
 					   ios:Text="Playground"
 					   win:Text="Playground"
 					   Foreground="White"
 					   FontSize="20"
-					   VerticalAlignment="Center" />
+					   VerticalAlignment="Center"
+					   wasm:Visibility="Collapsed" />
+
+			<wasm:Grid VerticalAlignment="Center">
+				<TextBlock Text="Uno Playground"
+						   Foreground="White"
+						   FontSize="20"
+						   Margin="0,0,0,25"
+						   VerticalAlignment="Center" />
+
+				<HyperlinkButton Content="http://platform.uno"
+								 NavigateUri="http://platform.uno"
+								 Foreground="White"
+								 FontSize="16"
+								 Margin="1,30,0,0"
+								 VerticalAlignment="Center" />
+			</wasm:Grid>
 		</StackPanel>
 
 		<StackPanel Orientation="Horizontal"
@@ -167,10 +184,10 @@
 					<ScrollViewer Grid.Column="1">
 						<StackPanel>
 							<wasm:TextBlock Text="Snippets"
-									   VerticalAlignment="Center"
-									   FontWeight="Bold"
-									   Margin="16,12"
-									   Foreground="{StaticResource Color08Brush}" />
+											VerticalAlignment="Center"
+											FontWeight="Bold"
+											Margin="16,12"
+											Foreground="{StaticResource Color08Brush}" />
 							<ListView x:Name="samples"
 									  Width="280"
 									  VerticalAlignment="Center"
@@ -179,7 +196,7 @@
 					</ScrollViewer>
 					<Button Grid.Column="1"
 							wasm:Visibility="Collapsed"
-					        Height="40"
+							Height="40"
 							Width="40"
 							VerticalAlignment="Top"
 							HorizontalAlignment="Right"
@@ -199,77 +216,76 @@
 
 			</SplitView.Pane>
 
-			<Grid 
-				x:Name="PlaygroundContent">
+			<Grid x:Name="PlaygroundContent">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition x:Name="codePaneColumn"
 									  Width="*" />
-					<ColumnDefinition x:Name="splitterColumn" 
+					<ColumnDefinition x:Name="splitterColumn"
 									  Width="10" />
-					<ColumnDefinition x:Name="previewColumn" 
-									Width="*" />
+					<ColumnDefinition x:Name="previewColumn"
+									  Width="*" />
 				</Grid.ColumnDefinitions>
-				
+
 				<Grid.RowDefinitions>
-					<RowDefinition x:Name="tabsPaneRow" Height="0" />
-					<RowDefinition x:Name="xamlPaneRow" Height="*" />
-					<RowDefinition x:Name="corePaneRow" Height="*" />
+					<RowDefinition x:Name="tabsPaneRow"
+								   Height="0" />
+					<RowDefinition x:Name="xamlPaneRow"
+								   Height="*" />
+					<RowDefinition x:Name="corePaneRow"
+								   Height="*" />
 				</Grid.RowDefinitions>
 
-				<Grid Grid.ColumnSpan="3" Background="{StaticResource Color08Brush}" Name="TabsPane">
+				<Grid Grid.ColumnSpan="3"
+					  Background="{StaticResource Color08Brush}"
+					  Name="TabsPane">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="*" />
 					</Grid.ColumnDefinitions>
-					
-					<Button 
-						Height="40"
-						Width="40"
-						Padding="0"
-						Margin="0"
-						Background="Transparent"
-						Click="ToggleSplitView"
-						wasm:Visibility="Collapsed">
+
+					<Button Height="40"
+							Width="40"
+							Padding="0"
+							Margin="0"
+							Background="Transparent"
+							Click="ToggleSplitView"
+							wasm:Visibility="Collapsed">
 						<Path Data="M1 7h14M1 1h18M1 13h18"
-							Stroke="White"
-							StrokeThickness="2"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							Stretch="Uniform"
-							Width="22" />
+							  Stroke="White"
+							  StrokeThickness="2"
+							  HorizontalAlignment="Center"
+							  VerticalAlignment="Center"
+							  Stretch="Uniform"
+							  Width="22" />
 					</Button>
-					<Button 
-						Content="XAML" 
-						Grid.Column="1" 
-						Tapped="ShowXaml" 
-						Background="Transparent"
-						Foreground="White" 
-						Height="40"
-						HorizontalAlignment="Stretch" />
-					<Button 
-						Content="Data" 
-						Grid.Column="2" 
-						Tapped="ShowData" 
-						Background="Transparent"
-						Foreground="White" 
-						Height="40"
-						HorizontalAlignment="Stretch" />
-					<Button 
-						Content="Output" 
-						Grid.Column="3" 
-						Tapped="ShowOutput" 
-						Background="Transparent"
-						Foreground="White" 
-						Height="40"
-						HorizontalAlignment="Stretch" />
+					<Button Content="XAML"
+							Grid.Column="1"
+							Tapped="ShowXaml"
+							Background="Transparent"
+							Foreground="White"
+							Height="40"
+							HorizontalAlignment="Stretch" />
+					<Button Content="Data"
+							Grid.Column="2"
+							Tapped="ShowData"
+							Background="Transparent"
+							Foreground="White"
+							Height="40"
+							HorizontalAlignment="Stretch" />
+					<Button Content="Output"
+							Grid.Column="3"
+							Tapped="ShowOutput"
+							Background="Transparent"
+							Foreground="White"
+							Height="40"
+							HorizontalAlignment="Stretch" />
 				</Grid>
 
-				<Grid 
-					Name="codePane"
-					Grid.Row="1"
-					Background="#313131">
+				<Grid Name="codePane"
+					  Grid.Row="1"
+					  Background="#313131">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="38" />
 						<RowDefinition Height="*" />
@@ -280,7 +296,7 @@
 						  Background="#242424"
 						  VerticalAlignment="Stretch"
 						  HorizontalAlignment="Stretch">
-						<TextBlock Text="XAML"
+						<TextBlock Text="XAML EDITOR"
 								   FontSize="16"
 								   FontWeight="SemiBold"
 								   Margin="16,0"
@@ -293,7 +309,8 @@
 								   FontWeight="Bold"
 								   HorizontalAlignment="Right"
 								   VerticalAlignment="Center">
-							<Hyperlink x:Name="link" Foreground="{StaticResource Color08Brush}"/>
+							<Hyperlink x:Name="link"
+									   Foreground="{StaticResource Color08Brush}" />
 						</TextBlock>
 
 					</Grid>
@@ -302,11 +319,10 @@
 								   Margin="4"
 								   Grid.Row="1" />
 				</Grid>
-				
-				<Grid 
-					Name="dataContextPane" 
-					Grid.Row="2"
-					Background="#313131" >
+
+				<Grid Name="dataContextPane"
+					  Grid.Row="2"
+					  Background="#313131">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="38" />
 						<RowDefinition Height="*" />
@@ -331,42 +347,38 @@
 				</Grid>
 
 				<!--Preview Pane-->
-				<Grid
-					Name="previewPane"
-					Grid.Row="1"
-					Grid.Column="2"
-					Grid.RowSpan="2"
-					Background="White">
+				<Grid Name="previewPane"
+					  Grid.Row="1"
+					  Grid.Column="2"
+					  Grid.RowSpan="2"
+					  Background="White">
 					<Grid.RowDefinitions>
 						<RowDefinition />
 						<RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
 
-					<ContentControl 
-						x:Name="content"
-						Margin="4"
-						HorizontalContentAlignment="Stretch"
-						VerticalContentAlignment="Stretch" />
-					
-					<TextBlock
-						x:Name="resolution"
-						Grid.Row="1"
-						VerticalAlignment="Bottom"
-						HorizontalAlignment="Left"
-						FontSize="9"
-						Foreground="DarkGray"
-						IsHitTestVisible="False"
-						Text="200x200" />
+					<ContentControl x:Name="content"
+									Margin="4"
+									HorizontalContentAlignment="Stretch"
+									VerticalContentAlignment="Stretch" />
 
-					<TextBlock 
-						x:Name="loading"
-						Visibility="Collapsed"
-						VerticalAlignment="Center"
-						HorizontalAlignment="Stretch"
-						TextAlignment="Center"
-						FontSize="28"
-						Foreground="{StaticResource Color08Brush}"
-						Text="Loading..." />
+					<TextBlock x:Name="resolution"
+							   Grid.Row="1"
+							   VerticalAlignment="Bottom"
+							   HorizontalAlignment="Left"
+							   FontSize="9"
+							   Foreground="DarkGray"
+							   IsHitTestVisible="False"
+							   Text="200x200" />
+
+					<TextBlock x:Name="loading"
+							   Visibility="Collapsed"
+							   VerticalAlignment="Center"
+							   HorizontalAlignment="Stretch"
+							   TextAlignment="Center"
+							   FontSize="28"
+							   Foreground="{StaticResource Color08Brush}"
+							   Text="Loading..." />
 				</Grid>
 
 				<Rectangle Fill="#1a1a1a"
diff --git a/Uno.UI.Demo.Shared/Samples/Playground.xaml.cs b/src/Uno.Playground.Shared/Samples/Playground.xaml.cs
similarity index 93%
rename from Uno.UI.Demo.Shared/Samples/Playground.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Playground.xaml.cs
index 5f6ed69..012046c 100644
--- a/Uno.UI.Demo.Shared/Samples/Playground.xaml.cs
+++ b/src/Uno.Playground.Shared/Samples/Playground.xaml.cs
@@ -33,6 +33,7 @@ using Windows.UI.Xaml.Navigation;
 using Newtonsoft.Json.Linq;
 using Uno.UI.Demo.Behaviors;
 using Uno.UI.Toolkit;
+using Uno.UI.Wasm;
 
 namespace Uno.UI.Demo.Samples
 {
@@ -133,22 +134,42 @@ namespace Uno.UI.Demo.Samples
 		{
 			base.OnNavigatedTo(e);
 
-			if (e.Parameter is string args)
-			{
-				var parts = args.Split(';');
-				var keyValues = parts.Select(p => p.Split(new[] { '=' }, 2)).Where(kv => kv.Length == 2);
-				var sampleId = keyValues.FirstOrDefault(kv => kv[0].Equals("sample", StringComparison.OrdinalIgnoreCase))?[1].Trim();
-				if (!string.IsNullOrEmpty(sampleId))
-				{
-					await LoadSample(sampleId);
-				}
-				else
-				{
 #if __WASM__
-					await LoadSample("wasm-start");
-#endif
-				}
+			void OnNavigatedToFragment(object snd, NewFragmentEventArgs newFragmentEventArgs)
+			{
+				var t = LoadSample(newFragmentEventArgs.Fragment);
 			}
+			FragmentHavigationHandler.NavigatedToFragment += OnNavigatedToFragment;
+
+			var fragment = FragmentHavigationHandler.CurrentFragment;
+			if (!string.IsNullOrWhiteSpace(fragment))
+			{
+				await LoadSample(fragment);
+			}
+			else
+#endif
+			{
+				await LoadSample("wasm-start");
+			}
+
+//			if (e.Parameter is string args)
+//			{
+//				var parts = args.Split(';');
+//				var keyValues = parts.Select(p => p.Split(new[] { '=' }, 2)).Where(kv => kv.Length == 2);
+//				var sampleId = keyValues
+//					.FirstOrDefault(kv => kv[0].Equals("sample", StringComparison.OrdinalIgnoreCase) || kv[0].Equals("snippet", StringComparison.OrdinalIgnoreCase))
+//					?[1].Trim();
+//				if (!string.IsNullOrEmpty(sampleId))
+//				{
+//					await LoadSample(sampleId);
+//				}
+//#if __WASM__
+//				else
+//				{
+//					await LoadSample("wasm-start");
+//				}
+//#endif
+//			}
 		}
 
 		private async void Samples_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -177,15 +198,15 @@ namespace Uno.UI.Demo.Samples
 			backButton.Visibility = base.Frame.CanGoBack ? Visibility.Visible : Visibility.Collapsed;
 
 			xamlText.Text = @"<StackPanel Orientation=""Vertical"">
-    <!-- Type your favorite XAML code here
-    ...or pick a snippet in the menu. -->
+	<!-- Type your favorite XAML code here
+	...or pick a snippet in the menu. -->
 
-    <TextBlock Text=""{Binding message}"" />
+	<TextBlock Text=""{Binding message}"" />
 </StackPanel>
 ";
 
 			jsonDataContext.Text = @"{
-    message: ""Hello World!""
+	message: ""Hello World!""
 }
 
 /* Tip: two-way bindings supported */";
@@ -328,7 +349,7 @@ namespace Uno.UI.Demo.Samples
 			try
 			{
 				var r = XamlReader.Load(GetXamlInput());
-				Console.WriteLine($"Read Xaml in {sw.Elapsed}");
+				Console.WriteLine($@"Read Xaml in {sw.Elapsed}");
 
 				await Task.Yield();
 
@@ -399,7 +420,7 @@ namespace Uno.UI.Demo.Samples
 
 		private void SetLink(string id, bool clipboard = false)
 		{
-			var url = new Uri($"{PlaygroundUrl}/{Uri.EscapeUriString(id)}");
+			var url = new Uri($"{PlaygroundUrl}#{Uri.EscapeUriString(id)}");
 			if (clipboard)
 			{
 				var clipboardData = new DataPackage();
@@ -411,6 +432,8 @@ namespace Uno.UI.Demo.Samples
 			link.Inlines.Clear();
 			link.Inlines.Add(new Run{Text = id});
 			linkBlock.Visibility = Visibility.Visible;
+
+			FragmentHavigationHandler.CurrentFragment = "#" + id;
 		}
 
 		private static readonly Regex _lineEndingRegex = new Regex(@"\r\n|\n\r|\n|\r");
@@ -706,4 +729,4 @@ namespace Uno.UI.Demo.Samples
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Uno.UI.Demo.Shared/Samples/Progress.xaml b/src/Uno.Playground.Shared/Samples/Progress.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Progress.xaml
rename to src/Uno.Playground.Shared/Samples/Progress.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Progress.xaml.cs b/src/Uno.Playground.Shared/Samples/Progress.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Progress.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Progress.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/RadioButton.xaml b/src/Uno.Playground.Shared/Samples/RadioButton.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/RadioButton.xaml
rename to src/Uno.Playground.Shared/Samples/RadioButton.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/RadioButton.xaml.cs b/src/Uno.Playground.Shared/Samples/RadioButton.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/RadioButton.xaml.cs
rename to src/Uno.Playground.Shared/Samples/RadioButton.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/ScrollViewer.xaml b/src/Uno.Playground.Shared/Samples/ScrollViewer.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ScrollViewer.xaml
rename to src/Uno.Playground.Shared/Samples/ScrollViewer.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/ScrollViewer.xaml.cs b/src/Uno.Playground.Shared/Samples/ScrollViewer.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ScrollViewer.xaml.cs
rename to src/Uno.Playground.Shared/Samples/ScrollViewer.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Shapes.xaml b/src/Uno.Playground.Shared/Samples/Shapes.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Shapes.xaml
rename to src/Uno.Playground.Shared/Samples/Shapes.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Shapes.xaml.cs b/src/Uno.Playground.Shared/Samples/Shapes.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Shapes.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Shapes.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Slider.xaml b/src/Uno.Playground.Shared/Samples/Slider.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Slider.xaml
rename to src/Uno.Playground.Shared/Samples/Slider.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Slider.xaml.cs b/src/Uno.Playground.Shared/Samples/Slider.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Slider.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Slider.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/TextBlock.xaml b/src/Uno.Playground.Shared/Samples/TextBlock.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/TextBlock.xaml
rename to src/Uno.Playground.Shared/Samples/TextBlock.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/TextBlock.xaml.cs b/src/Uno.Playground.Shared/Samples/TextBlock.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/TextBlock.xaml.cs
rename to src/Uno.Playground.Shared/Samples/TextBlock.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/TextBox.xaml b/src/Uno.Playground.Shared/Samples/TextBox.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/TextBox.xaml
rename to src/Uno.Playground.Shared/Samples/TextBox.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/TextBox.xaml.cs b/src/Uno.Playground.Shared/Samples/TextBox.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/TextBox.xaml.cs
rename to src/Uno.Playground.Shared/Samples/TextBox.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/ToggleButton.xaml b/src/Uno.Playground.Shared/Samples/ToggleButton.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ToggleButton.xaml
rename to src/Uno.Playground.Shared/Samples/ToggleButton.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/ToggleButton.xaml.cs b/src/Uno.Playground.Shared/Samples/ToggleButton.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ToggleButton.xaml.cs
rename to src/Uno.Playground.Shared/Samples/ToggleButton.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/ToggleSwitch.xaml b/src/Uno.Playground.Shared/Samples/ToggleSwitch.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ToggleSwitch.xaml
rename to src/Uno.Playground.Shared/Samples/ToggleSwitch.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/ToggleSwitch.xaml.cs b/src/Uno.Playground.Shared/Samples/ToggleSwitch.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/ToggleSwitch.xaml.cs
rename to src/Uno.Playground.Shared/Samples/ToggleSwitch.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Transform.xaml b/src/Uno.Playground.Shared/Samples/Transform.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Transform.xaml
rename to src/Uno.Playground.Shared/Samples/Transform.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Transform.xaml.cs b/src/Uno.Playground.Shared/Samples/Transform.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Transform.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Transform.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/Typography.xaml b/src/Uno.Playground.Shared/Samples/Typography.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Typography.xaml
rename to src/Uno.Playground.Shared/Samples/Typography.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/Typography.xaml.cs b/src/Uno.Playground.Shared/Samples/Typography.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/Typography.xaml.cs
rename to src/Uno.Playground.Shared/Samples/Typography.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Samples/WebView.xaml b/src/Uno.Playground.Shared/Samples/WebView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/WebView.xaml
rename to src/Uno.Playground.Shared/Samples/WebView.xaml
diff --git a/Uno.UI.Demo.Shared/Samples/WebView.xaml.cs b/src/Uno.Playground.Shared/Samples/WebView.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/Samples/WebView.xaml.cs
rename to src/Uno.Playground.Shared/Samples/WebView.xaml.cs
diff --git a/Uno.UI.Demo.Shared/SamplesPage.xaml b/src/Uno.Playground.Shared/SamplesPage.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/SamplesPage.xaml
rename to src/Uno.Playground.Shared/SamplesPage.xaml
diff --git a/Uno.UI.Demo.Shared/SamplesPage.xaml.cs b/src/Uno.Playground.Shared/SamplesPage.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/SamplesPage.xaml.cs
rename to src/Uno.Playground.Shared/SamplesPage.xaml.cs
diff --git a/Uno.UI.Demo.Shared/Strings/en/Resources.resw b/src/Uno.Playground.Shared/Strings/en/Resources.resw
similarity index 100%
rename from Uno.UI.Demo.Shared/Strings/en/Resources.resw
rename to src/Uno.Playground.Shared/Strings/en/Resources.resw
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/Button.xaml b/src/Uno.Playground.Shared/Styles/Controls/Button.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/Button.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/Button.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/CommandBar.xaml b/src/Uno.Playground.Shared/Styles/Controls/CommandBar.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/CommandBar.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/CommandBar.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/ListView.xaml b/src/Uno.Playground.Shared/Styles/Controls/ListView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/ListView.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/ListView.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/ListViewItem.xaml b/src/Uno.Playground.Shared/Styles/Controls/ListViewItem.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/ListViewItem.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/ListViewItem.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/PasswordBox.xaml b/src/Uno.Playground.Shared/Styles/Controls/PasswordBox.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/PasswordBox.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/PasswordBox.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/SplitView.xaml b/src/Uno.Playground.Shared/Styles/Controls/SplitView.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/SplitView.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/SplitView.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/TextBlock.xaml b/src/Uno.Playground.Shared/Styles/Controls/TextBlock.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/TextBlock.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/TextBlock.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/TextBox.xaml b/src/Uno.Playground.Shared/Styles/Controls/TextBox.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/TextBox.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/TextBox.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/Controls/_Controls.xaml b/src/Uno.Playground.Shared/Styles/Controls/_Controls.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/Controls/_Controls.xaml
rename to src/Uno.Playground.Shared/Styles/Controls/_Controls.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/StyleGuide/Colors.xaml b/src/Uno.Playground.Shared/Styles/StyleGuide/Colors.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/StyleGuide/Colors.xaml
rename to src/Uno.Playground.Shared/Styles/StyleGuide/Colors.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/StyleGuide/Fonts.xaml b/src/Uno.Playground.Shared/Styles/StyleGuide/Fonts.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/StyleGuide/Fonts.xaml
rename to src/Uno.Playground.Shared/Styles/StyleGuide/Fonts.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/StyleGuide/LayoutConstants.xaml b/src/Uno.Playground.Shared/Styles/StyleGuide/LayoutConstants.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/StyleGuide/LayoutConstants.xaml
rename to src/Uno.Playground.Shared/Styles/StyleGuide/LayoutConstants.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/StyleGuide/_StyleGuide.xaml b/src/Uno.Playground.Shared/Styles/StyleGuide/_StyleGuide.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/StyleGuide/_StyleGuide.xaml
rename to src/Uno.Playground.Shared/Styles/StyleGuide/_StyleGuide.xaml
diff --git a/Uno.UI.Demo.Shared/Styles/_Styles.xaml b/src/Uno.Playground.Shared/Styles/_Styles.xaml
similarity index 100%
rename from Uno.UI.Demo.Shared/Styles/_Styles.xaml
rename to src/Uno.Playground.Shared/Styles/_Styles.xaml
diff --git a/Uno.UI.Demo.Shared/TemplateSelectors/IconTemplateSelector.cs b/src/Uno.Playground.Shared/TemplateSelectors/IconTemplateSelector.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/TemplateSelectors/IconTemplateSelector.cs
rename to src/Uno.Playground.Shared/TemplateSelectors/IconTemplateSelector.cs
diff --git a/Uno.UI.Demo.Shared/TemplateSelectors/SampleItemTemplateSelector.cs b/src/Uno.Playground.Shared/TemplateSelectors/SampleItemTemplateSelector.cs
similarity index 100%
rename from Uno.UI.Demo.Shared/TemplateSelectors/SampleItemTemplateSelector.cs
rename to src/Uno.Playground.Shared/TemplateSelectors/SampleItemTemplateSelector.cs
diff --git a/Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.projitems b/src/Uno.Playground.Shared/Uno.Playground.Shared.projitems
similarity index 99%
rename from Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.projitems
rename to src/Uno.Playground.Shared/Uno.Playground.Shared.projitems
index 983ce5b..93793d7 100644
--- a/Uno.UI.Demo.Shared/Uno.UI.Demo.Shared.projitems
+++ b/src/Uno.Playground.Shared/Uno.Playground.Shared.projitems
@@ -6,7 +6,7 @@
     <SharedGUID>6279c845-92f8-4333-ab99-3d213163593c</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Uno.UI.Demo</Import_RootNamespace>
+    <Import_RootNamespace>Uno.Playground</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ApplicationDefinition Include="$(MSBuildThisFileDirectory)App.xaml">
@@ -374,4 +374,4 @@
   <ItemGroup>
     <PRIResource Include="$(MSBuildThisFileDirectory)Strings\en\Resources.resw" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Uno.Playground.Shared/Uno.Playground.Shared.shproj b/src/Uno.Playground.Shared/Uno.Playground.Shared.shproj
new file mode 100644
index 0000000..e3cbe9e
--- /dev/null
+++ b/src/Uno.Playground.Shared/Uno.Playground.Shared.shproj
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Uno.Playground</Import_RootNamespace>
+  </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" />
+  <PropertyGroup />
+  <Import Project="Uno.UI.Demo.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\Icons\check.scale-400.png" />
+    <Content Include="Assets\Icons\custom-android\scale-150\check.png" />
+    <Content Include="Assets\Icons\custom-android\scale-150\menu.png" />
+    <Content Include="Assets\Icons\custom-android\scale-150\search.png" />
+    <Content Include="Assets\Icons\custom-android\scale-150\star_empty.png" />
+    <Content Include="Assets\Icons\custom-android\scale-150\star_full.png" />
+    <Content Include="Assets\Icons\custom-android\scale-200\check.png" />
+    <Content Include="Assets\Icons\custom-android\scale-200\menu.png" />
+    <Content Include="Assets\Icons\custom-android\scale-200\search.png" />
+    <Content Include="Assets\Icons\custom-android\scale-200\star_empty.png" />
+    <Content Include="Assets\Icons\custom-android\scale-200\star_full.png" />
+    <Content Include="Assets\Icons\custom-android\scale-300\check.png" />
+    <Content Include="Assets\Icons\custom-android\scale-300\menu.png" />
+    <Content Include="Assets\Icons\custom-android\scale-300\search.png" />
+    <Content Include="Assets\Icons\custom-android\scale-300\star_empty.png" />
+    <Content Include="Assets\Icons\custom-android\scale-300\star_full.png" />
+    <Content Include="Assets\Icons\custom-android\scale-400\check.png" />
+    <Content Include="Assets\Icons\custom-android\scale-400\menu.png" />
+    <Content Include="Assets\Icons\custom-android\scale-400\search.png" />
+    <Content Include="Assets\Icons\custom-android\scale-400\star_empty.png" />
+    <Content Include="Assets\Icons\custom-android\scale-400\star_full.png" />
+    <Content Include="Assets\Icons\custom-ios\check.scale-200.png" />
+    <Content Include="Assets\Icons\custom-ios\check.scale-300.png" />
+    <Content Include="Assets\Icons\custom-ios\menu.scale-200.png" />
+    <Content Include="Assets\Icons\custom-ios\menu.scale-300.png" />
+    <Content Include="Assets\Icons\custom-ios\search.scale-200.png" />
+    <Content Include="Assets\Icons\custom-ios\search.scale-300.png" />
+    <Content Include="Assets\Icons\custom-ios\star_empty.scale-200.png" />
+    <Content Include="Assets\Icons\custom-ios\star_empty.scale-300.png" />
+    <Content Include="Assets\Icons\custom-ios\star_full.scale-200.png" />
+    <Content Include="Assets\Icons\custom-ios\star_full.scale-300.png" />
+    <Content Include="Assets\Icons\menu.scale-400.png" />
+    <Content Include="Assets\Icons\search.scale-400.png" />
+    <Content Include="Assets\Icons\star_empty.scale-400.png" />
+    <Content Include="Assets\Icons\star_full.scale-400.png" />
+    <Content Include="Assets\Post01.scale-200.jpg" />
+    <Content Include="Assets\Post02.scale-200.jpg" />
+    <Content Include="Assets\Post03.scale-200.jpg" />
+    <Content Include="Assets\Post04.scale-200.jpg" />
+    <Content Include="Assets\Post05.scale-200.jpg" />
+    <Content Include="Assets\Post06.scale-200.jpg" />
+    <Content Include="Assets\Post07.scale-200.jpg" />
+    <Content Include="Assets\Post08.scale-200.jpg" />
+    <Content Include="Assets\Post09.scale-200.jpg" />
+    <Content Include="Assets\Post10.scale-200.jpg" />
+    <Content Include="Assets\Post11.scale-200.jpg" />
+    <Content Include="Assets\Post12.scale-200.jpg" />
+    <Content Include="Assets\ProfileGirl01.scale-200.jpg" />
+    <Content Include="Assets\ProfileGirl02.scale-200.jpg" />
+    <Content Include="Assets\ProfileGirl03.scale-200.jpg" />
+    <Content Include="Assets\ProfileMan01.scale-200.jpg" />
+    <Content Include="Assets\ProfileMan02.scale-200.jpg" />
+    <Content Include="Assets\ProfileMan03.scale-200.jpg" />
+    <Content Include="Assets\TestCard.png" />
+    <Content Include="Assets\UnoLogo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Analytics.cs" />
+    <Compile Include="Analytics.others.cs" />
+    <Compile Include="Analytics.wasm.cs" />
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Behaviors\DynamicAnimation.cs" />
+    <Compile Include="Behaviors\ItemsWrapGridBehavior.cs" />
+    <Compile Include="CodeBox.cs" />
+    <Compile Include="Converters\BoolToDefaultValueConverter.cs" />
+    <Compile Include="Converters\EmptyStringToBoolConverter.cs" />
+    <Compile Include="Converters\IntToMod4DefaultValueConverter.cs" />
+    <Compile Include="Converters\SampleGroupTypeToColorBrushConverter.cs" />
+    <Compile Include="Sample.cs" />
+    <Compile Include="SampleCategory.cs" />
+    <Compile Include="SampleForDisplay.cs" />
+    <Compile Include="SamplePage.xaml.cs">
+      <DependentUpon>SamplePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SamplesPage.xaml.cs">
+      <DependentUpon>SamplesPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Animations.xaml.cs">
+      <DependentUpon>Animations.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Brushes.xaml.cs">
+      <DependentUpon>Brushes.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button.xaml.cs">
+      <DependentUpon>Button.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\CheckBox.xaml.cs">
+      <DependentUpon>CheckBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\CommandBar.xaml.cs">
+      <DependentUpon>CommandBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\FlipView.xaml.cs">
+      <DependentUpon>FlipView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Form.xaml.cs">
+      <DependentUpon>Form.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\GridView.xaml.cs">
+      <DependentUpon>GridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Homies.xaml.cs">
+      <DependentUpon>Homies.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\HyperlinkButton.xaml.cs">
+      <DependentUpon>HyperlinkButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Image.xaml.cs">
+      <DependentUpon>Image.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ListView.xaml.cs">
+      <DependentUpon>ListView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MessageDialog.xaml.cs">
+      <DependentUpon>MessageDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Panels.xaml.cs">
+      <DependentUpon>Panels.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PasswordBox.xaml.cs">
+      <DependentUpon>PasswordBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Playground.xaml.cs">
+      <DependentUpon>Playground.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Progress.xaml.cs">
+      <DependentUpon>Progress.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\RadioButton.xaml.cs">
+      <DependentUpon>RadioButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ScrollViewer.xaml.cs">
+      <DependentUpon>ScrollViewer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Shapes.xaml.cs">
+      <DependentUpon>Shapes.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Slider.xaml.cs">
+      <DependentUpon>Slider.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\TextBlock.xaml.cs">
+      <DependentUpon>TextBlock.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\TextBox.xaml.cs">
+      <DependentUpon>TextBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ToggleButton.xaml.cs">
+      <DependentUpon>ToggleButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ToggleSwitch.xaml.cs">
+      <DependentUpon>ToggleSwitch.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Transform.xaml.cs">
+      <DependentUpon>Transform.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Typography.xaml.cs">
+      <DependentUpon>Typography.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\WebView.xaml.cs">
+      <DependentUpon>WebView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TemplateSelectors\IconTemplateSelector.cs" />
+    <Compile Include="TemplateSelectors\SampleItemTemplateSelector.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CodeBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DefaultStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Icons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SamplePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SamplesPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Animations.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Button.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\CheckBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\CommandBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\FlipView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Form.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\GridView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Homies.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\HyperlinkButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Image.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\MessageDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Panels.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\PasswordBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Playground.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Progress.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\RadioButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ScrollViewer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Shapes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Slider.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\TextBlock.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ToggleButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ToggleSwitch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Transform.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Typography.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\WebView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\Button.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\CommandBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\ListView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\ListViewItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\PasswordBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\SplitView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\TextBlock.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\Controls\_Controls.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\StyleGuide\Colors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\StyleGuide\Fonts.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\StyleGuide\LayoutConstants.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\StyleGuide\_StyleGuide.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\_Styles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="Strings\en\Resources.resw" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Uno.UI.Demo.UWP/Assets/Desktop-Screenshot.png b/src/Uno.Playground.UWP/Assets/Desktop-Screenshot.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Desktop-Screenshot.png
rename to src/Uno.Playground.UWP/Assets/Desktop-Screenshot.png
diff --git a/Uno.UI.Demo.UWP/Assets/LargeTile.scale-100.png b/src/Uno.Playground.UWP/Assets/LargeTile.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LargeTile.scale-100.png
rename to src/Uno.Playground.UWP/Assets/LargeTile.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/LargeTile.scale-125.png b/src/Uno.Playground.UWP/Assets/LargeTile.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LargeTile.scale-125.png
rename to src/Uno.Playground.UWP/Assets/LargeTile.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/LargeTile.scale-150.png b/src/Uno.Playground.UWP/Assets/LargeTile.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LargeTile.scale-150.png
rename to src/Uno.Playground.UWP/Assets/LargeTile.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/LargeTile.scale-200.png b/src/Uno.Playground.UWP/Assets/LargeTile.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LargeTile.scale-200.png
rename to src/Uno.Playground.UWP/Assets/LargeTile.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/LargeTile.scale-400.png b/src/Uno.Playground.UWP/Assets/LargeTile.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LargeTile.scale-400.png
rename to src/Uno.Playground.UWP/Assets/LargeTile.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/LockScreenLogo.scale-200.png b/src/Uno.Playground.UWP/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/LockScreenLogo.scale-200.png
rename to src/Uno.Playground.UWP/Assets/LockScreenLogo.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/SmallTile.scale-100.png b/src/Uno.Playground.UWP/Assets/SmallTile.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SmallTile.scale-100.png
rename to src/Uno.Playground.UWP/Assets/SmallTile.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/SmallTile.scale-125.png b/src/Uno.Playground.UWP/Assets/SmallTile.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SmallTile.scale-125.png
rename to src/Uno.Playground.UWP/Assets/SmallTile.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/SmallTile.scale-150.png b/src/Uno.Playground.UWP/Assets/SmallTile.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SmallTile.scale-150.png
rename to src/Uno.Playground.UWP/Assets/SmallTile.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/SmallTile.scale-200.png b/src/Uno.Playground.UWP/Assets/SmallTile.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SmallTile.scale-200.png
rename to src/Uno.Playground.UWP/Assets/SmallTile.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/SmallTile.scale-400.png b/src/Uno.Playground.UWP/Assets/SmallTile.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SmallTile.scale-400.png
rename to src/Uno.Playground.UWP/Assets/SmallTile.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/SplashScreen.scale-100.png b/src/Uno.Playground.UWP/Assets/SplashScreen.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SplashScreen.scale-100.png
rename to src/Uno.Playground.UWP/Assets/SplashScreen.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/SplashScreen.scale-125.png b/src/Uno.Playground.UWP/Assets/SplashScreen.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SplashScreen.scale-125.png
rename to src/Uno.Playground.UWP/Assets/SplashScreen.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/SplashScreen.scale-150.png b/src/Uno.Playground.UWP/Assets/SplashScreen.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SplashScreen.scale-150.png
rename to src/Uno.Playground.UWP/Assets/SplashScreen.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/SplashScreen.scale-200.png b/src/Uno.Playground.UWP/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SplashScreen.scale-200.png
rename to src/Uno.Playground.UWP/Assets/SplashScreen.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/SplashScreen.scale-400.png b/src/Uno.Playground.UWP/Assets/SplashScreen.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/SplashScreen.scale-400.png
rename to src/Uno.Playground.UWP/Assets/SplashScreen.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-100.png b/src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-100.png
rename to src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-125.png b/src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-125.png
rename to src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-150.png b/src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-150.png
rename to src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-200.png b/src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-200.png
rename to src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-400.png b/src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square150x150Logo.scale-400.png
rename to src/Uno.Playground.UWP/Assets/Square150x150Logo.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-100.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-100.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-125.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-125.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-150.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-150.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-200.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-200.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-400.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.scale-400.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-16.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-16.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-16.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-24.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-24.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-24.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-256.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-256.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-256.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-32.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-32.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-32.png
diff --git a/Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-48.png b/src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Square44x44Logo.targetsize-48.png
rename to src/Uno.Playground.UWP/Assets/Square44x44Logo.targetsize-48.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.backup.png b/src/Uno.Playground.UWP/Assets/StoreLogo.backup.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.backup.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.backup.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.scale-100.png b/src/Uno.Playground.UWP/Assets/StoreLogo.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.scale-100.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.scale-125.png b/src/Uno.Playground.UWP/Assets/StoreLogo.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.scale-125.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.scale-150.png b/src/Uno.Playground.UWP/Assets/StoreLogo.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.scale-150.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.scale-200.png b/src/Uno.Playground.UWP/Assets/StoreLogo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.scale-200.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/StoreLogo.scale-400.png b/src/Uno.Playground.UWP/Assets/StoreLogo.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/StoreLogo.scale-400.png
rename to src/Uno.Playground.UWP/Assets/StoreLogo.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-100.png b/src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-100.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-100.png
rename to src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-100.png
diff --git a/Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-125.png b/src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-125.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-125.png
rename to src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-125.png
diff --git a/Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-150.png b/src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-150.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-150.png
rename to src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-150.png
diff --git a/Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-200.png b/src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-200.png
rename to src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-200.png
diff --git a/Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-400.png b/src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-400.png
similarity index 100%
rename from Uno.UI.Demo.UWP/Assets/Wide310x150Logo.scale-400.png
rename to src/Uno.Playground.UWP/Assets/Wide310x150Logo.scale-400.png
diff --git a/Uno.UI.Demo.UWP/Behaviors.xaml b/src/Uno.Playground.UWP/Behaviors.xaml
similarity index 100%
rename from Uno.UI.Demo.UWP/Behaviors.xaml
rename to src/Uno.Playground.UWP/Behaviors.xaml
diff --git a/Uno.UI.Demo.UWP/Behaviors.xaml.cs b/src/Uno.Playground.UWP/Behaviors.xaml.cs
similarity index 100%
rename from Uno.UI.Demo.UWP/Behaviors.xaml.cs
rename to src/Uno.Playground.UWP/Behaviors.xaml.cs
diff --git a/Uno.UI.Demo.UWP/Fonts/OpenSans-Bold.ttf b/src/Uno.Playground.UWP/Fonts/OpenSans-Bold.ttf
similarity index 100%
rename from Uno.UI.Demo.UWP/Fonts/OpenSans-Bold.ttf
rename to src/Uno.Playground.UWP/Fonts/OpenSans-Bold.ttf
diff --git a/Uno.UI.Demo.UWP/Fonts/OpenSans-ExtraBold.ttf b/src/Uno.Playground.UWP/Fonts/OpenSans-ExtraBold.ttf
similarity index 100%
rename from Uno.UI.Demo.UWP/Fonts/OpenSans-ExtraBold.ttf
rename to src/Uno.Playground.UWP/Fonts/OpenSans-ExtraBold.ttf
diff --git a/Uno.UI.Demo.UWP/Fonts/OpenSans-Light.ttf b/src/Uno.Playground.UWP/Fonts/OpenSans-Light.ttf
similarity index 100%
rename from Uno.UI.Demo.UWP/Fonts/OpenSans-Light.ttf
rename to src/Uno.Playground.UWP/Fonts/OpenSans-Light.ttf
diff --git a/Uno.UI.Demo.UWP/Fonts/OpenSans-Regular.ttf b/src/Uno.Playground.UWP/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from Uno.UI.Demo.UWP/Fonts/OpenSans-Regular.ttf
rename to src/Uno.Playground.UWP/Fonts/OpenSans-Regular.ttf
diff --git a/Uno.UI.Demo.UWP/Fonts/OpenSans-Semibold.ttf b/src/Uno.Playground.UWP/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from Uno.UI.Demo.UWP/Fonts/OpenSans-Semibold.ttf
rename to src/Uno.Playground.UWP/Fonts/OpenSans-Semibold.ttf
diff --git a/Uno.UI.Demo.UWP/Package.appxmanifest b/src/Uno.Playground.UWP/Package.appxmanifest
similarity index 100%
rename from Uno.UI.Demo.UWP/Package.appxmanifest
rename to src/Uno.Playground.UWP/Package.appxmanifest
diff --git a/Uno.UI.Demo.UWP/Properties/AssemblyInfo.cs b/src/Uno.Playground.UWP/Properties/AssemblyInfo.cs
similarity index 100%
rename from Uno.UI.Demo.UWP/Properties/AssemblyInfo.cs
rename to src/Uno.Playground.UWP/Properties/AssemblyInfo.cs
diff --git a/Uno.UI.Demo.UWP/Properties/Default.rd.xml b/src/Uno.Playground.UWP/Properties/Default.rd.xml
similarity index 100%
rename from Uno.UI.Demo.UWP/Properties/Default.rd.xml
rename to src/Uno.Playground.UWP/Properties/Default.rd.xml
diff --git a/Uno.UI.Demo.UWP/Uno.UI.Demo.UWP.csproj b/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj
similarity index 95%
rename from Uno.UI.Demo.UWP/Uno.UI.Demo.UWP.csproj
rename to src/Uno.Playground.UWP/Uno.Playground.UWP.csproj
index 61578f6..e812aa4 100644
--- a/Uno.UI.Demo.UWP/Uno.UI.Demo.UWP.csproj
+++ b/src/Uno.Playground.UWP/Uno.Playground.UWP.csproj
@@ -23,7 +23,7 @@
       <Version>1.22.0-dev.23</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.29.1-aobfwasm.2834</Version>
+      <Version>1.29.1</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
@@ -41,8 +41,8 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Uno.UI.Demo.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>A6C8E4C920133205129A632CDBB061BF5BE5D104</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Uno.Playground.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>774B53ABA8D1741410809EF61C94D9D9E48314C0</PackageCertificateThumbprint>
     <UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
@@ -145,7 +145,6 @@
     <Content Include="Fonts\OpenSans-Regular.ttf" />
     <Content Include="Fonts\OpenSans-Semibold.ttf" />
     <Content Include="Fonts\OpenSans-ExtraBold.ttf" />
-    <None Include="Uno.UI.Demo.UWP_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\LargeTile.scale-100.png" />
@@ -188,7 +187,6 @@
     <Content Include="Assets\Wide310x150Logo.scale-125.png" />
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <None Include="Package.StoreAssociation.xml" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
@@ -196,8 +194,9 @@
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+    <None Include="Uno.Playground.UWP_TemporaryKey.pfx" />
   </ItemGroup>
-  <Import Project="..\Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems" Label="Shared" Condition="Exists('..\Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems')" />
+  <Import Project="..\Uno.Playground.Shared\Uno.Playground.Shared.projitems" Label="Shared" Condition="Exists('..\Uno.Playground.Shared\Uno.Playground.Shared.projitems')" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
@@ -209,4 +208,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Uno.UI.Demo.WASM/Fonts/winjs-symbols.woff2 b/src/Uno.Playground.WASM/Fonts/winjs-symbols.woff2
similarity index 100%
rename from Uno.UI.Demo.WASM/Fonts/winjs-symbols.woff2
rename to src/Uno.Playground.WASM/Fonts/winjs-symbols.woff2
diff --git a/src/Uno.Playground.WASM/FragmentHavigationHandler.cs b/src/Uno.Playground.WASM/FragmentHavigationHandler.cs
new file mode 100644
index 0000000..0a3d97e
--- /dev/null
+++ b/src/Uno.Playground.WASM/FragmentHavigationHandler.cs
@@ -0,0 +1,69 @@
+using System;
+using System.ComponentModel;
+using Uno.Foundation;
+
+namespace Uno.UI.Wasm
+{
+	public static class FragmentHavigationHandler
+	{
+		public static string CurrentFragment
+		{
+			get
+			{
+				const string command = "Uno.UI.FragmentNavigationHandler.getCurrentFragment()";
+				var fragment = WebAssemblyRuntime.InvokeJS(command);
+				return RemoveLeadingHash(fragment);
+			}
+
+			set
+			{
+				var escaped = WebAssemblyRuntime.EscapeJs(value);
+				var command =
+					"Uno.UI.FragmentNavigationHandler.setCurrentFragment(\"" + escaped + "\")";
+
+				WebAssemblyRuntime.InvokeJS(command);
+			}
+		}
+
+		private static event EventHandler<NewFragmentEventArgs> _navigatedToFragment;
+
+		public static event EventHandler<NewFragmentEventArgs> NavigatedToFragment
+		{
+			add
+			{
+				_navigatedToFragment += value;
+
+				const string command = "Uno.UI.FragmentNavigationHandler.subscribeToFragmentChanged()";
+				WebAssemblyRuntime.InvokeJS(command);
+			}
+			remove => _navigatedToFragment -= value;
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		[Preserve]
+		public static void NotifyFragmentChanged(string newFragment)
+		{
+			_navigatedToFragment?.Invoke(null, new NewFragmentEventArgs(RemoveLeadingHash(newFragment)));
+		}
+
+		private static string RemoveLeadingHash(string fragmentName)
+		{
+			while (fragmentName.StartsWith("#"))
+			{
+				fragmentName = fragmentName.Substring(1);
+			}
+
+			return fragmentName;
+		}
+	}
+
+	public class NewFragmentEventArgs
+	{
+		public string Fragment { get; }
+
+		public NewFragmentEventArgs(string fragment)
+		{
+			Fragment = fragment;
+		}
+	}
+}
diff --git a/Uno.UI.Demo.WASM/LinkerConfig.xml b/src/Uno.Playground.WASM/LinkerConfig.xml
similarity index 100%
rename from Uno.UI.Demo.WASM/LinkerConfig.xml
rename to src/Uno.Playground.WASM/LinkerConfig.xml
diff --git a/Uno.UI.Demo.WASM/Program.cs b/src/Uno.Playground.WASM/Program.cs
similarity index 100%
rename from Uno.UI.Demo.WASM/Program.cs
rename to src/Uno.Playground.WASM/Program.cs
diff --git a/Uno.UI.Demo.WASM/Uno.UI.Demo.WASM.csproj b/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj
similarity index 86%
rename from Uno.UI.Demo.WASM/Uno.UI.Demo.WASM.csproj
rename to src/Uno.Playground.WASM/Uno.Playground.WASM.csproj
index 9908794..6b11adf 100644
--- a/Uno.UI.Demo.WASM/Uno.UI.Demo.WASM.csproj
+++ b/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj
@@ -7,8 +7,8 @@
 		<ApplicationIcon />
 		<StartupObject />
 		<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
-		<AssemblyName>Uno.UI.Demo.WASM</AssemblyName>
-		<RootNamespace>Uno.UI.Demo</RootNamespace>
+		<AssemblyName>Uno.Playground.WASM</AssemblyName>
+		<RootNamespace>Uno.Playground.WASM</RootNamespace>
 		<NoWarn>NU1701</NoWarn>
 	</PropertyGroup>
 
@@ -47,8 +47,8 @@
 		<PackageReference Include="Microsoft.TypeScript.Compiler" Version="2.8.3" />
 		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="2.8.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-		<PackageReference Include="Uno.UI" Version="1.29.1-aobfwasm.2834" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.17" />
+		<PackageReference Include="Uno.UI" Version="1.30.1-aobfwasm.2873" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.0-dev.23" />
 		<PackageReference Include="Uno.CodeGen" Version="1.21.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
@@ -59,9 +59,9 @@
 			<PlaygroundFiles Include="bin\$(Configuration)\netstandard2.0\dist\**\*.*" />
 		</ItemGroup>
 
-		<Copy SourceFiles="@(PlaygroundFiles)" DestinationFolder="..\Uno.UI.Demo.AspnetShell\wwwroot\playground\%(RecursiveDir)" />
+		<Copy SourceFiles="@(PlaygroundFiles)" DestinationFolder="..\Uno.Playground.AspnetShell\wwwroot\%(RecursiveDir)" />
 	</Target>
 
-	<Import Project="..\Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems" Label="Shared" />
+	<Import Project="..\Uno.Playground.Shared\Uno.Playground.Shared.projitems" Label="Shared" />
 
 </Project>
diff --git a/Uno.UI.Demo.WASM/WasmCSS/Fonts.css b/src/Uno.Playground.WASM/WasmCSS/Fonts.css
similarity index 100%
rename from Uno.UI.Demo.WASM/WasmCSS/Fonts.css
rename to src/Uno.Playground.WASM/WasmCSS/Fonts.css
diff --git a/Uno.UI.Demo.WASM/WasmScripts/AppManifest.js b/src/Uno.Playground.WASM/WasmScripts/AppManifest.js
similarity index 100%
rename from Uno.UI.Demo.WASM/WasmScripts/AppManifest.js
rename to src/Uno.Playground.WASM/WasmScripts/AppManifest.js
diff --git a/src/Uno.Playground.WASM/WasmScripts/FragmentNavigation.js b/src/Uno.Playground.WASM/WasmScripts/FragmentNavigation.js
new file mode 100644
index 0000000..c869ef7
--- /dev/null
+++ b/src/Uno.Playground.WASM/WasmScripts/FragmentNavigation.js
@@ -0,0 +1,45 @@
+var Uno;
+(function (Uno) {
+    var UI;
+    (function (UI) {
+        class FragmentNavigationHandler {
+            static getCurrentFragment() {
+                return window.location.hash;
+            }
+            static setCurrentFragment(fragment) {
+                window.location.hash = fragment;
+                this.currentFragment = window.location.hash;
+                return "ok";
+            }
+            static subscribeToFragmentChanged() {
+                if (this.subscribed) {
+                    return "already subscribed";
+                }
+                this.subscribed = true;
+                this.currentFragment = this.getCurrentFragment();
+                window.addEventListener("hashchange", _ => this.notifyFragmentChanged(), false);
+                return "ok";
+            }
+            static notifyFragmentChanged() {
+                const newFragment = this.getCurrentFragment();
+                if (newFragment === this.currentFragment) {
+                    return; // nothing to do
+                }
+                this.currentFragment = newFragment;
+                this.initializeMethods();
+                const newFragmentStr = MonoRuntime.mono_string(newFragment);
+                MonoRuntime.call_method(this.notifyFragmentChangedMethod, null, [newFragmentStr]);
+            }
+            static initializeMethods() {
+                if (this.notifyFragmentChangedMethod) {
+                    return; // already initialized.
+                }
+                const asm = MonoRuntime.assembly_load("Uno.Playground.WASM");
+                const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "FragmentHavigationHandler");
+                this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
+            }
+        }
+        FragmentNavigationHandler.subscribed = false;
+        UI.FragmentNavigationHandler = FragmentNavigationHandler;
+    })(UI = Uno.UI || (Uno.UI = {}));
+})(Uno || (Uno = {}));
diff --git a/src/Uno.Playground.WASM/WasmScripts/GoogleAnalytics.js b/src/Uno.Playground.WASM/WasmScripts/GoogleAnalytics.js
new file mode 100644
index 0000000..4a20b2c
--- /dev/null
+++ b/src/Uno.Playground.WASM/WasmScripts/GoogleAnalytics.js
@@ -0,0 +1,51 @@
+var Uno;
+(function (Uno) {
+    var UI;
+    (function (UI) {
+        var Demo;
+        (function (Demo) {
+            class Analytics {
+                static reportPageView(screenName, appName = "Uno.UI.Demo.Playground") {
+                    if (Analytics.init(screenName, appName)) {
+                        return "ok";
+                    }
+                    const gtag = window.gtag;
+                    if (gtag) {
+                        gtag("event", "screen_view", {
+                            screen_name: screenName,
+                            app_name: appName
+                        });
+                    }
+                    else {
+                        console.error(`Google Analytics not present, can't report page view for ${screenName}.`);
+                    }
+                    return "ok";
+                }
+                static init(screenName, appName) {
+                    if (Analytics.isLoaded) {
+                        return false;
+                    }
+                    const script = `
+	window.dataLayer = window.dataLayer || [];
+	function gtag() { dataLayer.push(arguments); }
+	gtag('js', new Date());
+	gtag('config', 'UA-26688675-3');
+
+	gtag("event", "screen_view", {screen_name: \"${screenName}\", app_name: \"${appName}\"});`;
+                    const script1 = document.createElement("script");
+                    script1.type = "text/javascript";
+                    script1.src = "https://www.googletagmanager.com/gtag/js?id=UA-26688675-3";
+                    document.body.appendChild(script1);
+                    const script2 = document.createElement("script");
+                    script2.type = "text/javascript";
+                    script2.innerText = script;
+                    document.body.appendChild(script2);
+                    Analytics.isLoaded = true;
+                    return true;
+                }
+            }
+            Analytics.isLoaded = false;
+            Demo.Analytics = Analytics;
+        })(Demo = UI.Demo || (UI.Demo = {}));
+    })(UI = Uno.UI || (Uno.UI = {}));
+})(Uno || (Uno = {}));
diff --git a/src/Uno.Playground.WASM/ts/FragmentNavigation.ts b/src/Uno.Playground.WASM/ts/FragmentNavigation.ts
new file mode 100644
index 0000000..c678275
--- /dev/null
+++ b/src/Uno.Playground.WASM/ts/FragmentNavigation.ts
@@ -0,0 +1,64 @@
+namespace Uno.UI {
+	export class FragmentNavigationHandler {
+
+		private static currentFragment: string;
+
+		public static getCurrentFragment(): string {
+			return window.location.hash;
+		}
+
+		public static setCurrentFragment(fragment: string): string {
+			window.location.hash = fragment;
+			this.currentFragment = window.location.hash;
+
+			return "ok";
+		}
+
+		private static subscribed: boolean = false;
+
+		public static subscribeToFragmentChanged(): string {
+
+			if (this.subscribed) {
+				return "already subscribed";
+			}
+
+			this.subscribed = true;
+
+			this.currentFragment = this.getCurrentFragment();
+
+			window.addEventListener(
+				"hashchange",
+				_ => this.notifyFragmentChanged(),
+				false);
+
+			return "ok";
+		}
+
+		private static notifyFragmentChangedMethod: any;
+
+		private static notifyFragmentChanged() {
+			const newFragment: string = this.getCurrentFragment();
+			if (newFragment === this.currentFragment) {
+				return;  // nothing to do
+			}
+
+			this.currentFragment = newFragment;
+
+			this.initializeMethods();
+			const newFragmentStr = MonoRuntime.mono_string(newFragment);
+			MonoRuntime.call_method(this.notifyFragmentChangedMethod, null, [newFragmentStr]);
+		}
+
+		private static initializeMethods(): void {
+			if (this.notifyFragmentChangedMethod) {
+				return; // already initialized.
+			}
+
+			const asm = MonoRuntime.assembly_load("Uno.Playground.WASM");
+			const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "FragmentHavigationHandler");
+			this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
+		}
+	}
+
+	declare var MonoRuntime: any;
+}
diff --git a/Uno.UI.Demo.WASM/ts/GoogleAnalytics.ts b/src/Uno.Playground.WASM/ts/GoogleAnalytics.ts
similarity index 98%
rename from Uno.UI.Demo.WASM/ts/GoogleAnalytics.ts
rename to src/Uno.Playground.WASM/ts/GoogleAnalytics.ts
index d7c983f..96704c4 100644
--- a/Uno.UI.Demo.WASM/ts/GoogleAnalytics.ts
+++ b/src/Uno.Playground.WASM/ts/GoogleAnalytics.ts
@@ -4,8 +4,6 @@
 
 		public static reportPageView(screenName: string, appName: string = "Uno.UI.Demo.Playground"): string {
 
-			debugger;
-
 			if (Analytics.init(screenName, appName)) {
 				return "ok";
 			}
@@ -52,4 +50,4 @@
 			return true;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Uno.UI.Demo.WASM/tsconfig.json b/src/Uno.Playground.WASM/tsconfig.json
similarity index 82%
rename from Uno.UI.Demo.WASM/tsconfig.json
rename to src/Uno.Playground.WASM/tsconfig.json
index d308a67..19f0ccc 100644
--- a/Uno.UI.Demo.WASM/tsconfig.json
+++ b/src/Uno.Playground.WASM/tsconfig.json
@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
 		"module": "none",
-		"declaration": true,
+		"declaration": false,
 		"diagnostics": true,
 		"noImplicitAny": true,
 		"outDir": "WasmScripts",
@@ -9,6 +9,6 @@
 		"target": "es2015"
 	},
 	"include": [
-		"ts/**/*"
+		"ts/**/*.ts"
 	]
 }
diff --git a/Uno.UI.Demo.iOS/Entitlements.plist b/src/Uno.Playground.iOS/Entitlements.plist
similarity index 100%
rename from Uno.UI.Demo.iOS/Entitlements.plist
rename to src/Uno.Playground.iOS/Entitlements.plist
diff --git a/Uno.UI.Demo.iOS/Info.plist b/src/Uno.Playground.iOS/Info.plist
similarity index 100%
rename from Uno.UI.Demo.iOS/Info.plist
rename to src/Uno.Playground.iOS/Info.plist
diff --git a/Uno.UI.Demo.iOS/LaunchScreen.storyboard b/src/Uno.Playground.iOS/LaunchScreen.storyboard
similarity index 100%
rename from Uno.UI.Demo.iOS/LaunchScreen.storyboard
rename to src/Uno.Playground.iOS/LaunchScreen.storyboard
diff --git a/Uno.UI.Demo.iOS/Main.cs b/src/Uno.Playground.iOS/Main.cs
similarity index 100%
rename from Uno.UI.Demo.iOS/Main.cs
rename to src/Uno.Playground.iOS/Main.cs
diff --git a/Uno.UI.Demo.iOS/Properties/AssemblyInfo.cs b/src/Uno.Playground.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Uno.UI.Demo.iOS/Properties/AssemblyInfo.cs
rename to src/Uno.Playground.iOS/Properties/AssemblyInfo.cs
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Bold.ttf b/src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Bold.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Bold.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Bold.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-ExtraBold.ttf b/src/Uno.Playground.iOS/Resources/Fonts/OpenSans-ExtraBold.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-ExtraBold.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/OpenSans-ExtraBold.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Light.ttf b/src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Light.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Light.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Light.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Regular.ttf b/src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Regular.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Semibold.ttf b/src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/OpenSans-Semibold.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Fonts/winjs-symbols.ttf b/src/Uno.Playground.iOS/Resources/Fonts/winjs-symbols.ttf
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Fonts/winjs-symbols.ttf
rename to src/Uno.Playground.iOS/Resources/Fonts/winjs-symbols.ttf
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Contents.json b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Contents.json
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Contents.json
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Contents.json
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-1024.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-1024.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-1024.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-1024.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-20@3x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-29@3x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-40@3x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-60@3x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-76@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png b/src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/AppIcons.appiconset/Icon-83.5@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/Uno.Playground.iOS/Resources/Media.xcassets/LaunchImages.launchimage/Contents.json
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/Media.xcassets/LaunchImages.launchimage/Contents.json
rename to src/Uno.Playground.iOS/Resources/Media.xcassets/LaunchImages.launchimage/Contents.json
diff --git a/Uno.UI.Demo.iOS/Resources/SplashScreen@2x.png b/src/Uno.Playground.iOS/Resources/SplashScreen@2x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/SplashScreen@2x.png
rename to src/Uno.Playground.iOS/Resources/SplashScreen@2x.png
diff --git a/Uno.UI.Demo.iOS/Resources/SplashScreen@3x.png b/src/Uno.Playground.iOS/Resources/SplashScreen@3x.png
similarity index 100%
rename from Uno.UI.Demo.iOS/Resources/SplashScreen@3x.png
rename to src/Uno.Playground.iOS/Resources/SplashScreen@3x.png
diff --git a/Uno.UI.Demo.iOS/Uno.UI.Demo.iOS.csproj b/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj
similarity index 99%
rename from Uno.UI.Demo.iOS/Uno.UI.Demo.iOS.csproj
rename to src/Uno.Playground.iOS/Uno.Playground.iOS.csproj
index 31b12d6..0e1d440 100644
--- a/Uno.UI.Demo.iOS/Uno.UI.Demo.iOS.csproj
+++ b/src/Uno.Playground.iOS/Uno.Playground.iOS.csproj
@@ -189,7 +189,7 @@
       <Version>1.22.0-dev.23</Version>
     </PackageReference>
     <PackageReference Include="Uno.UI">
-      <Version>1.29.1-aobfwasm.2834</Version>
+      <Version>1.30.1-aobfwasm.2873</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
diff --git a/Uno.UI.Demo.sln b/src/Uno.Playground.sln
similarity index 72%
rename from Uno.UI.Demo.sln
rename to src/Uno.Playground.sln
index 4082127..d4cc09d 100644
--- a/Uno.UI.Demo.sln
+++ b/src/Uno.Playground.sln
@@ -3,27 +3,28 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Demo.AspnetShell", "Uno.UI.Demo.AspnetShell\Uno.UI.Demo.AspnetShell.csproj", "{FB046231-9F21-4967-B0F7-88E1A200FC53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Playground.AspnetShell", "Uno.Playground.AspnetShell\Uno.Playground.AspnetShell.csproj", "{FB046231-9F21-4967-B0F7-88E1A200FC53}"
 	ProjectSection(ProjectDependencies) = postProject
 		{25DA869C-40CB-4C9A-A1E8-A685B7D4EA90} = {25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Demo.WASM", "Uno.UI.Demo.WASM\Uno.UI.Demo.WASM.csproj", "{25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Playground.WASM", "Uno.Playground.WASM\Uno.Playground.WASM.csproj", "{25DA869C-40CB-4C9A-A1E8-A685B7D4EA90}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Uno.UI.Demo.Shared", "Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Uno.Playground.Shared", "Uno.Playground.Shared\Uno.Playground.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.UI.Demo.UWP", "Uno.UI.Demo.UWP\Uno.UI.Demo.UWP.csproj", "{B9799C1B-6092-4DF2-9274-7C127D1AB700}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Playground.UWP", "Uno.Playground.UWP\Uno.Playground.UWP.csproj", "{B9799C1B-6092-4DF2-9274-7C127D1AB700}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.UI.Demo.Droid", "Uno.UI.Demo.Droid\Uno.UI.Demo.Droid.csproj", "{5077C264-AD1A-4FFA-899C-A564F624F161}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Playground.Droid", "Uno.Playground.Droid\Uno.Playground.Droid.csproj", "{5077C264-AD1A-4FFA-899C-A564F624F161}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.UI.Demo.iOS", "Uno.UI.Demo.iOS\Uno.UI.Demo.iOS.csproj", "{85473ADF-7C3B-415B-B68D-0B90483CEB26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Playground.iOS", "Uno.Playground.iOS\Uno.Playground.iOS.csproj", "{85473ADF-7C3B-415B-B68D-0B90483CEB26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Playground.Api", "Uno.Playground.Api\Uno.Playground.Api.csproj", "{BE24E930-CBD3-4043-B55F-586DCC1E5225}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build\Build.csproj", "{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems*{5077c264-ad1a-4ffa-899c-a564f624f161}*SharedItemsImports = 4
-		Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
-		Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems*{85473adf-7c3b-415b-b68d-0b90483ceb26}*SharedItemsImports = 4
-		Uno.UI.Demo.Shared\Uno.UI.Demo.Shared.projitems*{b9799c1b-6092-4df2-9274-7c127d1ab700}*SharedItemsImports = 4
+		Uno.Playground.Shared\Uno.Playground.Shared.projitems*{b9799c1b-6092-4df2-9274-7c127d1ab700}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -451,6 +452,147 @@ Global
 		{85473ADF-7C3B-415B-B68D-0B90483CEB26}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{85473ADF-7C3B-415B-B68D-0B90483CEB26}.Release|x64.ActiveCfg = Release|iPhone
 		{85473ADF-7C3B-415B-B68D-0B90483CEB26}.Release|x86.ActiveCfg = Release|iPhone
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|x64.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.AppStore|x86.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|x64.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Debug|x86.Build.0 = Debug|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|Any CPU.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|Any CPU.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|ARM.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|ARM.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|iPhone.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|iPhone.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|x64.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|x64.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|x86.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_iOS|x86.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|Any CPU.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|ARM.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|ARM.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|iPhone.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|iPhone.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|x64.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|x64.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|x86.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release_UWP|x86.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|ARM.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|iPhone.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|x64.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|x64.Build.0 = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|x86.ActiveCfg = Release|Any CPU
+		{BE24E930-CBD3-4043-B55F-586DCC1E5225}.Release|x86.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|x64.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.AppStore|x86.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|x64.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Debug|x86.Build.0 = Debug|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|Any CPU.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|Any CPU.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|ARM.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|ARM.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|iPhone.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|iPhone.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|iPhoneSimulator.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|x64.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|x64.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|x86.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_iOS|x86.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|Any CPU.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|ARM.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|ARM.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|iPhone.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|iPhone.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|iPhoneSimulator.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|x64.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|x64.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|x86.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release_UWP|x86.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|ARM.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|iPhone.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|x64.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|x64.Build.0 = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|x86.ActiveCfg = Release|Any CPU
+		{ED225EC8-FAAA-439D-B9BA-3723F6F5516C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE