diff --git a/.gitmodules b/.gitmodules
index 30b0ccc..e7d154f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Xaml-Controls-Gallery"]
-	path = Xaml-Controls-Gallery
+[submodule "ApplicationUnderTests/Xaml-Controls-Gallery"]
+	path = ApplicationUnderTests/Xaml-Controls-Gallery
 	url = https://github.com/microsoft/Xaml-Controls-Gallery.git
diff --git a/ApplicationUnderTests/README.md b/ApplicationUnderTests/README.md
index f0bc955..199975a 100644
--- a/ApplicationUnderTests/README.md
+++ b/ApplicationUnderTests/README.md
@@ -6,3 +6,4 @@ The following sample applications are used for [Windows Application Driver Tests
 |-----------------------------------	|-----------------------------------------------	|
 | [AppUIBasics ](./AppUIBasics/)    	| Hosts all UI Universal Windows UI controls    	|
 | [Input       ](./Input/)          	| Logs various input interactions               	|
+| [Xaml Controls Gallery](./Xaml-Controls-Gallery/)          	| This app demonstrates the controls available in the Fluent Design System and Xaml. |
diff --git a/ApplicationUnderTests/Xaml-Controls-Gallery b/ApplicationUnderTests/Xaml-Controls-Gallery
new file mode 160000
index 0000000..3f2bac9
--- /dev/null
+++ b/ApplicationUnderTests/Xaml-Controls-Gallery
@@ -0,0 +1 @@
+Subproject commit 3f2bac94463d229a84b7d15fd198d2fb459805ae
diff --git a/Samples/JavaScript/.ado/templates/buildTestApp.yml b/Samples/JavaScript/.ado/templates/buildTestApp.yml
index da8654c..ac4a60a 100644
--- a/Samples/JavaScript/.ado/templates/buildTestApp.yml
+++ b/Samples/JavaScript/.ado/templates/buildTestApp.yml
@@ -7,18 +7,11 @@ steps:
   - task: NuGetCommand@2
     displayName: 'NuGet restore'
     inputs:
-      restoreSolution: Xaml-Controls-Gallery/XamlControlsGallery/XamlControlsGallery.sln
+      restoreSolution: ApplicationUnderTests/Xaml-Controls-Gallery/XamlControlsGallery/XamlControlsGallery.sln
   - task: VSBuild@1
-    displayName: 'Build solution XamlControlsGallery/XamlControlsGallery.sln'
+    displayName: 'Build solution ApplicationUnderTests/XamlControlsGallery/XamlControlsGallery.sln'
     inputs:
-      solution: Xaml-Controls-Gallery/XamlControlsGallery/XamlControlsGallery.sln
+      solution: ApplicationUnderTests/Xaml-Controls-Gallery/XamlControlsGallery/XamlControlsGallery.sln
       msbuildArgs: '/p:Configuration=Deploy /p:AppxPackageDir="$(Build.ArtifactStagingDirectory)\\" /p:UapAppxPackageBuildMode=CI/p:AppxBundlePlatforms="x86" /p:AppxBundle=Always'
       platform: x86
-      configuration: Release
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
-    inputs:
-      SourceFolder: '$(system.defaultworkingdirectory)'
-      Contents: '**\bin\$(BuildConfiguration)\**'
-      TargetFolder: '$(build.artifactstagingdirectory)'
-    condition: succeededOrFailed()
\ No newline at end of file
+      configuration: Release
\ No newline at end of file
diff --git a/Xaml-Controls-Gallery b/Xaml-Controls-Gallery
deleted file mode 160000
index 7ca3287..0000000
--- a/Xaml-Controls-Gallery
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ca32874fc6982f8214dd3ec26b20e813ce14644