diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 10a884de1..a6ae9a4bd 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -447,8 +447,8 @@
     <TypeScriptCompile Include="apps\ui-tests-app\pages\text\button.ts">
       <DependentUpon>button.xml</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\ui-tests-app\web-view\webview.ts">
-      <DependentUpon>webview.xml</DependentUpon>
+    <TypeScriptCompile Include="apps\ui-tests-app\web-view\web-view.ts">
+      <DependentUpon>web-view.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="connectivity\connectivity-common.ts">
       <DependentUpon>connectivity.d.ts</DependentUpon>
@@ -1050,12 +1050,10 @@
     <Content Include="apps\ui-tests-app\pages\text\button.xml" />
     <Content Include="apps\ui-tests-app\web-view\test.css" />
     <Content Include="apps\ui-tests-app\web-view\test.html" />
-    <Content Include="apps\ui-tests-app\web-view\webview.xml" />
-    <Content Include="apps\ui-tests-app\web-view\webviewhtmlwithimages.xml" />
-    <Content Include="apps\ui-tests-app\web-view\wvlocal.xml">
+    <Content Include="apps\ui-tests-app\web-view\web-view-test.xml" />
+    <Content Include="apps\ui-tests-app\web-view\web-view.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="apps\ui-tests-app\web-view\webviewlocalfile.xml" />
     <Content Include="fetch\fetch.js" />
     <Content Include="css-value\reworkcss-value.js" />
     <Content Include="ui\layouts\stack-layout\package.json">
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index b08000c45..ea55937cf 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -71,7 +71,11 @@ examples.set("modalview", "modal-view/modalview");
 
 examples.set("nordic", "nordic/nordic");
 
-examples.set("text", "pages/text");
+examples.set("text/button", "pages/text/button");
+examples.set("text/label", "pages/text/label");
+examples.set("text/text-field", "pages/text/text-field");
+examples.set("text/text-view", "pages/text/text-view");
+
 examples.set("background", "pages/background");
 examples.set("console", "pages/console");
 examples.set("gestures", "pages/gestures");
@@ -85,9 +89,7 @@ examples.set("listview_binding", "pages/listview_binding");
 examples.set("switch", "pages/switchandprogress");
 examples.set("textfield", "pages/textfield");
 
-examples.set("webview", "web-view/webview");
-examples.set("webviewhtmlwithimages", "web-view/webviewhtmlwithimages");
-examples.set("webviewlocalfile", "web-view/webviewlocalfile");
-examples.set("wvlocal", "web-view/wvlocal");
+examples.set("webview", "web-view/web-view");
+examples.set("webtest", "web-view/web-vew-test");
 
 //VM.set("selected", "tabAll");
\ No newline at end of file
diff --git a/apps/ui-tests-app/web-view/web-view-test.xml b/apps/ui-tests-app/web-view/web-view-test.xml
new file mode 100644
index 000000000..81e59b05b
--- /dev/null
+++ b/apps/ui-tests-app/web-view/web-view-test.xml
@@ -0,0 +1,6 @@
+<Page>
+  <StackLayout orientation="vertical">
+    <WebView src="~/web-view/test.html" height="50" />
+    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
+  </StackLayout>
+</Page>
diff --git a/apps/ui-tests-app/web-view/webview.ts b/apps/ui-tests-app/web-view/web-view.ts
similarity index 100%
rename from apps/ui-tests-app/web-view/webview.ts
rename to apps/ui-tests-app/web-view/web-view.ts
diff --git a/apps/ui-tests-app/web-view/webview.xml b/apps/ui-tests-app/web-view/web-view.xml
similarity index 100%
rename from apps/ui-tests-app/web-view/webview.xml
rename to apps/ui-tests-app/web-view/web-view.xml
diff --git a/apps/ui-tests-app/web-view/webviewhtmlwithimages.xml b/apps/ui-tests-app/web-view/webviewhtmlwithimages.xml
deleted file mode 100644
index 8f99b7cbe..000000000
--- a/apps/ui-tests-app/web-view/webviewhtmlwithimages.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page>
-  <GridLayout>
-    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./tests/logo.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" />
-  </GridLayout>
-</Page>
-
diff --git a/apps/ui-tests-app/web-view/webviewlocalfile.xml b/apps/ui-tests-app/web-view/webviewlocalfile.xml
deleted file mode 100644
index 669a78965..000000000
--- a/apps/ui-tests-app/web-view/webviewlocalfile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page>
-  <GridLayout>
-    <WebView src="~/web-view/test.html" />
-  </GridLayout>
-</Page>
-
diff --git a/apps/ui-tests-app/web-view/wvlocal.xml b/apps/ui-tests-app/web-view/wvlocal.xml
deleted file mode 100644
index c0a187d35..000000000
--- a/apps/ui-tests-app/web-view/wvlocal.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page>
-  <StackLayout orientation="vertical">
-    <WebView src="~/web-view/test.html" height="50" />
-    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./ui-tests-app/pages/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
-  </StackLayout>
-</Page>