diff --git a/apps/app/ui-tests-app/animations/background.ts b/apps/app/ui-tests-app/animations/background.ts
deleted file mode 100644
index 9e53883bf..000000000
--- a/apps/app/ui-tests-app/animations/background.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as observable from "tns-core-modules/data/observable";
-import * as pages from "tns-core-modules/ui/page";
-import * as viewModule from "tns-core-modules/ui/core/view";
-import * as color from "tns-core-modules/color";
-
-var view: viewModule.View;
-
-export function pageLoaded(args: observable.EventData) {
-    var page = <pages.Page>args.object;
-    view = page.getViewById<viewModule.View>("view");
-}
-
-export function onAnimate(args: observable.EventData) {
-    view.backgroundColor = new color.Color("Green");
-    view.animate({
-        backgroundColor: new color.Color("Blue"),
-        duration: 2500
-    });
-}
-
-export function onReset(args: observable.EventData) {
-    view.backgroundColor = new color.Color("White");
-}
diff --git a/apps/app/ui-tests-app/animations/background.xml b/apps/app/ui-tests-app/animations/background.xml
deleted file mode 100644
index 8d1c70e91..000000000
--- a/apps/app/ui-tests-app/animations/background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Page loaded="pageLoaded">
-  <StackLayout>
-    <Button text="Animate" tap="onAnimate"/>
-    <Button text="Reset" tap="onReset"/>
-    <AbsoluteLayout width="300" height="300" clipToBounds="true" backgroundColor="LightGray">
-      <Button id="view" text="{N}" width="100" height="100" left="100" top="100" style.textAlignment="center" backgroundColor="White" style.fontSize="30"/>
-    </AbsoluteLayout>
-  </StackLayout>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml b/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml
new file mode 100644
index 000000000..232aa475e
--- /dev/null
+++ b/apps/app/ui-tests-app/button/btn-wrap-text-alignment-4266.xml
@@ -0,0 +1,13 @@
+<Page>
+    <Page.actionBar>
+        <ActionBar title="{{ exampleName }}">
+            <NavigationButton text="Go Back" android.systemIcon="ic_menu_back"></NavigationButton>
+        </ActionBar>
+    </Page.actionBar>
+    <GridLayout rows="*,*,*,*">
+        <Button text="This a test of a wrapping button [CENTER]" textWrap="true" style="text-align:center;width:100" />
+        <Button row="1" text="This a test of a wrapping button [RIGHT]" textWrap="true" style="text-align:right;width:100" />
+        <Button row="2" text="This a test of a wrapping button [LEFT]" textWrap="true" style="text-align:left;width:100" />
+        <Button row="3" text="&#xf8ff; This a test of a wrapping button [CENTER ICON]" textWrap="true" style="text-align:center;width:100" />
+    </GridLayout>
+</Page> 
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/main-page.ts b/apps/app/ui-tests-app/button/main-page.ts
new file mode 100644
index 000000000..568b553c9
--- /dev/null
+++ b/apps/app/ui-tests-app/button/main-page.ts
@@ -0,0 +1,22 @@
+import { EventData } from "tns-core-modules/data/observable";
+import { MainPageViewModel } from "../mainPage";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
+
+export function pageLoaded(args: EventData) {
+    let page = <Page>args.object;
+    let view = require("ui/core/view");
+    let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples");
+
+    let examples: Map<string, string> = new Map<string, string>();
+    examples.set("btn-wrap-text-alignment-4266", "button/btn-wrap-text-alignment-4266");
+    
+    let viewModel = new SubMainPageViewModel(wrapLayout, examples);
+    page.bindingContext = viewModel;
+}
+
+export class SubMainPageViewModel extends MainPageViewModel {
+    constructor(container: WrapLayout, examples: Map<string, string>) {
+        super(container, examples);
+    }
+}
diff --git a/apps/app/ui-tests-app/pages/main-page.xml b/apps/app/ui-tests-app/button/main-page.xml
similarity index 100%
rename from apps/app/ui-tests-app/pages/main-page.xml
rename to apps/app/ui-tests-app/button/main-page.xml
diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.xml b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
index 56927f6a4..728ca634b 100644
--- a/apps/app/ui-tests-app/css/all-non-uniform-border.xml
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
@@ -9,7 +9,7 @@
         <Slider class="s0" row="2" col="0" minValue="0" maxValue="100" value="50"/>
         <Progress class="s0" row="2" col="1" maxValue="100" value="50"/>
         <ActivityIndicator class="s0" row="2" col="2" busy="false"/>
-        <Image class="s0" row="3" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
+        <Image class="s0" row="3" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
         <ListView class="s0" row="3" col="1" items="ListView"/>
         <HtmlView class="s0" row="3" col="2" html="<h1>HtmlView</h1>"/>
         <WebView class="s0" row="4" col="0" src="~/ui-tests-app/web-view/test.html"/>
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.xml b/apps/app/ui-tests-app/css/all-uniform-border.xml
index 902809803..c5670a4d6 100644
--- a/apps/app/ui-tests-app/css/all-uniform-border.xml
+++ b/apps/app/ui-tests-app/css/all-uniform-border.xml
@@ -9,7 +9,7 @@
         <Slider class="s0" row="2" col="0" minValue="0" maxValue="100" value="50"/>
         <Progress class="s0" row="2" col="1" maxValue="100" value="50"/>
         <ActivityIndicator class="s0" row="2" col="2" busy="false"/>
-        <Image class="s0" row="3" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
+        <Image class="s0" row="3" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
         <ListView class="s0" row="3" col="1" items="ListView"/>
         <HtmlView class="s0" row="3" col="2" html="<h1>HtmlView</h1>"/>
         <WebView class="s0" row="4" col="0" src="~/ui-tests-app/web-view/test.html"/>
diff --git a/apps/app/ui-tests-app/css/border-playground.ts b/apps/app/ui-tests-app/css/border-playground.ts
index 9bad3accb..0b9272cd1 100644
--- a/apps/app/ui-tests-app/css/border-playground.ts
+++ b/apps/app/ui-tests-app/css/border-playground.ts
@@ -31,7 +31,7 @@ export function onToggle(args: EventData){
         debugConsole.text += `> background-color: ${target.backgroundColor}\n`;
     }
     else if (button.text === "BGImage"){
-        target.backgroundImage = target.backgroundImage ? undefined : `~/ui-tests-app/pages/test2.png`; 
+        target.backgroundImage = target.backgroundImage ? undefined : `~/ui-tests-app/resources/images/test2.png`; 
         debugConsole.text += `> background-image: ${target.backgroundImage}\n`;
     }
 
diff --git a/apps/app/ui-tests-app/css/button-border.css b/apps/app/ui-tests-app/css/button-border.css
index c7a843cdc..644d827a6 100644
--- a/apps/app/ui-tests-app/css/button-border.css
+++ b/apps/app/ui-tests-app/css/button-border.css
@@ -66,7 +66,7 @@ Button {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/button-border.xml b/apps/app/ui-tests-app/css/button-border.xml
index a74c7ced4..c84241a34 100644
--- a/apps/app/ui-tests-app/css/button-border.xml
+++ b/apps/app/ui-tests-app/css/button-border.xml
@@ -15,7 +15,7 @@
         <Button id="s12" row="4" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;"/>
         <Button id="s13" row="4" col="1" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;"/>
         <Button id="s14" row="4" col="2" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;"/>
-        <Button id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');"/>
+        <Button id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');"/>
         <Button id="s16" row="5" col="1" textWrap="true" text="border-width: 5; border-color: red; padding: 5;"/>
         <Button id="s17" row="5" col="2" textWrap="true" text="border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;"/>
     </GridLayout>
diff --git a/apps/app/ui-tests-app/css/image-border.css b/apps/app/ui-tests-app/css/image-border.css
index 2316aae92..4c68b8087 100644
--- a/apps/app/ui-tests-app/css/image-border.css
+++ b/apps/app/ui-tests-app/css/image-border.css
@@ -65,7 +65,7 @@ Image {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/image-border.xml b/apps/app/ui-tests-app/css/image-border.xml
index f032972a7..270a61605 100644
--- a/apps/app/ui-tests-app/css/image-border.xml
+++ b/apps/app/ui-tests-app/css/image-border.xml
@@ -1,22 +1,22 @@
 <Page>
     <GridLayout rows="*,*,*,*,*,*" columns="*,*,*">
-        <Image  id="s0" row="0" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s1" row="0" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s2" row="0" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s3" row="1" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s4" row="1" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s5" row="1" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s6" row="2" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s7" row="2" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s8" row="2" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image  id="s9" row="3" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s10" row="3" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s11" row="3" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s12" row="4" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s13" row="4" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s14" row="4" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s15" row="5" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s16" row="5" col="1" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
-        <Image id="s17" row="5" col="2" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
+        <Image  id="s0" row="0" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s1" row="0" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s2" row="0" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s3" row="1" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s4" row="1" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s5" row="1" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s6" row="2" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s7" row="2" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s8" row="2" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image  id="s9" row="3" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s10" row="3" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s11" row="3" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s12" row="4" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s13" row="4" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s14" row="4" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s15" row="5" col="0" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s16" row="5" col="1" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
+        <Image id="s17" row="5" col="2" src="~/ui-tests-app/resources/images/gravatar.png" stretch="fill"/>
     </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/label-background-image.css b/apps/app/ui-tests-app/css/label-background-image.css
index f0eab9e94..8e12a785d 100644
--- a/apps/app/ui-tests-app/css/label-background-image.css
+++ b/apps/app/ui-tests-app/css/label-background-image.css
@@ -1,5 +1,5 @@
 Label {
-    background-image: url('~/ui-tests-app/pages/test2.png');
+    background-image: url('~/ui-tests-app/resources/images/test2.png');
     background-repeat: no-repeat; 
     background-position: left; 
     background-size: contain; 
diff --git a/apps/app/ui-tests-app/css/label-border.css b/apps/app/ui-tests-app/css/label-border.css
index 8ebc80632..625353784 100644
--- a/apps/app/ui-tests-app/css/label-border.css
+++ b/apps/app/ui-tests-app/css/label-border.css
@@ -65,7 +65,7 @@ Label {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/label-border.xml b/apps/app/ui-tests-app/css/label-border.xml
index 5eaf42f60..3a4434532 100644
--- a/apps/app/ui-tests-app/css/label-border.xml
+++ b/apps/app/ui-tests-app/css/label-border.xml
@@ -15,7 +15,7 @@
         <Label id="s12" row="4" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;"/>
         <Label id="s13" row="4" col="1" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;"/>
         <Label id="s14" row="4" col="2" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;"/>
-        <Label id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');"/>
+        <Label id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');"/>
         <Label id="s16" row="5" col="1" textWrap="true" text="border-width: 5; border-color: red; padding: 5;"/>
         <Label id="s17" row="5" col="2" textWrap="true" text="border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;"/>
     </GridLayout>
diff --git a/apps/app/ui-tests-app/css/layout-border.css b/apps/app/ui-tests-app/css/layout-border.css
index 646486cce..ede85216f 100644
--- a/apps/app/ui-tests-app/css/layout-border.css
+++ b/apps/app/ui-tests-app/css/layout-border.css
@@ -68,7 +68,7 @@ Label {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/layout-border.xml b/apps/app/ui-tests-app/css/layout-border.xml
index a901b33e6..f0a625da4 100644
--- a/apps/app/ui-tests-app/css/layout-border.xml
+++ b/apps/app/ui-tests-app/css/layout-border.xml
@@ -15,7 +15,7 @@
         <StackLayout id="s12" row="4" col="0"><Label textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;"/></StackLayout>
         <StackLayout id="s13" row="4" col="1"><Label textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;"/></StackLayout>
         <StackLayout id="s14" row="4" col="2"><Label textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;"/></StackLayout>
-        <StackLayout id="s15" row="5" col="0"><Label textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');"/></StackLayout>
+        <StackLayout id="s15" row="5" col="0"><Label textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');"/></StackLayout>
         <StackLayout id="s16" row="5" col="1"><Label textWrap="true" text="border-width: 5; border-color: red; padding: 5;"/></StackLayout>
         <StackLayout id="s17" row="5" col="2"><Label textWrap="true" text="border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;"/></StackLayout>
     </GridLayout>
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index b5244d8e8..c91b4ae73 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -47,7 +47,6 @@ export function pageLoaded(args: EventData) {
     examples.set("hint-text-color", "css/hint-text-color");
     examples.set("combinators", "css/combinators");
     examples.set("styled-formatted-text", "css/styled-formatted-text");
-    examples.set("secured-text-field", "css/secured-text-field-4135");
 
     let viewModel = new SubMainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/css/measure-tests.xml b/apps/app/ui-tests-app/css/measure-tests.xml
index e922d024c..d831bda3a 100644
--- a/apps/app/ui-tests-app/css/measure-tests.xml
+++ b/apps/app/ui-tests-app/css/measure-tests.xml
@@ -5,12 +5,12 @@
         <Button text="Button" class="c1"/>
         <TextField text="TextField" class="c1"/>
         <TextView text="TextView" class="c1"/>
-        <Image src="~/ui-tests-app/image-view/gravatar2.png" class="c1" stretch="none"/>    
+        <Image src="~/ui-tests-app/resources/images/gravatar2.png" class="c1" stretch="none"/>    
 
         <Label text="Label" class="c2"/>
         <Button text="Button" class="c2"/>
         <TextField text="TextField" class="c2"/>
         <TextView text="TextView" class="c2" style.horizonhorizontalAlignmenttalAligment="left"/>
-        <Image src="~/ui-tests-app/image-view/gravatar2.png" class="c2" stretch="none"/>    
+        <Image src="~/ui-tests-app/resources/images/gravatar2.png" class="c2" stretch="none"/>    
     </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/pixels.xml b/apps/app/ui-tests-app/css/pixels.xml
index 1eabc0660..b2b61157d 100644
--- a/apps/app/ui-tests-app/css/pixels.xml
+++ b/apps/app/ui-tests-app/css/pixels.xml
@@ -7,7 +7,7 @@
       <Button    text="Button"     borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
       <TextView  text="Text View"  borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
       <TextField text="Text Field" borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
-      <Image src="~/ui-tests-app/image-view/gravatar.png" borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
+      <Image src="~/ui-tests-app/resources/images/gravatar.png" borderWidth="1px" borderRadius="10px" borderColor="green" padding="1px" margin="1px" />
     </StackLayout>
 
      <StackLayout borderWidth="2px" borderColor="green" orientation="horizontal" padding="2px">
@@ -35,7 +35,7 @@
       <Button    text="Button"     borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
       <TextView  text="Text View"  borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
       <TextField text="Text Field" borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
-      <Image src="~/ui-tests-app/image-view/gravatar.png" borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
+      <Image src="~/ui-tests-app/resources/images/gravatar.png" borderWidth="1" borderRadius="10" borderColor="green" padding="1" margin="1" />
     </StackLayout>
 
      <StackLayout borderWidth="2" borderColor="green" orientation="horizontal" padding="2">
diff --git a/apps/app/ui-tests-app/css/secured-text-field-4135.xml b/apps/app/ui-tests-app/css/secured-text-field-4135.xml
deleted file mode 100644
index a90e85836..000000000
--- a/apps/app/ui-tests-app/css/secured-text-field-4135.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd">
-    <StackLayout>
-        <TextField secure="true" text="test" hint="hint"></TextField>
-        <TextField secure="true" text="text"></TextField>
-        <TextField secure="true" hint="hint"></TextField>
-    </StackLayout>
-</Page>
diff --git a/apps/app/ui-tests-app/css/text-field-border.css b/apps/app/ui-tests-app/css/text-field-border.css
index e957affbf..aa14a46db 100644
--- a/apps/app/ui-tests-app/css/text-field-border.css
+++ b/apps/app/ui-tests-app/css/text-field-border.css
@@ -65,7 +65,7 @@ TextField {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/text-field-border.xml b/apps/app/ui-tests-app/css/text-field-border.xml
index 22cdf942b..d00d33add 100644
--- a/apps/app/ui-tests-app/css/text-field-border.xml
+++ b/apps/app/ui-tests-app/css/text-field-border.xml
@@ -15,7 +15,7 @@
         <TextField id="s12" row="4" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;"/>
         <TextField id="s13" row="4" col="1" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;"/>
         <TextField id="s14" row="4" col="2" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;"/>
-        <TextField id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');"/>
+        <TextField id="s15" row="5" col="0" textWrap="true" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');"/>
         <TextField id="s16" row="5" col="1" textWrap="true" text="border-width: 5; border-color: red; padding: 5;"/>
         <TextField id="s17" row="5" col="2" textWrap="true" text="border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;"/>
     </GridLayout>
diff --git a/apps/app/ui-tests-app/css/text-view-border.css b/apps/app/ui-tests-app/css/text-view-border.css
index 2a2264909..a2b4c3a93 100644
--- a/apps/app/ui-tests-app/css/text-view-border.css
+++ b/apps/app/ui-tests-app/css/text-view-border.css
@@ -65,7 +65,7 @@ TextView {
 }
 
 #s15 {
-    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
 }
 
 #s16 {
diff --git a/apps/app/ui-tests-app/css/text-view-border.xml b/apps/app/ui-tests-app/css/text-view-border.xml
index 9f17b0bd1..8b3ab0e9f 100644
--- a/apps/app/ui-tests-app/css/text-view-border.xml
+++ b/apps/app/ui-tests-app/css/text-view-border.xml
@@ -15,7 +15,7 @@
         <TextView id="s12" row="4" col="0" textWrap="true" autocorrect="false" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;"/>
         <TextView id="s13" row="4" col="1" textWrap="true" autocorrect="false" text="border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;"/>
         <TextView id="s14" row="4" col="2" textWrap="true" autocorrect="false" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;"/>
-        <TextView id="s15" row="5" col="0" textWrap="true" autocorrect="false" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/pages/test2.png');"/>
+        <TextView id="s15" row="5" col="0" textWrap="true" autocorrect="false" text="border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');"/>
         <TextView id="s16" row="5" col="1" textWrap="true" autocorrect="false" text="border-width: 5; border-color: red; padding: 5;"/>
         <TextView id="s17" row="5" col="2" textWrap="true" autocorrect="false" text="border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;"/>
     </GridLayout>
diff --git a/apps/app/ui-tests-app/css/zindex.xml b/apps/app/ui-tests-app/css/zindex.xml
index af16859be..4c87baf2d 100644
--- a/apps/app/ui-tests-app/css/zindex.xml
+++ b/apps/app/ui-tests-app/css/zindex.xml
@@ -15,7 +15,7 @@
     <AbsoluteLayout style="background-color: brown;" row="1">
       <TextField text="TextField" autocorrect="false" style="height: 60; width: 100; z-index: 999;  background-color: red;" />
       <TextView text="TextView" autocorrect="false" left="10" top="30" style="height: 70; width: 100; padding-top:40; z-index:1; background-color: yellow;"/>
-      <Image src="~/ui-tests-app/image-view/gravatar.png" left="30" top="70" style="height: 60; width: 100; z-index:0; background-color: blue;"/>
+      <Image src="~/ui-tests-app/resources/images/gravatar.png" left="30" top="70" style="height: 60; width: 100; z-index:0; background-color: blue;"/>
       <TimePicker hour="5" minute="30" minHour="3" maxHour="7" top="90" style="z-index:-1; background-color: orange; width: auto;"/>
     </AbsoluteLayout>
     <AbsoluteLayout row="1" col="1" style="background-color: red;">
diff --git a/apps/app/ui-tests-app/pages/console.ts b/apps/app/ui-tests-app/events/console.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/console.ts
rename to apps/app/ui-tests-app/events/console.ts
diff --git a/apps/app/ui-tests-app/pages/gestures.ts b/apps/app/ui-tests-app/events/gestures.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/gestures.ts
rename to apps/app/ui-tests-app/events/gestures.ts
diff --git a/apps/app/ui-tests-app/pages/handlers.ts b/apps/app/ui-tests-app/events/handlers.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/handlers.ts
rename to apps/app/ui-tests-app/events/handlers.ts
diff --git a/apps/app/ui-tests-app/pages/handlers.xml b/apps/app/ui-tests-app/events/handlers.xml
similarity index 100%
rename from apps/app/ui-tests-app/pages/handlers.xml
rename to apps/app/ui-tests-app/events/handlers.xml
diff --git a/apps/app/ui-tests-app/pages/i61.ts b/apps/app/ui-tests-app/events/i61.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/i61.ts
rename to apps/app/ui-tests-app/events/i61.ts
diff --git a/apps/app/ui-tests-app/pages/i73.ts b/apps/app/ui-tests-app/events/i73.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/i73.ts
rename to apps/app/ui-tests-app/events/i73.ts
diff --git a/apps/app/ui-tests-app/pages/i86.xml b/apps/app/ui-tests-app/events/i86.xml
similarity index 100%
rename from apps/app/ui-tests-app/pages/i86.xml
rename to apps/app/ui-tests-app/events/i86.xml
diff --git a/apps/app/ui-tests-app/pages/listview_binding.ts b/apps/app/ui-tests-app/events/listview_binding.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/listview_binding.ts
rename to apps/app/ui-tests-app/events/listview_binding.ts
diff --git a/apps/app/ui-tests-app/pages/main-page.ts b/apps/app/ui-tests-app/events/main-page.ts
similarity index 69%
rename from apps/app/ui-tests-app/pages/main-page.ts
rename to apps/app/ui-tests-app/events/main-page.ts
index 75cce9a6d..06a6523f5 100644
--- a/apps/app/ui-tests-app/pages/main-page.ts
+++ b/apps/app/ui-tests-app/events/main-page.ts
@@ -11,16 +11,17 @@ export function pageLoaded(args: EventData) {
 
     let examples: Map<string, string> = new Map<string, string>();
 
-    examples.set("gestures", "pages/gestures");
-    examples.set("touch", "pages/touch-event");
-    examples.set("pan", "pages/pan-event");
-    examples.set("handlers", "pages/handlers");
-    examples.set("console", "pages/console");
-    examples.set("i61", "pages/i61");
-    examples.set("i73", "pages/i73");
-    examples.set("i86", "pages/i86");
+    examples.set("gestures", "gestures");
+    examples.set("touch", "touch-event");
+    examples.set("pan", "pan-event");
+    examples.set("handlers", "handlers");
+    examples.set("console", "console");
+    examples.set("i61", "i61");
+    examples.set("i73", "i73");
+    examples.set("i86", "i86");
 
     let viewModel = new SubMainPageViewModel(wrapLayout, examples);
+    viewModel.basePath="events";
     page.bindingContext = viewModel;
 }
 
diff --git a/apps/app/ui-tests-app/events/main-page.xml b/apps/app/ui-tests-app/events/main-page.xml
new file mode 100644
index 000000000..33306f0d0
--- /dev/null
+++ b/apps/app/ui-tests-app/events/main-page.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page loaded="pageLoaded">
+    <ScrollView orientation="vertical" row="1">
+        <WrapLayout id="wrapLayoutWithExamples"/>
+    </ScrollView>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/pages/pan-event.ts b/apps/app/ui-tests-app/events/pan-event.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/pan-event.ts
rename to apps/app/ui-tests-app/events/pan-event.ts
diff --git a/apps/app/ui-tests-app/pages/pan-event.xml b/apps/app/ui-tests-app/events/pan-event.xml
similarity index 100%
rename from apps/app/ui-tests-app/pages/pan-event.xml
rename to apps/app/ui-tests-app/events/pan-event.xml
diff --git a/apps/app/ui-tests-app/pages/touch-event.ts b/apps/app/ui-tests-app/events/touch-event.ts
similarity index 100%
rename from apps/app/ui-tests-app/pages/touch-event.ts
rename to apps/app/ui-tests-app/events/touch-event.ts
diff --git a/apps/app/ui-tests-app/pages/touch-event.xml b/apps/app/ui-tests-app/events/touch-event.xml
similarity index 100%
rename from apps/app/ui-tests-app/pages/touch-event.xml
rename to apps/app/ui-tests-app/events/touch-event.xml
diff --git a/apps/app/ui-tests-app/flexbox/flexbox-4143.css b/apps/app/ui-tests-app/flexbox/flexbox-4143.css
index 15459c932..f27faf0db 100644
--- a/apps/app/ui-tests-app/flexbox/flexbox-4143.css
+++ b/apps/app/ui-tests-app/flexbox/flexbox-4143.css
@@ -1,5 +1,5 @@
 .bg-background {
-    background-image: url("~/ui-tests-app/image-view/gravatar.png");
+    background-image: url("~/ui-tests-app/resources/images/gravatar.png");
     background-position: center;
     background-repeat: no-repeat;
     background-size: cover;
diff --git a/apps/app/ui-tests-app/font/issue-3654-2.ts b/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts
similarity index 100%
rename from apps/app/ui-tests-app/font/issue-3654-2.ts
rename to apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts
diff --git a/apps/app/ui-tests-app/font/issue-3654-2.xml b/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.xml
similarity index 100%
rename from apps/app/ui-tests-app/font/issue-3654-2.xml
rename to apps/app/ui-tests-app/font/font-awesome/issue-3654-2.xml
diff --git a/apps/app/ui-tests-app/font/issue-3654.css b/apps/app/ui-tests-app/font/font-awesome/issue-3654.css
similarity index 100%
rename from apps/app/ui-tests-app/font/issue-3654.css
rename to apps/app/ui-tests-app/font/font-awesome/issue-3654.css
diff --git a/apps/app/ui-tests-app/font/issue-3654.ts b/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
similarity index 53%
rename from apps/app/ui-tests-app/font/issue-3654.ts
rename to apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
index 3b8394ea4..2f46ce44a 100644
--- a/apps/app/ui-tests-app/font/issue-3654.ts
+++ b/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
@@ -1,5 +1,5 @@
 import { topmost } from "tns-core-modules/ui/frame";
 
 export function onTap(){
-    topmost().navigate("ui-tests-app/font/issue-3654-2");
+    topmost().navigate("ui-tests-app/font/font-awesome/issue-3654-2");
 }
diff --git a/apps/app/ui-tests-app/font/issue-3654.xml b/apps/app/ui-tests-app/font/font-awesome/issue-3654.xml
similarity index 100%
rename from apps/app/ui-tests-app/font/issue-3654.xml
rename to apps/app/ui-tests-app/font/font-awesome/issue-3654.xml
diff --git a/apps/app/ui-tests-app/font/main-page.ts b/apps/app/ui-tests-app/font/main-page.ts
index cbf0c277c..320cb926a 100644
--- a/apps/app/ui-tests-app/font/main-page.ts
+++ b/apps/app/ui-tests-app/font/main-page.ts
@@ -15,10 +15,10 @@ export function pageLoaded(args: EventData) {
     examples.set("fontlbl", "font/label");
     examples.set("fontfield", "font/text-field");
     examples.set("fontview", "font/text-view");
-    examples.set("nordic", "nordic/nordic");
+    examples.set("nordic", "/font/nordic/nordic");
     examples.set("customfonts", "font/custom-fonts");
     examples.set("all-fonts", "font/all-fonts");
-    examples.set("awesome-3654", "font/issue-3654");
+    examples.set("awesome-3654", "font/font-awesome/issue-3654");
     
     let viewModel = new SubMainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/apps/app/ui-tests-app/nordic/nordic.ts b/apps/app/ui-tests-app/font/nordic/nordic.ts
similarity index 100%
rename from apps/app/ui-tests-app/nordic/nordic.ts
rename to apps/app/ui-tests-app/font/nordic/nordic.ts
diff --git a/apps/app/ui-tests-app/nordic/nordic.xml b/apps/app/ui-tests-app/font/nordic/nordic.xml
similarity index 100%
rename from apps/app/ui-tests-app/nordic/nordic.xml
rename to apps/app/ui-tests-app/font/nordic/nordic.xml
diff --git a/apps/app/ui-tests-app/image-view/rounded-buttons.xml b/apps/app/ui-tests-app/image-view/rounded-buttons.xml
index b6b249ff8..64ba6f3c0 100644
--- a/apps/app/ui-tests-app/image-view/rounded-buttons.xml
+++ b/apps/app/ui-tests-app/image-view/rounded-buttons.xml
@@ -1,6 +1,6 @@
 <Page>
   <StackLayout>
     <Button text="ButtonCircle" style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:red;background-color:blue" />
-    <Button text="ButtonImage"  style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:blue;background-image:url('~/ui-tests-app/image-view/red.png')" />
+    <Button text="ButtonImage"  style="width:200;height:200;color:white;border-radius:100;border-width:2;border-color:blue;background-image:url('~/ui-tests-app/resources/images/red.png')" />
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/image-view/rounded-images.css b/apps/app/ui-tests-app/image-view/rounded-images.css
index b2d10d244..afa245083 100644
--- a/apps/app/ui-tests-app/image-view/rounded-images.css
+++ b/apps/app/ui-tests-app/image-view/rounded-images.css
@@ -57,5 +57,5 @@ style {
     border-width: 2;
     border-color: blue;
     border-radius: 100;
-    background-image: url('~/ui-tests-app/pages/red.png');
+    background-image: url('~/ui-tests-app/resources/images/red.png');
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/image-view/rounded-images.xml b/apps/app/ui-tests-app/image-view/rounded-images.xml
index 6d64caa2f..d1cab324a 100644
--- a/apps/app/ui-tests-app/image-view/rounded-images.xml
+++ b/apps/app/ui-tests-app/image-view/rounded-images.xml
@@ -1,10 +1,10 @@
 <Page>
   <GridLayout rows="*,*,*" columns="*,*">
-    <Image row="0" col="0" src="~/ui-tests-app/image-view/gravatar.png" class="one"/>
-    <Image row="0" col="1" src="~/ui-tests-app/image-view/gravatar.png" class="two"/>
-    <Image row="1" col="0" src="~/ui-tests-app/image-view/gravatar.png" class="three"/>
-    <Image row="1" col="1" src="~/ui-tests-app/image-view/gravatar.png" class="four"/>
-    <Image row="2" col="0" src="~/ui-tests-app/image-view/gravatar.png" class="five"/>
-    <Image row="2" col="1" src="~/ui-tests-app/image-view/gravatar.png" class="six"/>
+    <Image row="0" col="0" src="~/ui-tests-app/resources/images/gravatar.png" class="one"/>
+    <Image row="0" col="1" src="~/ui-tests-app/resources/images/gravatar.png" class="two"/>
+    <Image row="1" col="0" src="~/ui-tests-app/resources/images/gravatar.png" class="three"/>
+    <Image row="1" col="1" src="~/ui-tests-app/resources/images/gravatar.png" class="four"/>
+    <Image row="2" col="0" src="~/ui-tests-app/resources/images/gravatar.png" class="five"/>
+    <Image row="2" col="1" src="~/ui-tests-app/resources/images/gravatar.png" class="six"/>
   </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/issue-2674.xml b/apps/app/ui-tests-app/issues/issue-2674.xml
index 4afc3055e..ed949bd03 100644
--- a/apps/app/ui-tests-app/issues/issue-2674.xml
+++ b/apps/app/ui-tests-app/issues/issue-2674.xml
@@ -1,5 +1,5 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd">
   <StackLayout style="color: white">
-    <Image src="~/ui-tests-app/image-view/gravatar.png" stretch="aspectFill"/>
+    <Image src="~/ui-tests-app/resources/images/gravatar.png" stretch="aspectFill"/>
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/issue-2911.css b/apps/app/ui-tests-app/issues/issue-2911.css
index 39c96ff20..11cf7a2c2 100644
--- a/apps/app/ui-tests-app/issues/issue-2911.css
+++ b/apps/app/ui-tests-app/issues/issue-2911.css
@@ -1,6 +1,6 @@
 Button {
     background-color: red;
-    background-image: url('~/ui-tests-app/image-view/gravatar2.png');
+    background-image: url('~/ui-tests-app/resources/images/gravatar2.png');
     background-position: center;
     background-size: 50% 50%;
     background-repeat: no-repeat;
diff --git a/apps/app/ui-tests-app/issues/issue-3007.xml b/apps/app/ui-tests-app/issues/issue-3007.xml
index dde6cb545..d72a19b93 100644
--- a/apps/app/ui-tests-app/issues/issue-3007.xml
+++ b/apps/app/ui-tests-app/issues/issue-3007.xml
@@ -1,7 +1,7 @@
 <Page id="Page" xmlns="http://schemas.nativescript.org/tns.xsd">
 <ScrollView height="auto">
   <StackLayout id="StackLayout">
-    <Image id="Image" width="100" height="100" class="elementStyle" src="~/ui-tests-app/image-view/gravatar.png"/>
+    <Image id="Image" width="100" height="100" class="elementStyle" src="~/ui-tests-app/resources/images/gravatar.png"/>
     <Button id="Button" backgroundColor="blue" class="elementStyle" text="TAP"  />
     <Label id="Label" backgroundColor="red" class="elementStyle" text="sample label" textWrap="true"/>
     <TextField id="TextField" backgroundColor="green" class="elementStyle" hint="" text="Sample textfield" />
diff --git a/apps/app/ui-tests-app/mainPage.ts b/apps/app/ui-tests-app/mainPage.ts
index 4ad37c37f..fe6630738 100644
--- a/apps/app/ui-tests-app/mainPage.ts
+++ b/apps/app/ui-tests-app/mainPage.ts
@@ -21,7 +21,7 @@ export function pageLoaded(args: EventData) {
     examples.set("image-view", "image-view/main-page");
     examples.set("tab-view", "tab-view/main-page");
     examples.set("layouts", "layouts/main-page");
-    examples.set("pages-events", "pages/main-page");
+    examples.set("events", "events/main-page");
     examples.set("webview", "web-view/main-page");
     examples.set("flexbox", "flexbox/flexbox-main-page");
 
@@ -29,8 +29,6 @@ export function pageLoaded(args: EventData) {
     examples.set("dialogs", "dialogs/dialogs");
     examples.set("htmlview", "html-view/html-view");
     examples.set("timePicker", "time-picker/time-picker");
-    examples.set("animeBG", "animations/background");
-    examples.set("transitions", "transitions/page0");
     examples.set("segStyle", "segmented-bar/all");
     examples.set("list-view", "list-view/main-page");
     examples.set("issues", "issues/main-page");
@@ -40,7 +38,9 @@ export function pageLoaded(args: EventData) {
     examples.set("list-picker", "list-picker/main-page");
 
     examples.set("listview_binding", "pages/listview_binding");
-    examples.set("textfield", "text-field/text-field");
+    examples.set("textfield", "text-field/main-page");
+    examples.set("button","button/main-page");
+    examples.set("perf","perf/main-page");
 
     let viewModel = new MainPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
@@ -57,9 +57,9 @@ export function pageLoaded(args: EventData) {
 
 export class MainPageViewModel extends observable.Observable {
     private _exampleName: string;
-    private basePath: string = "";
     private colors = ["#ff0000", "#0000cc", "#33cc33", "#33cc33"];
 
+    public basePath: string = "";
     public examples: Map<string, string> = new Map<string, string>();
 
     constructor(private panel: WrapLayout, private _examples: Map<string, string>) {
@@ -92,8 +92,13 @@ export class MainPageViewModel extends observable.Observable {
 
     public loadExmaple() {
         let selectedExample = this.exampleName.toLocaleLowerCase().trim();
+        this.exampleName = selectedExample;
         if (selectedExample.indexOf("/") > 0) {
-            frame.topmost().navigate("ui-tests-app/" + selectedExample);
+            try {
+                rame.topmost().navigate("ui-tests-app/" + selectedExample);                
+            } catch (error) {
+                dialogs.alert("Cannot find example: " + selectedExample);
+            }
         } else {
             this.selectExample(this.exampleName.toLocaleLowerCase());
         }
@@ -107,7 +112,7 @@ export class MainPageViewModel extends observable.Observable {
         console.log(" EXAMPLE: " + selectedExample);
 
         if (this.examples.has(selectedExample)) {
-            frame.topmost().navigate("ui-tests-app/" + this.basePath + this.examples.get(selectedExample));
+            frame.topmost().navigate("ui-tests-app/" + this.basePath + "/"+ this.examples.get(selectedExample));
         }
         else {
             dialogs.alert("Cannot find example: " + selectedExample);
diff --git a/apps/app/ui-tests-app/mainPage.xml b/apps/app/ui-tests-app/mainPage.xml
index add4260f2..6cb344bba 100644
--- a/apps/app/ui-tests-app/mainPage.xml
+++ b/apps/app/ui-tests-app/mainPage.xml
@@ -2,11 +2,11 @@
 <Page loaded="pageLoaded">
   <GridLayout rows="auto, *">
     <StackLayout id="parentLayout">
-      <TextView automationText="tv" id="textView" text="{{ exampleName }}"/>
-      <Button automationText="Run" id="btnRun" text="Run" tap="{{ loadExmaple }}"/>
+      <TextView automationText="tv" id="textView" text="{{ exampleName }}" />
+      <Button automationText="Run" id="btnRun" text="Run" tap="{{ loadExmaple }}" />
     </StackLayout>
     <ScrollView row="1">
       <WrapLayout id="wrapLayoutWithExamples"/>
     </ScrollView>
   </GridLayout>
-</Page>
\ No newline at end of file
+</Page> 
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/perf/memory-leaks/background-image.css b/apps/app/ui-tests-app/perf/memory-leaks/background-image.css
index 0f4448e48..1c468e608 100644
--- a/apps/app/ui-tests-app/perf/memory-leaks/background-image.css
+++ b/apps/app/ui-tests-app/perf/memory-leaks/background-image.css
@@ -1,14 +1,6 @@
-/*.bg-main-page{
-    background-image: url('~/ui-tests-app/image-view/gravatar.png');
-}*/
-
-/*.image {
-width:100;
-height:100;
- background-image: url('~/ui-tests-app/image-view/gravatar.png');
-clip-path: polygon(50% 0%, 100% 38%, 82% 100%, 18% 100%, 0% 38%);
-}*/
-
+.bg-main-page{
+    background-image: url('~/ui-tests-app/resources/images/gravatar.png');
+}
 
 .info {
     font-size: 20;
diff --git a/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts b/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
index 6e9de08c8..dde442dbc 100644
--- a/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
+++ b/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
@@ -11,7 +11,7 @@ var images = ["gravatar", "gravatar2", "red"];
 export function onLoad(args: EventData) {
     let index = indexCounter++ % 3;
     let page = <Page>args.object;
-    page.backgroundImage = '~/ui-tests-app/image-view/' + images[index] + '.png';
+    page.backgroundImage = '~/ui-tests-app/resources/images/' + images[index] + '.png';
     setLabelText(page, navCounter, "countInfo");
     getMemoryUsage(args);
 }
diff --git a/apps/app/ui-tests-app/fonts/FontAwesome.ttf b/apps/app/ui-tests-app/resources/fonts/FontAwesome.ttf
similarity index 100%
rename from apps/app/ui-tests-app/fonts/FontAwesome.ttf
rename to apps/app/ui-tests-app/resources/fonts/FontAwesome.ttf
diff --git a/apps/app/ui-tests-app/fonts/Pacifico.ttf b/apps/app/ui-tests-app/resources/fonts/Pacifico.ttf
similarity index 100%
rename from apps/app/ui-tests-app/fonts/Pacifico.ttf
rename to apps/app/ui-tests-app/resources/fonts/Pacifico.ttf
diff --git a/apps/app/ui-tests-app/fonts/Sofia.otf b/apps/app/ui-tests-app/resources/fonts/Sofia.otf
similarity index 100%
rename from apps/app/ui-tests-app/fonts/Sofia.otf
rename to apps/app/ui-tests-app/resources/fonts/Sofia.otf
diff --git a/apps/app/ui-tests-app/resources/add_to_fav.png b/apps/app/ui-tests-app/resources/images/add_to_fav.png
similarity index 100%
rename from apps/app/ui-tests-app/resources/add_to_fav.png
rename to apps/app/ui-tests-app/resources/images/add_to_fav.png
diff --git a/apps/app/ui-tests-app/resources/add_to_fav@2x.png b/apps/app/ui-tests-app/resources/images/add_to_fav@2x.png
similarity index 100%
rename from apps/app/ui-tests-app/resources/add_to_fav@2x.png
rename to apps/app/ui-tests-app/resources/images/add_to_fav@2x.png
diff --git a/apps/app/ui-tests-app/resources/add_to_fav@3x.png b/apps/app/ui-tests-app/resources/images/add_to_fav@3x.png
similarity index 100%
rename from apps/app/ui-tests-app/resources/add_to_fav@3x.png
rename to apps/app/ui-tests-app/resources/images/add_to_fav@3x.png
diff --git a/apps/app/ui-tests-app/image-view/gravatar.png b/apps/app/ui-tests-app/resources/images/gravatar.png
similarity index 100%
rename from apps/app/ui-tests-app/image-view/gravatar.png
rename to apps/app/ui-tests-app/resources/images/gravatar.png
diff --git a/apps/app/ui-tests-app/image-view/gravatar2.png b/apps/app/ui-tests-app/resources/images/gravatar2.png
similarity index 100%
rename from apps/app/ui-tests-app/image-view/gravatar2.png
rename to apps/app/ui-tests-app/resources/images/gravatar2.png
diff --git a/apps/app/ui-tests-app/resources/icon.png b/apps/app/ui-tests-app/resources/images/icon.png
similarity index 100%
rename from apps/app/ui-tests-app/resources/icon.png
rename to apps/app/ui-tests-app/resources/images/icon.png
diff --git a/apps/app/ui-tests-app/image-view/red.png b/apps/app/ui-tests-app/resources/images/red.png
similarity index 100%
rename from apps/app/ui-tests-app/image-view/red.png
rename to apps/app/ui-tests-app/resources/images/red.png
diff --git a/apps/app/ui-tests-app/pages/test2.png b/apps/app/ui-tests-app/resources/images/test2.png
similarity index 100%
rename from apps/app/ui-tests-app/pages/test2.png
rename to apps/app/ui-tests-app/resources/images/test2.png
diff --git a/apps/app/ui-tests-app/resources/testlogo.jpg b/apps/app/ui-tests-app/resources/images/testlogo.jpg
similarity index 100%
rename from apps/app/ui-tests-app/resources/testlogo.jpg
rename to apps/app/ui-tests-app/resources/images/testlogo.jpg
diff --git a/apps/app/ui-tests-app/text-field/main-page.ts b/apps/app/ui-tests-app/text-field/main-page.ts
new file mode 100644
index 000000000..90cc9a83a
--- /dev/null
+++ b/apps/app/ui-tests-app/text-field/main-page.ts
@@ -0,0 +1,23 @@
+import { EventData } from "tns-core-modules/data/observable";
+import { MainPageViewModel } from "../mainPage";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { Page } from "tns-core-modules/ui/page";
+
+export function pageLoaded(args: EventData) {
+    let page = <Page>args.object;
+    let view = require("ui/core/view");
+
+    let wrapLayout = view.getViewById(page, "wrapLayoutWithExamples");
+
+    let examples: Map<string, string> = new Map<string, string>();
+    examples.set("secured-text-field", "text-field/secured-text-field-4135");
+
+    let viewModel = new SubMainPageViewModel(wrapLayout, examples);
+    page.bindingContext = viewModel;
+}
+
+export class SubMainPageViewModel extends MainPageViewModel {
+    constructor(container: WrapLayout, examples: Map<string, string>) {
+        super(container, examples);
+    }
+}
diff --git a/apps/app/ui-tests-app/text-field/main-page.xml b/apps/app/ui-tests-app/text-field/main-page.xml
new file mode 100644
index 000000000..33306f0d0
--- /dev/null
+++ b/apps/app/ui-tests-app/text-field/main-page.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Page loaded="pageLoaded">
+    <ScrollView orientation="vertical" row="1">
+        <WrapLayout id="wrapLayoutWithExamples"/>
+    </ScrollView>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/text-field.ts b/apps/app/ui-tests-app/text-field/secured-text-field-4135.ts
similarity index 100%
rename from apps/app/ui-tests-app/text-field/text-field.ts
rename to apps/app/ui-tests-app/text-field/secured-text-field-4135.ts
diff --git a/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml b/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml
new file mode 100644
index 000000000..c05e2d810
--- /dev/null
+++ b/apps/app/ui-tests-app/text-field/secured-text-field-4135.xml
@@ -0,0 +1,11 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded">
+    <StackLayout>
+        <Label text="hint" />
+        <TextField secure="true" text="test" hint="hint"></TextField>
+        <TextField secure="true" text="text"></TextField>
+        <TextField secure="true" hint="hint"></TextField>
+        <Label text="bindings" />
+        <TextField id="textField" automationText="textField" text="{{ textProperty }}" />
+        <TextField id="textFieldSecured" automationText="textFieldSecured" text="{{ textProperty }}" />
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/text-field.xml b/apps/app/ui-tests-app/text-field/text-field.xml
deleted file mode 100644
index 9712cea84..000000000
--- a/apps/app/ui-tests-app/text-field/text-field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Page loaded="pageLoaded">
-  <StackLayout orientation="vertical">
-    <TextField id="textField" automationText="textField" text="{{ textProperty }}" />
-    <TextField id="textFieldSecured" automationText="textFieldSecured" text="{{ textProperty }}" />
-  </StackLayout>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/transitions/page0.ts b/apps/app/ui-tests-app/transitions/page0.ts
deleted file mode 100644
index 90e1acf18..000000000
--- a/apps/app/ui-tests-app/transitions/page0.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as frame from "tns-core-modules/ui/frame";
-
-export function onTap(args) {
-    var navigationEntry = {
-        moduleName: "ui-tests-app/transitions/page1",
-        animated: true,
-        transition: {
-            name: args.object.tag,
-            duration: 380,
-            curve: "easeIn"
-        }
-    };
-    frame.topmost().navigate(navigationEntry);
-}
diff --git a/apps/app/ui-tests-app/transitions/page0.xml b/apps/app/ui-tests-app/transitions/page0.xml
deleted file mode 100644
index d841c348e..000000000
--- a/apps/app/ui-tests-app/transitions/page0.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Page loaded="pageLoaded" backgroundColor="LightGreen" >
-  <ScrollView>
-    <StackLayout style.textAlignment="center">
-
-      <Label text="iOS" automationText="iOS" />
-      <Button text="curl" tap="onTap" tag="curl" automationText="curl" />
-      <Button text="curlUp" tap="onTap" tag="curlUp" automationText="curlUp" />
-      <Button text="curlDown" tap="onTap" tag="curlDown" automationText="curlDown" />
-
-      <Label text="Android" automationText="Android" />
-      <Button text="explode" tap="onTap" tag="explode" automationText="explode" />
-
-      <Label text="Cross" automationText="Cross" />
-      <Button text="fade" tap="onTap" tag="fade" automationText="fade" />
-      <Button text="flip" tap="onTap" tag="flip" automationText="flip"/>
-      <Button text="flipRight" tap="onTap" tag="flipRight" automationText="flipRight" />
-      <Button text="flipLeft" tap="onTap" tag="flipLeft" automationText="flipLeft"/>
-
-      <Button text="slide" tap="onTap" tag="slide" automationText="slide" />
-      <Button text="slideLeft" tap="onTap" tag="slideLeft" automationText="slideLeft" />
-      <Button text="slideRight" tap="onTap" tag="slideRight" automationText="slideRight" />
-      <Button text="slideTop" tap="onTap" tag="slideTop" automationText="slideTop"/>
-      <Button text="slideBottom" tap="onTap" tag="slideBottom" automationText="slideBottom"/>
-    </StackLayout>
-  </ScrollView>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/transitions/page1.ts b/apps/app/ui-tests-app/transitions/page1.ts
deleted file mode 100644
index 97ca95d5d..000000000
--- a/apps/app/ui-tests-app/transitions/page1.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as frame from "tns-core-modules/ui/frame";
-
-export function onTap(args) {
-    var navigationEntry = {
-        moduleName: "ui-tests-app/transitions/page0",
-        animated: true,
-        transition: {
-            name: args.object.tag,
-            duration: 380,
-            curve: "easeIn"
-        }
-    };
-    frame.topmost().navigate(navigationEntry);
-}
diff --git a/apps/app/ui-tests-app/transitions/page1.xml b/apps/app/ui-tests-app/transitions/page1.xml
deleted file mode 100644
index c91e794dc..000000000
--- a/apps/app/ui-tests-app/transitions/page1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Page loaded="pageLoaded" backgroundColor="LightBlue" >
-  <ScrollView>
-    <StackLayout style.textAlignment="center">
-
-      <Label text="iOS" automationText="iOS" />
-      <Button text="curl" tap="onTap" tag="curl" automationText="curl" />
-      <Button text="curlUp" tap="onTap" tag="curlUp" automationText="curlUp" />
-      <Button text="curlDown" tap="onTap" tag="curlDown" automationText="curlDown" />
-
-      <Label text="Android" automationText="Android" />
-      <Button text="explode" tap="onTap" tag="explode" automationText="explode" />
-
-      <Label text="Cross" automationText="Cross" />
-      <Button text="fade" tap="onTap" tag="fade" automationText="fade" />
-      <Button text="flip" tap="onTap" tag="flip" automationText="flip"/>
-      <Button text="flipRight" tap="onTap" tag="flipRight" automationText="flipRight" />
-      <Button text="flipLeft" tap="onTap" tag="flipLeft" automationText="flipLeft"/>
-
-      <Button text="slide" tap="onTap" tag="slide" automationText="slide" />
-      <Button text="slideLeft" tap="onTap" tag="slideLeft" automationText="slideLeft" />
-      <Button text="slideRight" tap="onTap" tag="slideRight" automationText="slideRight" />
-      <Button text="slideTop" tap="onTap" tag="slideTop" automationText="slideTop"/>
-      <Button text="slideBottom" tap="onTap" tag="slideBottom" automationText="slideBottom"/>
-    </StackLayout>
-  </ScrollView>
-</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/web-view/web-view-test.xml b/apps/app/ui-tests-app/web-view/web-view-test.xml
index 954ddcf4c..13e0e1586 100644
--- a/apps/app/ui-tests-app/web-view/web-view-test.xml
+++ b/apps/app/ui-tests-app/web-view/web-view-test.xml
@@ -3,7 +3,7 @@
   
     <!-- WebView: local and string -->
     <WebView src="~/ui-tests-app/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" />
+    <WebView src="&lt;html&gt;&lt;body&gt;&lt;img src='./ui-tests-app/resources/images/test2.png'&gt;&lt;/img&gt;&lt;/body&gt;&lt;/html&gt;" height="75" />
     
     <!-- Resources: png and jpg -->
     <WrapLayout>