diff --git a/.github/workflows/azure-static-app.yml b/.github/workflows/azure-static-app.yml
index c8c119368..c6a912d20 100644
--- a/.github/workflows/azure-static-app.yml
+++ b/.github/workflows/azure-static-app.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   build_and_deploy_job:
     env:
-      DIST_PATH: samples/Commerce/Commerce.Wasm/bin/Release/net6.0/dist
+      DIST_PATH: testing/TestHarness/TestHarness.Wasm/bin/Release/net6.0/dist
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
           dotnet-version: '6.0.x'
 
       - run: |
-          cd samples/Commerce/Commerce.Wasm
+          cd testing/TestHarness/TestHarness.Wasm
           dotnet build -c Release "/p:Version=${{ steps.gitversion.outputs.fullSemVer }}" /p:UnoExtensionsDisableNet6=true /p:GeneratePackageOnBuild=false /detailedsummary
       - uses: actions/upload-artifact@v2
         with:
diff --git a/build/ci/.azure-pipelines.Android.yml b/build/ci/.azure-pipelines.Android.yml
index e04a16048..83127ac4a 100644
--- a/build/ci/.azure-pipelines.Android.yml
+++ b/build/ci/.azure-pipelines.Android.yml
@@ -33,14 +33,14 @@ jobs:
   - template: templates/dotnet6-install-mac.yml
 
   - script: |
-      mono '$(VS_MSBUILD)' '$(build.sourcesdirectory)/samples/Commerce/Commerce.Droid/Commerce.Droid.csproj' /r /p:Configuration=Release /bl:$(build.artifactstagingdirectory)/build.binlog "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /p:UnoExtensionsDisableNet6=true /p:AotAssemblies=false /p:AndroidBuildApplicationPackage=True
+      mono '$(VS_MSBUILD)' '$(build.sourcesdirectory)/samples/Playground/Playground.Droid/Playground.Droid.csproj' /r /p:Configuration=Release /bl:$(build.artifactstagingdirectory)/build.binlog "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /p:UnoExtensionsDisableNet6=true /p:AotAssemblies=false /p:AndroidBuildApplicationPackage=True
 
     displayName: Build Android App
     
   - task: CopyFiles@2
     displayName: 'Publish Android Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/samples/Commerce/Commerce.Droid/bin/Release
+      SourceFolder: $(build.sourcesdirectory)/samples/Playground/Playground.Droid/bin/Release
       Contents: |
         **/*.aab
         **/*.apk
@@ -50,14 +50,14 @@ jobs:
       flattenFolders: false
 
   - script: |
-      mono '$(VS_MSBUILD)' '$(build.sourcesdirectory)/samples/Commerce/Commerce.Droid/Commerce.Droid.csproj' /r /p:Configuration=Release /bl:$(build.artifactstagingdirectory)/build.binlog "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /p:UnoExtensionsDisableNet6=true /p:AotAssemblies=false /p:BuildForPlayStore=true /p:AndroidBuildApplicationPackage=True
+      mono '$(VS_MSBUILD)' '$(build.sourcesdirectory)/samples/Playground/Playground.Droid/Playground.Droid.csproj' /r /p:Configuration=Release /bl:$(build.artifactstagingdirectory)/build.binlog "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" /p:UnoExtensionsDisableNet6=true /p:AotAssemblies=false /p:BuildForPlayStore=true /p:AndroidBuildApplicationPackage=True
 
     displayName: Build Android PlayStore App
     
   - task: CopyFiles@2
     displayName: 'Publish Android Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/samples/Commerce/Commerce.Droid/bin/Release
+      SourceFolder: $(build.sourcesdirectory)/samples/Playground/Playground.Droid/bin/Release
       Contents: |
         **/*-Signed.aab
         **/*-Signed.apk
diff --git a/build/ci/.azure-pipelines.TemplateValidation.yml b/build/ci/.azure-pipelines.TemplateValidation.yml
index 498236e03..a7a28b80e 100644
--- a/build/ci/.azure-pipelines.TemplateValidation.yml
+++ b/build/ci/.azure-pipelines.TemplateValidation.yml
@@ -58,21 +58,4 @@ jobs:
         {
             throw "Exit code must be zero."
         }
-        # cd ..
-        # dotnet new unoapp-extensions-net6 --material -o UnoNet6App01
-        # cd UnoNet6App01
-        # & $msbuild /r /m UnoNet6App01.sln
-        # if ($LASTEXITCODE -ne 0)
-        # {
-        #     throw "Exit code must be zero."
-        # }
-        # Disabling commerce sample as the commerce sample needs an update
-        # cd ..
-        # dotnet new unoapp-samples-commerce --material -o UnoCommerceApp01
-        # cd UnoCommerceApp01
-        # & $msbuild /r /m UnoCommerceApp01.sln
-        # if ($LASTEXITCODE -ne 0)
-        # {
-        #     throw "Exit code must be zero."
-        # }
     displayName: Build template app
diff --git a/build/ci/.azure-pipelines.Wasm.yml b/build/ci/.azure-pipelines.Wasm.yml
index 8cdbba14c..0f8b601d5 100644
--- a/build/ci/.azure-pipelines.Wasm.yml
+++ b/build/ci/.azure-pipelines.Wasm.yml
@@ -26,12 +26,12 @@ jobs:
     displayName: Install Ninja build
 
   - script: |
-      dotnet build samples/Commerce/Commerce.Wasm/Commerce.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:UnoExtensionsDisableNet6=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/samples-wasm.binlog
+      dotnet build samples/Playground/Playground.Wasm/Playground.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:UnoExtensionsDisableNet6=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/samples-wasm.binlog
 
   - task: CopyFiles@2
     displayName: 'Publish Wasm Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/samples/Commerce/Commerce.Wasm/bin/Release/net6.0/dist
+      SourceFolder: $(build.sourcesdirectory)/samples/Playground/Playground.Wasm/bin/Release/net6.0/dist
       Contents: '**/*.*'
       TargetFolder: $(build.artifactstagingdirectory)/Wasm
       CleanTargetFolder: false
diff --git a/build/ci/scripts/wasm-uitest-run.sh b/build/ci/scripts/wasm-uitest-run.sh
index 0228cc993..9ea67df61 100644
--- a/build/ci/scripts/wasm-uitest-run.sh
+++ b/build/ci/scripts/wasm-uitest-run.sh
@@ -8,11 +8,11 @@ export UNO_UITEST_CHROME_BINARY_PATH=$BUILD_SOURCESDIRECTORY/build/node_modules/
 export UNO_UITEST_SCREENSHOT_PATH=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm
 export UNO_UITEST_PLATFORM=Browser
 export UNO_UITEST_CHROME_CONTAINER_MODE=true
-export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/samples/Commerce/Commerce.UITest/Commerce.UITest.csproj
-export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/samples/Commerce/Commerce.UITest/bin/Release/net48/Commerce.UITest.dll
+export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj
+export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.UITest/bin/Release/net48/TestHarness.UITest.dll
 export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
-export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/samples/Commerce/Commerce.Wasm/Commerce.Wasm.csproj
-export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/samples/Commerce/Commerce.Wasm/bin/Release/net6.0/dist/
+export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj
+export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/bin/Release/net6.0/dist/
 export UNO_UITEST_NUNIT_VERSION=3.13.2
 export UNO_UITEST_NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.7.0/nuget.exe
 export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS="/p:UnoExtensionsDisableNet6=true /p:GeneratePackageOnBuild=false"