diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index a6ae9a4bd..830006310 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -189,6 +189,9 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\tests\pages\tab-view.xml" />
+    <Content Include="apps\ui-tests-app\html-view\html-view.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\ui-tests-app\segmented-bar\all.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -222,11 +225,19 @@
     <Content Include="apps\ui-tests-app\app.css" />
     <TypeScriptCompile Include="apps\ui-tests-app\action-bar\all.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\action-bar\color.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\html-view\html-view.ts">
+      <DependentUpon>html-view.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\login-page.ts">
+      <DependentUpon>login-page.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\modal-view.ts">
+      <DependentUpon>modal-view.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\nordic\nordic.ts">
       <DependentUpon>nordic.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\pages\handlers.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\htmlview.ts" />
     <TypeScriptCompile Include="color\known-colors.d.ts" />
     <TypeScriptCompile Include="ui\animation\animation.d.ts" />
     <TypeScriptCompile Include="ui\animation\animation-common.ts">
@@ -420,12 +431,22 @@
       <DependentUpon>dialogs.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\dialogs\view-model.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\layouts\absolute.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\layouts\dock.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\layouts\grid.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\layouts\absolute.ts">
+      <DependentUpon>absolute.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\layouts\dock.ts">
+      <DependentUpon>dock.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\layouts\grid.ts">
+      <DependentUpon>grid.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\myview.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\layouts\stack.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\layouts\wrap.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\layouts\stack.ts">
+      <DependentUpon>stack.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\layouts\wrap.ts">
+      <DependentUpon>wrap.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\css\background.ts">
       <DependentUpon>background.xml</DependentUpon>
     </TypeScriptCompile>
@@ -434,17 +455,19 @@
     <TypeScriptCompile Include="apps\ui-tests-app\pages\i73.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\gestures.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\listview_binding.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\login-page.ts">
-      <DependentUpon>login-page.xml</DependentUpon>
+    <TypeScriptCompile Include="apps\ui-tests-app\text-field\text-field.ts">
+      <DependentUpon>text-field.xml</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\modalview.ts">
-      <DependentUpon>modalview.xml</DependentUpon>
+    <TypeScriptCompile Include="apps\ui-tests-app\font\text-field.ts">
+      <DependentUpon>text-field.xml</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\textfield.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\text\text-field.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\text\text-view.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\text\label.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\pages\text\button.ts">
+    <TypeScriptCompile Include="apps\ui-tests-app\font\text-view.ts">
+      <DependentUpon>text-view.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\font\label.ts">
+      <DependentUpon>label.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\font\button.ts">
       <DependentUpon>button.xml</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\web-view\web-view.ts">
@@ -1018,36 +1041,49 @@
     <Content Include="apps\ui-tests-app\css\styles.xml" />
     <Content Include="apps\ui-tests-app\dialogs\dialogs.xml" />
     <Content Include="apps\ui-tests-app\image-view\gravatar.png" />
-    <Content Include="apps\ui-tests-app\image-view\roundimg.css" />
-    <Content Include="apps\ui-tests-app\image-view\roundimg.xml" />
-    <Content Include="apps\ui-tests-app\layouts\absolute.xml" />
-    <Content Include="apps\ui-tests-app\layouts\dock.xml" />
-    <Content Include="apps\ui-tests-app\layouts\grid.xml" />
-    <Content Include="apps\ui-tests-app\layouts\stack.xml" />
-    <Content Include="apps\ui-tests-app\layouts\wrap.xml" />
+    <Content Include="apps\ui-tests-app\image-view\rounded-images.css" />
+    <Content Include="apps\ui-tests-app\image-view\rounded-images.xml" />
+    <Content Include="apps\ui-tests-app\layouts\absolute.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="apps\ui-tests-app\layouts\dock.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="apps\ui-tests-app\layouts\grid.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="apps\ui-tests-app\layouts\stack.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="apps\ui-tests-app\layouts\wrap.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\ui-tests-app\css\background.xml" />
-    <Content Include="apps\ui-tests-app\image-view\roundbtn.xml" />
+    <Content Include="apps\ui-tests-app\image-view\rounded-buttons.xml" />
     <Content Include="apps\ui-tests-app\mainPage.xml">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\ui-tests-app\nordic\nordic.xml" />
     <Content Include="apps\ui-tests-app\pages\handlers.xml" />
-    <Content Include="apps\ui-tests-app\pages\htmlview.xml" />
     <Content Include="apps\ui-tests-app\pages\i86.xml" />
     <Content Include="apps\template-blank\app.css" />
     <Content Include="apps\template-hello-world\app.css" />
     <Content Include="apps\template-master-detail\app.css" />
     <Content Include="apps\template-tab-navigation\app.css" />
-    <Content Include="apps\ui-tests-app\modal-view\login-page.xml" />
-    <Content Include="apps\ui-tests-app\modal-view\modalview.xml" />
+    <Content Include="apps\ui-tests-app\modal-view\login-page.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="apps\ui-tests-app\modal-view\modal-view.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\ui-tests-app\image-view\red.png" />
     <Content Include="apps\ui-tests-app\pages\test2.png" />
     <Content Include="apps\ui-tests-app\pages\switchandprogress.xml" />
-    <Content Include="apps\ui-tests-app\pages\textfield.xml" />
-    <Content Include="apps\ui-tests-app\pages\text\text-field.xml" />
-    <Content Include="apps\ui-tests-app\pages\text\text-view.xml" />
-    <Content Include="apps\ui-tests-app\pages\text\label.xml" />
-    <Content Include="apps\ui-tests-app\pages\text\button.xml" />
+    <Content Include="apps\ui-tests-app\text-field\text-field.xml" />
+    <Content Include="apps\ui-tests-app\font\text-field.xml" />
+    <Content Include="apps\ui-tests-app\font\text-view.xml" />
+    <Content Include="apps\ui-tests-app\font\label.xml" />
+    <Content Include="apps\ui-tests-app\font\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\web-view-test.xml" />
diff --git a/apps/ui-tests-app/pages/text/button.ts b/apps/ui-tests-app/font/button.ts
similarity index 100%
rename from apps/ui-tests-app/pages/text/button.ts
rename to apps/ui-tests-app/font/button.ts
diff --git a/apps/ui-tests-app/pages/text/button.xml b/apps/ui-tests-app/font/button.xml
similarity index 100%
rename from apps/ui-tests-app/pages/text/button.xml
rename to apps/ui-tests-app/font/button.xml
diff --git a/apps/ui-tests-app/pages/text/label.ts b/apps/ui-tests-app/font/label.ts
similarity index 100%
rename from apps/ui-tests-app/pages/text/label.ts
rename to apps/ui-tests-app/font/label.ts
diff --git a/apps/ui-tests-app/pages/text/label.xml b/apps/ui-tests-app/font/label.xml
similarity index 100%
rename from apps/ui-tests-app/pages/text/label.xml
rename to apps/ui-tests-app/font/label.xml
diff --git a/apps/ui-tests-app/pages/text/text-field.ts b/apps/ui-tests-app/font/text-field.ts
similarity index 100%
rename from apps/ui-tests-app/pages/text/text-field.ts
rename to apps/ui-tests-app/font/text-field.ts
diff --git a/apps/ui-tests-app/pages/text/text-field.xml b/apps/ui-tests-app/font/text-field.xml
similarity index 100%
rename from apps/ui-tests-app/pages/text/text-field.xml
rename to apps/ui-tests-app/font/text-field.xml
diff --git a/apps/ui-tests-app/pages/text/text-view.ts b/apps/ui-tests-app/font/text-view.ts
similarity index 100%
rename from apps/ui-tests-app/pages/text/text-view.ts
rename to apps/ui-tests-app/font/text-view.ts
diff --git a/apps/ui-tests-app/pages/text/text-view.xml b/apps/ui-tests-app/font/text-view.xml
similarity index 100%
rename from apps/ui-tests-app/pages/text/text-view.xml
rename to apps/ui-tests-app/font/text-view.xml
diff --git a/apps/ui-tests-app/pages/htmlview.ts b/apps/ui-tests-app/html-view/html-view.ts
similarity index 100%
rename from apps/ui-tests-app/pages/htmlview.ts
rename to apps/ui-tests-app/html-view/html-view.ts
diff --git a/apps/ui-tests-app/pages/htmlview.xml b/apps/ui-tests-app/html-view/html-view.xml
similarity index 100%
rename from apps/ui-tests-app/pages/htmlview.xml
rename to apps/ui-tests-app/html-view/html-view.xml
diff --git a/apps/ui-tests-app/image-view/roundbtn.xml b/apps/ui-tests-app/image-view/rounded-buttons.xml
similarity index 100%
rename from apps/ui-tests-app/image-view/roundbtn.xml
rename to apps/ui-tests-app/image-view/rounded-buttons.xml
diff --git a/apps/ui-tests-app/image-view/roundimg.css b/apps/ui-tests-app/image-view/rounded-images.css
similarity index 100%
rename from apps/ui-tests-app/image-view/roundimg.css
rename to apps/ui-tests-app/image-view/rounded-images.css
diff --git a/apps/ui-tests-app/image-view/roundimg.xml b/apps/ui-tests-app/image-view/rounded-images.xml
similarity index 100%
rename from apps/ui-tests-app/image-view/roundimg.xml
rename to apps/ui-tests-app/image-view/rounded-images.xml
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index ea55937cf..864f18b36 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -32,32 +32,28 @@ export function selectExample() {
     }
 }
 
-examples.set("basics", "bindings/basics");
-
 examples.set("actColor", "action-bar/color");
-examples.set("actBG",   "action-bar/background");
+examples.set("actBG", "action-bar/background");
 examples.set("actStyle", "action-bar/all");
 
-examples.set("tabColor", "tab-view/color");
-examples.set("tabBG", "tab-view/background");
-examples.set("tabTabsBG", "tab-view/tabsBackground");
-examples.set("tabSelected", "tab-view/selected");
-examples.set("tabStyle", "tab-view/all");
-
-examples.set("segmentedStyle", "segmented-bar/all");
-
 examples.set("basics", "bindings/basics");
 examples.set("xmlbasics", "bindings/xmlbasics");
 
 examples.set("background", "css/background");
-examples.set("import", "css/import");
 examples.set("radius", "css/radius");
 examples.set("styles", "css/styles");
 
 examples.set("dialogs", "dialogs/dialogs");
-examples.set("view-model", "dialogs/view-model");
 
-examples.set("roundbtn", "image-view/roundbtn");
+examples.set("fontbtn", "font/button");
+examples.set("fontlbl", "font/label");
+examples.set("fontfield", "font/text-field");
+examples.set("fontview", "font/text-view");
+
+examples.set("htmlview", "html-view/html-view");
+
+examples.set("roundbtn", "image-view/rounded-buttons");
+examples.set("roundimg", "image-view/rounded-images");
 
 examples.set("absolute", "layouts/absolute");
 examples.set("dock", "layouts/dock");
@@ -66,28 +62,32 @@ examples.set("myview", "layouts/myview");
 examples.set("stack", "layouts/stack");
 examples.set("wrap", "layouts/wrap");
 
-examples.set("login-page", "modal-view/login-page");
 examples.set("modalview", "modal-view/modalview");
 
 examples.set("nordic", "nordic/nordic");
 
-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");
 examples.set("handlers", "pages/handlers");
-examples.set("htmlview", "pages/htmlview");
 examples.set("i61", "pages/i61");
 examples.set("i73", "pages/i73");
 examples.set("i86", "pages/i86");
 examples.set("listview_binding", "pages/listview_binding");
 
-examples.set("switch", "pages/switchandprogress");
-examples.set("textfield", "pages/textfield");
+
+examples.set("switch", "pages/switchandprogress"); // TODO: Update this test page.
+
+examples.set("segmentedStyle", "segmented-bar/all");
+
+examples.set("tabColor", "tab-view/color");
+examples.set("tabBG", "tab-view/background");
+examples.set("tabTabsBG", "tab-view/tabsBackground");
+examples.set("tabSelected", "tab-view/selected");
+examples.set("tabStyle", "tab-view/all");
+
+examples.set("textfield", "text-field/text-field");
 
 examples.set("webview", "web-view/web-view");
 examples.set("webtest", "web-view/web-vew-test");
diff --git a/apps/ui-tests-app/modal-view/modalview.ts b/apps/ui-tests-app/modal-view/modal-view.ts
similarity index 100%
rename from apps/ui-tests-app/modal-view/modalview.ts
rename to apps/ui-tests-app/modal-view/modal-view.ts
diff --git a/apps/ui-tests-app/modal-view/modalview.xml b/apps/ui-tests-app/modal-view/modal-view.xml
similarity index 100%
rename from apps/ui-tests-app/modal-view/modalview.xml
rename to apps/ui-tests-app/modal-view/modal-view.xml
diff --git a/apps/ui-tests-app/pages/textfield.ts b/apps/ui-tests-app/text-field/text-field.ts
similarity index 100%
rename from apps/ui-tests-app/pages/textfield.ts
rename to apps/ui-tests-app/text-field/text-field.ts
diff --git a/apps/ui-tests-app/pages/textfield.xml b/apps/ui-tests-app/text-field/text-field.xml
similarity index 100%
rename from apps/ui-tests-app/pages/textfield.xml
rename to apps/ui-tests-app/text-field/text-field.xml