From f7c62c085ef9b079214c9c1a31874face3cb3967 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Sat, 21 Mar 2015 16:51:21 +0200
Subject: [PATCH 01/24] Fix cuteness application

---
 apps/cuteness.io/app.ts       | 2 +-
 apps/cuteness.io/main-page.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/cuteness.io/app.ts b/apps/cuteness.io/app.ts
index 643df21ff..cf98170d1 100644
--- a/apps/cuteness.io/app.ts
+++ b/apps/cuteness.io/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
 
 // Set the start module for the application
-application.mainModule = "app/main-page";
+application.mainModule = "/main-page";
 
 // Start the application
 application.start();
diff --git a/apps/cuteness.io/main-page.ts b/apps/cuteness.io/main-page.ts
index b0dd9e7e0..ea33764a7 100644
--- a/apps/cuteness.io/main-page.ts
+++ b/apps/cuteness.io/main-page.ts
@@ -23,7 +23,7 @@ export function pageLoaded(args: observable.EventData) {
 export function listViewItemTap(args: listView.ItemEventData) {
     // Navigate to the details page with context set to the data item for specified index
     frames.topmost().navigate({
-        moduleName: "app/details-page",
+        moduleName: "./details-page",
         context: appViewModel.redditItems.getItem(args.index)
     });
 }

From 9be733a7fa8c37ae364c2ea4154c2ba3548cecc7 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Mon, 23 Mar 2015 17:36:37 +0200
Subject: [PATCH 02/24] Do not use starting slash when setting the main module

---
 apps/cuteness.io/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cuteness.io/app.ts b/apps/cuteness.io/app.ts
index cf98170d1..c55cfec5e 100644
--- a/apps/cuteness.io/app.ts
+++ b/apps/cuteness.io/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
 
 // Set the start module for the application
-application.mainModule = "/main-page";
+application.mainModule = "main-page";
 
 // Start the application
 application.start();

From b13b57f3a8fe7b866111a2ad8a52aaf4954a95b8 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 11:10:12 +0200
Subject: [PATCH 03/24] Fix cuteness images

---
 apps/cuteness.io/main-page.xml             | 4 ++--
 apps/cuteness.io/reddit-app-view-model.ts  | 6 +++---
 apps/cuteness.io/reddit-item-view-model.ts | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/cuteness.io/main-page.xml b/apps/cuteness.io/main-page.xml
index fb62c1a50..311245c70 100644
--- a/apps/cuteness.io/main-page.xml
+++ b/apps/cuteness.io/main-page.xml
@@ -20,11 +20,11 @@
       <TabViewItem title="About">
         <TabViewItem.view>
           <StackLayout>
-            <Image margin="10" src="~/app/res/telerik-logo.png" />
+            <Image margin="10" src="~/res/telerik-logo.png" />
             <Label margin="10" textWrap="true" text="{{ aboutText }}" />
           </StackLayout>
         </TabViewItem.view>
       </TabViewItem>
     </TabView.items>
   </TabView>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/apps/cuteness.io/reddit-app-view-model.ts b/apps/cuteness.io/reddit-app-view-model.ts
index 125aeb1d5..1f79e87c7 100644
--- a/apps/cuteness.io/reddit-app-view-model.ts
+++ b/apps/cuteness.io/reddit-app-view-model.ts
@@ -8,8 +8,8 @@ import redditModel = require("./reddit-model");
 import redditViewModel = require("./reddit-item-view-model");
 
 var aboutText = "Cuteness is a proof of concept app demonstrating the Telerik's NativeScript for writing native mobile applications using JavaScript.";
-export var defaultThumbnailImageSource = imageSource.fromFile("~/app/res/reddit-logo.png");
-export var defaultNoThumbnailImageSource = imageSource.fromFile("~/app/res/no-image.png");
+export var defaultThumbnailImageSource = imageSource.fromFile("~/res/reddit-logo.png");
+export var defaultNoThumbnailImageSource = imageSource.fromFile("~/res/no-image.png");
 
 var redditUrl = "http://www.reddit.com/r/aww.json?limit=";
 var after: string;
@@ -85,4 +85,4 @@ export class AppViewModel extends observable.Observable {
     get defaultNoThumbnailImageSource(): imageSource.ImageSource {
         return defaultNoThumbnailImageSource;
     }
-}
\ No newline at end of file
+}
diff --git a/apps/cuteness.io/reddit-item-view-model.ts b/apps/cuteness.io/reddit-item-view-model.ts
index 0cf522176..9004c30e1 100644
--- a/apps/cuteness.io/reddit-item-view-model.ts
+++ b/apps/cuteness.io/reddit-item-view-model.ts
@@ -4,8 +4,8 @@ import imageSource = require("image-source");
 import redditModel = require("./reddit-model");
 import redditAppViewModel = require("./reddit-app-view-model");
 
-var firstThumbnailImageSource = imageSource.fromFile("~/app/res/first-image.png");
-var defaultImageSource = imageSource.fromFile("~/app/res/reddit-logo-transparent.png");
+var firstThumbnailImageSource = imageSource.fromFile("~/res/first-image.png");
+var defaultImageSource = imageSource.fromFile("~/res/reddit-logo-transparent.png");
 
 var ISLOADING = "isLoading";
 var THUMBNAIL_IMAGE_SOURCE = "thumbnailImageSource";

From 21c1bcb7e27c9a9772cbb4307751fd53ef30c92b Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 11:31:22 +0200
Subject: [PATCH 04/24] Attempt to fix the TelerikNext (to be tested)

---
 apps/TelerikNEXT/app.ts        |  2 +-
 apps/TelerikNEXT/main-page.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/TelerikNEXT/app.ts b/apps/TelerikNEXT/app.ts
index 741c77ffe..64c8dbe17 100644
--- a/apps/TelerikNEXT/app.ts
+++ b/apps/TelerikNEXT/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
 
 // Set the start module for the application
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 // TODO: This is only neede because of the deply script.
 application.cssFile = "app/TelerikNEXT/app.css";
diff --git a/apps/TelerikNEXT/main-page.xml b/apps/TelerikNEXT/main-page.xml
index 5d535e205..a743fa0ad 100644
--- a/apps/TelerikNEXT/main-page.xml
+++ b/apps/TelerikNEXT/main-page.xml
@@ -1,5 +1,5 @@
 <Page xmlns="http://www.nativescript.org/tns.xsd"
-  loaded="pageLoaded" xmlns:tsb="app/TelerikUI/side-bar">
+  loaded="pageLoaded" xmlns:tsb="TelerikUI/side-bar">
   <tsb:SideBar title="TelerikNEXT">
     <tsb:SideBar.slideContent>
       <StackLayout style="background-color: white">
@@ -15,7 +15,7 @@
           </Label>
         </Border>
 
-        <Image src="~/app/images/logo.png" margin="20" />
+        <Image src="~/images/logo.png" margin="20" />
 
         <Button tap="{{ selectView }}" text="My agenda" horizontalAlignment="left" color="{{ selectedViewIndex === 0 ? '#e4ba4e' : 'white' }}"/>
         <Button tap="{{ selectView }}" text="All sessions" horizontalAlignment="left" color="{{ selectedViewIndex === 1 ? '#e4ba4e' : 'white' }}" />
@@ -29,7 +29,7 @@
 
         <GridLayout rows="auto, auto, *" visibility="{{ selectedViewIndex !== 2 ? 'visible' : 'collapsed' }}">
 
-          <StackLayout style="background-image: url('~/app/images/background.jpg')">
+          <StackLayout style="background-image: url('~/images/background.jpg')">
             <SegmentedBar selectedIndex="{{ selectedIndex }}"  style="background-color: transparent;color: white;" selectedBackgroundColor="#fac950">
               <SegmentedBar.items>
                 <SegmentedBarItem title="MAY 3" />
@@ -55,7 +55,7 @@
             <ListView.itemTemplate>
               <GridLayout columns="auto, *" cssClass="{{ canBeFavorited ? 'list-view-row' : 'break-row' }}">
 
-                <Image src="{{ favorite ? '~/app/images/fav.png' : '~/app/images/addfav.png' }}"
+                <Image src="{{ favorite ? '~/images/fav.png' : '~/images/addfav.png' }}"
                        visibility="{{ canBeFavorited ? 'visible' : 'collapsed' }}"
                        tap="toggleFavorite" cssClass="favourite-image" />
 
@@ -86,7 +86,7 @@
         </GridLayout>
 
         <Border style="background-color: #053140;" visibility="{{ selectedViewIndex === 2 ? 'visible' : 'collapsed' }}">
-          <Image src="~/app/images/logo.png" margin="20" />
+          <Image src="~/images/logo.png" margin="20" />
         </Border>
 
       </GridLayout>
@@ -95,4 +95,4 @@
 
 
 
-</Page>
\ No newline at end of file
+</Page>

From deabc60178ceeec91c79557abdd00de510a2c03b Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 11:36:50 +0200
Subject: [PATCH 05/24] Fix absolute-layout-demo

---
 apps/absolute-layout-demo/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/absolute-layout-demo/app.ts b/apps/absolute-layout-demo/app.ts
index ee60fa462..f8c884d9e 100644
--- a/apps/absolute-layout-demo/app.ts
+++ b/apps/absolute-layout-demo/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/mainPage";
+application.mainModule = "mainPage";
 application.start();

From 38031710528bbfbd6813b7f0f94fa5961a1bcdc3 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:15:26 +0200
Subject: [PATCH 06/24] Fix the editable-text-demo app

---
 apps/editable-text-demo/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/editable-text-demo/app.ts b/apps/editable-text-demo/app.ts
index 83670f56b..cb572300b 100644
--- a/apps/editable-text-demo/app.ts
+++ b/apps/editable-text-demo/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 application.start();

From 350a15018096a5436468d11fd8a7353e1066ed48 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:24:14 +0200
Subject: [PATCH 07/24] Fix the gallery-app

---
 apps/gallery-app/app.ts          | 2 +-
 apps/gallery-app/main-page.ts    | 4 ++--
 apps/gallery-app/views/image.xml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/gallery-app/app.ts b/apps/gallery-app/app.ts
index 83670f56b..cb572300b 100644
--- a/apps/gallery-app/app.ts
+++ b/apps/gallery-app/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 application.start();
diff --git a/apps/gallery-app/main-page.ts b/apps/gallery-app/main-page.ts
index 714eecd3e..851a26cec 100644
--- a/apps/gallery-app/main-page.ts
+++ b/apps/gallery-app/main-page.ts
@@ -3,7 +3,7 @@ import frame = require("ui/frame");
 
 export function itemTap(args: observable.EventData) {
     frame.topmost().navigate({
-        moduleName: "app/" + args.object.get("tag"),
+        moduleName: "" + args.object.get("tag"),
     });
 }
- 
\ No newline at end of file
+ 
diff --git a/apps/gallery-app/views/image.xml b/apps/gallery-app/views/image.xml
index cbf278d45..da1c2057d 100644
--- a/apps/gallery-app/views/image.xml
+++ b/apps/gallery-app/views/image.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page loaded="pageLoaded">
-  <Image margin="10" src="~/app/res/telerik-logo.png" verticalAlignment="center" horizontalAlignment="center"/>
-</Page>
\ No newline at end of file
+  <Image margin="10" src="~/res/telerik-logo.png" verticalAlignment="center" horizontalAlignment="center"/>
+</Page>

From 148b82062499464ebe4d71cf87db051c260574ed Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:27:56 +0200
Subject: [PATCH 08/24] Fix the paths in the paylocity app

---
 apps/paylocity/app.ts   | 4 ++--
 apps/paylocity/login.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/paylocity/app.ts b/apps/paylocity/app.ts
index de56f0733..2b9444984 100644
--- a/apps/paylocity/app.ts
+++ b/apps/paylocity/app.ts
@@ -1,6 +1,6 @@
 import application = require("application");
 
-application.mainModule = "app/login";
-application.cssFile = "app/paylocity/style.css";
+application.mainModule = "login";
+application.cssFile = "paylocity/style.css";
 
 application.start();
diff --git a/apps/paylocity/login.ts b/apps/paylocity/login.ts
index dde79c3ed..e6a9d0cb6 100644
--- a/apps/paylocity/login.ts
+++ b/apps/paylocity/login.ts
@@ -18,5 +18,5 @@ export function imageLoaded(args: observable.EventData) {
 }
 
 export function loginButtonTap(args: observable.EventData) {
-    frames.topmost().navigate("app/news");
+    frames.topmost().navigate("news");
 }

From 2e8eef1bda929953efb4a3194fb84efc980032ed Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:36:47 +0200
Subject: [PATCH 09/24] Fix perf-tests paths. Not tested

---
 apps/perf-tests/ApplicationLoadTimeAndFPS/app.ts              | 2 +-
 apps/perf-tests/ApplicationSize/app.ts                        | 2 +-
 apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts           | 2 +-
 apps/perf-tests/ControlCreationSpeedTest/app.ts               | 2 +-
 apps/perf-tests/ControlCreationSpeedTest/mainPage.ts          | 4 ++--
 apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts         | 2 +-
 apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts    | 2 +-
 .../LargeObjectArrayMemoryLeakTest/native-calls-wrapper.d.ts  | 2 +-
 apps/perf-tests/LargeObjectArrayMemoryTest/app.ts             | 2 +-
 apps/perf-tests/NavigationMemoryLeakTest/app.ts               | 2 +-
 apps/perf-tests/NavigationTest/master-page.ts                 | 2 +-
 apps/perf-tests/NavigationTest/page1.ts                       | 2 +-
 apps/perf-tests/SingleUIObjectMemoryLeakTest/app.ts           | 2 +-
 apps/perf-tests/SpeedTests/app.ts                             | 2 +-
 apps/perf-tests/SpeedTests/tests-native.d.ts                  | 2 +-
 apps/perf-tests/SpeedTests/tests.d.ts                         | 2 +-
 apps/perf-tests/SpeedTests/tests.ts                           | 2 +-
 apps/perf-tests/controls-page.d.ts                            | 2 +-
 apps/perf-tests/controls-page.ts                              | 4 ++--
 apps/perf-tests/nav-page.d.ts                                 | 2 +-
 apps/perf-tests/nav-page.ts                                   | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/apps/perf-tests/ApplicationLoadTimeAndFPS/app.ts b/apps/perf-tests/ApplicationLoadTimeAndFPS/app.ts
index 4a58d1de7..56be791b5 100644
--- a/apps/perf-tests/ApplicationLoadTimeAndFPS/app.ts
+++ b/apps/perf-tests/ApplicationLoadTimeAndFPS/app.ts
@@ -6,6 +6,6 @@ fps.addCallback(function (fps, minFps) {
 });
 fps.start();
 
-application.mainModule = "app/ApplicationLoadTimeAndFPS/mainPage";
+application.mainModule = "ApplicationLoadTimeAndFPS/mainPage";
 
 application.start();
diff --git a/apps/perf-tests/ApplicationSize/app.ts b/apps/perf-tests/ApplicationSize/app.ts
index ae5b29aa3..e4ad33bef 100644
--- a/apps/perf-tests/ApplicationSize/app.ts
+++ b/apps/perf-tests/ApplicationSize/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/ApplicationSize/mainPage";
+application.mainModule = "ApplicationSize/mainPage";
 application.start();
diff --git a/apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts b/apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts
index 2af4de695..7e88d8d2c 100644
--- a/apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts
+++ b/apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/ComplexObjectGraphMemoryTest/mainPage";
+application.mainModule = "ComplexObjectGraphMemoryTest/mainPage";
diff --git a/apps/perf-tests/ControlCreationSpeedTest/app.ts b/apps/perf-tests/ControlCreationSpeedTest/app.ts
index cd2cf54d6..0fda9833f 100644
--- a/apps/perf-tests/ControlCreationSpeedTest/app.ts
+++ b/apps/perf-tests/ControlCreationSpeedTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/ControlCreationSpeedTest/mainPage";
+application.mainModule = "ControlCreationSpeedTest/mainPage";
diff --git a/apps/perf-tests/ControlCreationSpeedTest/mainPage.ts b/apps/perf-tests/ControlCreationSpeedTest/mainPage.ts
index e447aa68e..ea289879e 100644
--- a/apps/perf-tests/ControlCreationSpeedTest/mainPage.ts
+++ b/apps/perf-tests/ControlCreationSpeedTest/mainPage.ts
@@ -3,7 +3,7 @@ import stackLayoutModule = require("ui/layouts/stack-layout");
 import buttonModule = require("ui/button");
 import labelModule = require("ui/label");
 import frameModule = require("ui/frame");
-import controlsPageModule = require("app/controls-page");
+import controlsPageModule = require("controls-page");
 import enums = require("ui/enums");
 
 export function createPage() {
@@ -89,4 +89,4 @@ export function createPage() {
     var resultsLabel = new labelModule.Label();
     mainLayout.addChild(resultsLabel);
     return page;
-}
\ No newline at end of file
+}
diff --git a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts
index 8e217751c..6aeef71f3 100644
--- a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts
+++ b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/LargeObjectArrayMemoryLeakTest/mainPage";
+application.mainModule = "LargeObjectArrayMemoryLeakTest/mainPage";
diff --git a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts
index a22650212..3fb979b61 100644
--- a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts
+++ b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts
@@ -2,7 +2,7 @@ import pagesModule = require("ui/page");
 import stackLayoutModule = require("ui/layouts/stack-layout");
 import buttonModule = require("ui/button");
 import labelModule = require("ui/label");
-import nativeCallsWrapper = require("app/native-calls-wrapper");
+import nativeCallsWrapper = require("native-calls-wrapper");
 import enums = require("ui/enums");
 
 export function createPage() {
diff --git a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.d.ts b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.d.ts
index d96d98aae..70714a51f 100644
--- a/apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.d.ts
+++ b/apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.d.ts
@@ -1,4 +1,4 @@
-declare module "app/native-calls-wrapper" {
+declare module "native-calls-wrapper" {
     export function createNativeDate(): any;
     export function forceGarbageCollection(): void;
 } 
diff --git a/apps/perf-tests/LargeObjectArrayMemoryTest/app.ts b/apps/perf-tests/LargeObjectArrayMemoryTest/app.ts
index 6d87e89a4..2420788cf 100644
--- a/apps/perf-tests/LargeObjectArrayMemoryTest/app.ts
+++ b/apps/perf-tests/LargeObjectArrayMemoryTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/LargeObjectArrayMemoryTest/mainPage";
+application.mainModule = "LargeObjectArrayMemoryTest/mainPage";
diff --git a/apps/perf-tests/NavigationMemoryLeakTest/app.ts b/apps/perf-tests/NavigationMemoryLeakTest/app.ts
index fb31f6455..15dbd0820 100644
--- a/apps/perf-tests/NavigationMemoryLeakTest/app.ts
+++ b/apps/perf-tests/NavigationMemoryLeakTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/NavigationMemoryLeakTest/mainPage";
+application.mainModule = "NavigationMemoryLeakTest/mainPage";
diff --git a/apps/perf-tests/NavigationTest/master-page.ts b/apps/perf-tests/NavigationTest/master-page.ts
index f5d10c338..01ddea042 100644
--- a/apps/perf-tests/NavigationTest/master-page.ts
+++ b/apps/perf-tests/NavigationTest/master-page.ts
@@ -30,7 +30,7 @@ export function createPage() {
 
     listView.on(listViewModule.knownEvents.itemTap, (args: listViewModule.ItemEventData) => {
         var navigationEntry = {
-            moduleName: "app/NavigationTest/details-page",
+            moduleName: "NavigationTest/details-page",
             context: itemsSource[args.index]
         };
         page.frame.navigate(navigationEntry);
diff --git a/apps/perf-tests/NavigationTest/page1.ts b/apps/perf-tests/NavigationTest/page1.ts
index 5f92d518c..c5669501c 100644
--- a/apps/perf-tests/NavigationTest/page1.ts
+++ b/apps/perf-tests/NavigationTest/page1.ts
@@ -22,7 +22,7 @@ export function createPage() {
     var navigateButton = new buttonModule.Button();
     navigateButton.text = "->";
     navigateButton.on(buttonModule.knownEvents.tap, () => {
-        page.frame.navigate("app/NavigationTest/page2");
+        page.frame.navigate("NavigationTest/page2");
     });
     stackLayout.addChild(navigateButton);
 
diff --git a/apps/perf-tests/SingleUIObjectMemoryLeakTest/app.ts b/apps/perf-tests/SingleUIObjectMemoryLeakTest/app.ts
index c92e65b20..cdf8c573c 100644
--- a/apps/perf-tests/SingleUIObjectMemoryLeakTest/app.ts
+++ b/apps/perf-tests/SingleUIObjectMemoryLeakTest/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/SingleUIObjectMemoryLeakTest/mainPage";
+application.mainModule = "SingleUIObjectMemoryLeakTest/mainPage";
diff --git a/apps/perf-tests/SpeedTests/app.ts b/apps/perf-tests/SpeedTests/app.ts
index ec78a2517..0fa044a50 100644
--- a/apps/perf-tests/SpeedTests/app.ts
+++ b/apps/perf-tests/SpeedTests/app.ts
@@ -1,2 +1,2 @@
 import application = require("application");
-application.mainModule = "app/SpeedTests/mainPage";
+application.mainModule = "SpeedTests/mainPage";
diff --git a/apps/perf-tests/SpeedTests/tests-native.d.ts b/apps/perf-tests/SpeedTests/tests-native.d.ts
index 50120d069..839d217b2 100644
--- a/apps/perf-tests/SpeedTests/tests-native.d.ts
+++ b/apps/perf-tests/SpeedTests/tests-native.d.ts
@@ -1,4 +1,4 @@
-declare module "app/SpeedTests/tests-native" {
+declare module "SpeedTests/tests-native" {
     import imageSource = require("image-source");
 
     export function compareTwoNativeDates(secondsSince1970: number): void;
diff --git a/apps/perf-tests/SpeedTests/tests.d.ts b/apps/perf-tests/SpeedTests/tests.d.ts
index 2d58662f9..cda8114e2 100644
--- a/apps/perf-tests/SpeedTests/tests.d.ts
+++ b/apps/perf-tests/SpeedTests/tests.d.ts
@@ -1,4 +1,4 @@
-declare module "app/SpeedTests/tests" {
+declare module "SpeedTests/tests" {
     export function compareNativeDates(count: number): string;
     export function compareJavaScriptDates(count: number): string;
     export function decodeAndEncodeBitmap(count: number, finishedCallback: (message) => void): string;
diff --git a/apps/perf-tests/SpeedTests/tests.ts b/apps/perf-tests/SpeedTests/tests.ts
index 8f317709f..1ce9ac7e9 100644
--- a/apps/perf-tests/SpeedTests/tests.ts
+++ b/apps/perf-tests/SpeedTests/tests.ts
@@ -1,5 +1,5 @@
 /* tslint:disable:no-unused-variable */
-import testsNative = require("app/SpeedTests/tests-native");
+import testsNative = require("SpeedTests/tests-native");
 import trace = require("trace");
 import imageSourceModule = require("image-source");
 
diff --git a/apps/perf-tests/controls-page.d.ts b/apps/perf-tests/controls-page.d.ts
index 9a6b03899..d05782507 100644
--- a/apps/perf-tests/controls-page.d.ts
+++ b/apps/perf-tests/controls-page.d.ts
@@ -1,4 +1,4 @@
-declare module "app/controls-page" {
+declare module "controls-page" {
     import pagesModule = require("ui/page");
 
     class ControlsPage extends pagesModule.Page {
diff --git a/apps/perf-tests/controls-page.ts b/apps/perf-tests/controls-page.ts
index bee392c55..2543cb2ba 100644
--- a/apps/perf-tests/controls-page.ts
+++ b/apps/perf-tests/controls-page.ts
@@ -1,4 +1,4 @@
-import definition = require("app/controls-page");
+import definition = require("controls-page");
 import pagesModule = require("ui/page");
 import stackLayoutModule = require("ui/layouts/stack-layout");
 import labelModule = require("ui/label");
@@ -58,4 +58,4 @@ export class ControlsPage extends pagesModule.Page implements definition.Control
         trace.write(message, trace.categories.Test, trace.messageType.info);
         this._infoLabel.text = message;
     }
-}
\ No newline at end of file
+}
diff --git a/apps/perf-tests/nav-page.d.ts b/apps/perf-tests/nav-page.d.ts
index 389a993bb..2da9c37a4 100644
--- a/apps/perf-tests/nav-page.d.ts
+++ b/apps/perf-tests/nav-page.d.ts
@@ -1,4 +1,4 @@
-declare module "app/nav-page" {
+declare module "nav-page" {
     import pagesModule = require("ui/page");
 
     class NavPage extends pagesModule.Page {
diff --git a/apps/perf-tests/nav-page.ts b/apps/perf-tests/nav-page.ts
index b982f41b2..2ad2303aa 100644
--- a/apps/perf-tests/nav-page.ts
+++ b/apps/perf-tests/nav-page.ts
@@ -1,4 +1,4 @@
-import definition = require("app/controls-page");
+import definition = require("controls-page");
 import frameModule = require("ui/frame");
 import pagesModule = require("ui/page");
 import stackLayoutModule = require("ui/layouts/stack-layout");

From cb7b466d79511220cc947138feb5e1f2af288fbd Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:41:10 +0200
Subject: [PATCH 10/24] Fix the pickers-demo

---
 apps/pickers-demo/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pickers-demo/app.ts b/apps/pickers-demo/app.ts
index 0f172a73b..cb572300b 100644
--- a/apps/pickers-demo/app.ts
+++ b/apps/pickers-demo/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/main-page";
-application.start();
\ No newline at end of file
+application.mainModule = "main-page";
+application.start();

From 53ff034072f3fed517c750c700dde4152a2092de Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:50:41 +0200
Subject: [PATCH 11/24] Fix the platform-specific-template app

---
 apps/platform-specific-template/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/platform-specific-template/app.ts b/apps/platform-specific-template/app.ts
index 83670f56b..cb572300b 100644
--- a/apps/platform-specific-template/app.ts
+++ b/apps/platform-specific-template/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 application.start();

From b2636c9f3523425549fcbfa7392de5e75f0f4c10 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:54:01 +0200
Subject: [PATCH 12/24] Fix the paths in the tab-view-demo app. Not tested.
 Depends on the perf-tests app

---
 apps/tab-view-demo/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tab-view-demo/app.ts b/apps/tab-view-demo/app.ts
index f95837a52..3f1371d7d 100644
--- a/apps/tab-view-demo/app.ts
+++ b/apps/tab-view-demo/app.ts
@@ -1,6 +1,6 @@
 import application = require("application");
 
-application.mainModule = "app/mainPage";
+application.mainModule = "mainPage";
 
 import trace = require("trace");
 trace.enable();

From 87b17d97efe8ca563569ea9b20d812bfd7f1ad64 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 13:57:33 +0200
Subject: [PATCH 13/24] Fix the path in the blank template

---
 apps/template-blank/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/template-blank/app.ts b/apps/template-blank/app.ts
index 5641af6f2..433bde5a0 100644
--- a/apps/template-blank/app.ts
+++ b/apps/template-blank/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 // Remove this in the AppBuilder templates
-application.cssFile = "app/template-blank/app.css"
+application.cssFile = "template-blank/app.css"
 
 application.start();

From aede9d3b1b1ea20b81cf9d216f815ac0101709cc Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:08:01 +0200
Subject: [PATCH 14/24] Fix the hello-world template app

---
 apps/template-hello-world/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/template-hello-world/app.ts b/apps/template-hello-world/app.ts
index c2a8a8fcb..e5b60f7f9 100644
--- a/apps/template-hello-world/app.ts
+++ b/apps/template-hello-world/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 // Remove this in the AppBuilder templates
-application.cssFile = "app/template-hello-world/app.css"
+application.cssFile = "app.css"
 
 application.start();

From ab491d038dad1183da60fe43fba0986fb1d0220c Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:12:00 +0200
Subject: [PATCH 15/24] Fix the master-detail template app

---
 apps/template-master-detail/app.ts       | 4 ++--
 apps/template-master-detail/main-page.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/template-master-detail/app.ts b/apps/template-master-detail/app.ts
index b9039f98a..e5b60f7f9 100644
--- a/apps/template-master-detail/app.ts
+++ b/apps/template-master-detail/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 // Remove this in the AppBuilder templates
-application.cssFile = "app/template-master-detail/app.css"
+application.cssFile = "app.css"
 
 application.start();
diff --git a/apps/template-master-detail/main-page.ts b/apps/template-master-detail/main-page.ts
index ca1064889..b7b066e7a 100644
--- a/apps/template-master-detail/main-page.ts
+++ b/apps/template-master-detail/main-page.ts
@@ -16,8 +16,8 @@ export function pageLoaded(args: observable.EventData) {
 export function listViewItemTap(args: listView.ItemEventData) {
     // Navigate to the details page with context set to the current data item
     if (!twoPaneLayout) {
-        frames.topmost().navigate("app/details-page");
+        frames.topmost().navigate("details-page");
     }
 
     vmModule.mainViewModel.set("selectedItem", args.view.bindingContext);
-}
\ No newline at end of file
+}

From 29d87714bde64b022e97668d2736571a6d6893cb Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:15:19 +0200
Subject: [PATCH 16/24] Fix the template-settings app paths

---
 apps/template-settings/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/template-settings/app.ts b/apps/template-settings/app.ts
index eb622839f..19f182b66 100644
--- a/apps/template-settings/app.ts
+++ b/apps/template-settings/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
 
 // Remove this in the AppBuilder templates
-application.cssFile = "app/template-settings/app.css"
+application.cssFile = "template-settings/app.css"
 
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 application.start();

From ecc66b83e4fc96072706271718ffa4eac912856f Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:16:34 +0200
Subject: [PATCH 17/24] Fix the tab-navigation template

---
 apps/template-tab-navigation/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/template-tab-navigation/app.ts b/apps/template-tab-navigation/app.ts
index 1cfdd1a98..64a1f7ebf 100644
--- a/apps/template-tab-navigation/app.ts
+++ b/apps/template-tab-navigation/app.ts
@@ -1,7 +1,7 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 // Remove this in the AppBuilder templates
-application.cssFile = "app/template-tab-navigation/app.css"
+application.cssFile = "template-tab-navigation/app.css"
 
 application.start();

From bd7c0ef4f0707fc4d5a6152a83dd8f4cb0ab1ab0 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:22:31 +0200
Subject: [PATCH 18/24] Fix ui-tests-app paths. Not tested. Depends on the
 tests app

---
 apps/ui-tests-app/app.ts      | 2 +-
 apps/ui-tests-app/mainPage.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/ui-tests-app/app.ts b/apps/ui-tests-app/app.ts
index f7ec31f6c..a412e11b4 100644
--- a/apps/ui-tests-app/app.ts
+++ b/apps/ui-tests-app/app.ts
@@ -1,5 +1,5 @@
 import application = require("application");
-application.mainModule = "app/mainPage";
+application.mainModule = "mainPage";
 
 application.onUncaughtError = function (error: application.NativeScriptError) {
     console.warn(error.message);
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index ef87122d5..206ae6feb 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -10,7 +10,7 @@ trace.enable();
 trace.setCategories(trace.categories.Test);
 
 export function createPage() {
-    var basePath = "app/pages/";
+    var basePath = "../tests/pages/";
     var txtInput = new text.TextView();
 
     var btn = new button.Button();
@@ -39,4 +39,4 @@ export function createPage() {
     var page = new pages.Page();
     page.content = grid;
     return page;
-}
\ No newline at end of file
+}

From 6930e2d35bea19524ad64c55356512ee1113fb00 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:28:15 +0200
Subject: [PATCH 19/24] Fix the web-view-demo app path

---
 apps/web-view-demo/app.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web-view-demo/app.ts b/apps/web-view-demo/app.ts
index 63795916b..aa64c6703 100644
--- a/apps/web-view-demo/app.ts
+++ b/apps/web-view-demo/app.ts
@@ -1,8 +1,8 @@
 import application = require("application");
-application.mainModule = "app/main-page";
+application.mainModule = "main-page";
 
 import trace = require("trace");
 trace.enable();
 trace.setCategories(trace.categories.concat(trace.categories.Debug));
 
-application.start();
\ No newline at end of file
+application.start();

From 30a152cce95b216e2ec23e5f41d1a8be15caf030 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:30:43 +0200
Subject: [PATCH 20/24] Fix the wrap-layout-demo app path

---
 apps/wrap-layout-demo/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wrap-layout-demo/app.ts b/apps/wrap-layout-demo/app.ts
index ee60fa462..f8c884d9e 100644
--- a/apps/wrap-layout-demo/app.ts
+++ b/apps/wrap-layout-demo/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/mainPage";
+application.mainModule = "mainPage";
 application.start();

From cb25cfc64d7c7e47fec697c25a4ca6f2b5f10ca4 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 14:33:36 +0200
Subject: [PATCH 21/24] Fix the xml-demo app path

---
 apps/xml-demo/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/xml-demo/app.ts b/apps/xml-demo/app.ts
index ee60fa462..f8c884d9e 100644
--- a/apps/xml-demo/app.ts
+++ b/apps/xml-demo/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/mainPage";
+application.mainModule = "mainPage";
 application.start();

From d5af4c472364b0db355efae7d1f191b69f17bb33 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 16:05:54 +0200
Subject: [PATCH 22/24] Fix tests app paths

---
 apps/tests/app/app.ts                                       | 2 +-
 .../file-name-resolver-tests/file-name-resolver-tests.ts    | 4 ++--
 apps/tests/frame-tests.ts                                   | 6 +++---
 apps/tests/package.json                                     | 2 +-
 apps/tests/pages/app.ts                                     | 2 +-
 apps/tests/pages/file-load-test.ts                          | 2 +-
 apps/tests/pages/navigation/pageA-new-activity.ts           | 2 +-
 apps/tests/pages/navigation/pageA.ts                        | 6 +++---
 apps/tests/pages/navigation/pageB-new-activity.ts           | 2 +-
 apps/tests/pages/navigation/pageB.ts                        | 6 +++---
 apps/tests/pages/navigation/pageC-new-activity.ts           | 2 +-
 apps/tests/pages/navigation/pageC.ts                        | 4 ++--
 apps/tests/pages/page14.xml                                 | 2 +-
 apps/tests/styling/app.ts                                   | 2 +-
 apps/tests/ui/image/image-tests.ts                          | 6 +++---
 apps/tests/ui/label/label-tests.ts                          | 4 ++--
 apps/tests/ui/page/page-tests-common.ts                     | 2 +-
 apps/tests/xml-declaration/app.ts                           | 2 +-
 apps/tests/xml-declaration/mainPage.xml                     | 6 +++---
 apps/tests/xml-declaration/mymodulewithxml/MyControl.xml    | 2 +-
 20 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/tests/app/app.ts b/apps/tests/app/app.ts
index d7f88c9a3..ee60fa462 100644
--- a/apps/tests/app/app.ts
+++ b/apps/tests/app/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/app/mainPage";
+application.mainModule = "app/mainPage";
 application.start();
diff --git a/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts b/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
index 2823daafc..2111d33dd 100644
--- a/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
+++ b/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
@@ -212,7 +212,7 @@ function testTemplate(candidates: Array<string>, context: resolver.PlatformConte
     TKUnit.assertEqual(result, expected, "File path");
 }
 
-var testFilePath = fs.path.join(fs.knownFolders.currentApp().path, "app/tests/file-name-resolver-tests/files/test");
+var testFilePath = fs.path.join(fs.knownFolders.currentApp().path, "tests/file-name-resolver-tests/files/test");
 
 export function test_file_resolver_with_andorid_phone_portratit() {
     var fileResolver = new resolver.FileNameResolver(androidPhonePortraitContext);
@@ -242,4 +242,4 @@ export function test_file_resolver_with_ios_phone_portrait() {
     var fileResolver = new resolver.FileNameResolver(iPhonePortraitContext);
     var result = fileResolver.resolveFileName(testFilePath, "xml");
     TKUnit.assertEqual(result, testFilePath + ".xml", "File path");
-}
\ No newline at end of file
+}
diff --git a/apps/tests/frame-tests.ts b/apps/tests/frame-tests.ts
index 689d82948..e17883763 100644
--- a/apps/tests/frame-tests.ts
+++ b/apps/tests/frame-tests.ts
@@ -13,7 +13,7 @@ export var test_DummyTestForSnippetOnly0 = function () {
     // <snippet module="ui/frame" title="frame">
     // ### Navigating to a Module
     // ``` JavaScript
-    topmost.navigate("app/details-page");
+    topmost.navigate("details-page");
     // ```
     // </snippet>
 }
@@ -39,7 +39,7 @@ export var test_DummyTestForSnippetOnly2 = function () {
     // ### Navigating with NavigationEntry
     // ``` JavaScript
     var navigationEntry = {
-        moduleName: "app/details-page",
+        moduleName: "details-page",
         context: { info: "something you want to pass to your page" },
         animated: false
     };
@@ -55,4 +55,4 @@ export var test_DummyTestForSnippetOnly3 = function () {
     topmost.goBack();
     // ```
     // </snippet>
-}
\ No newline at end of file
+}
diff --git a/apps/tests/package.json b/apps/tests/package.json
index 2f84325be..0d9a96932 100644
--- a/apps/tests/package.json
+++ b/apps/tests/package.json
@@ -1,2 +1,2 @@
 { "name" : "Tests",
-  "main" : "testRunner.js" }
\ No newline at end of file
+  "main" : "app/app.js" }
diff --git a/apps/tests/pages/app.ts b/apps/tests/pages/app.ts
index 6b2d81278..acf8d9106 100644
--- a/apps/tests/pages/app.ts
+++ b/apps/tests/pages/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/pages/page14";
+application.mainModule = "pages/page14";
 application.start();
diff --git a/apps/tests/pages/file-load-test.ts b/apps/tests/pages/file-load-test.ts
index dd2bfc2b2..f91f61121 100644
--- a/apps/tests/pages/file-load-test.ts
+++ b/apps/tests/pages/file-load-test.ts
@@ -7,7 +7,7 @@ export function createPage() {
     var page = new pages.Page();
     var lbl = new label.Label();
 
-    var moduleName = "app/tests/pages/files/test";
+    var moduleName = "tests/pages/files/test";
 
     var resolver = new fileResolverModule.FileNameResolver({
         width: 400,
diff --git a/apps/tests/pages/navigation/pageA-new-activity.ts b/apps/tests/pages/navigation/pageA-new-activity.ts
index 17178be71..c0d5af16a 100644
--- a/apps/tests/pages/navigation/pageA-new-activity.ts
+++ b/apps/tests/pages/navigation/pageA-new-activity.ts
@@ -11,7 +11,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page B new activity";
     btn.on(button.knownEvents.tap, function () {
-        var nextPage = "app/tests/pages/navigation/pageB-new-activity";
+        var nextPage = "tests/pages/navigation/pageB-new-activity";
         frame.topmost().navigate(nextPage);
     });
     stack.addChild(btn);
diff --git a/apps/tests/pages/navigation/pageA.ts b/apps/tests/pages/navigation/pageA.ts
index 002594c11..d50b4ed61 100644
--- a/apps/tests/pages/navigation/pageA.ts
+++ b/apps/tests/pages/navigation/pageA.ts
@@ -17,7 +17,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page B";
     btn.on(button.knownEvents.tap, function () {
-        var nextPage = "app/tests/pages/navigation/pageB";
+        var nextPage = "tests/pages/navigation/pageB";
         frame.topmost().navigate(nextPage);
     });
     stack.addChild(btn);
@@ -25,7 +25,7 @@ export function createPage() {
     var btnActivity = new button.Button();
     btnActivity.text = "start activity";
     btnActivity.on(button.knownEvents.tap, function () {
-        var newPage = "app/tests/pages/navigation/pageA-new-activity";
+        var newPage = "tests/pages/navigation/pageA-new-activity";
 
         var newFrame = new frame.Frame();
         newFrame.navigate(newPage);
@@ -55,4 +55,4 @@ export function createPage() {
 
     page.content = stack;
     return page;
-}
\ No newline at end of file
+}
diff --git a/apps/tests/pages/navigation/pageB-new-activity.ts b/apps/tests/pages/navigation/pageB-new-activity.ts
index 64ad8f3fa..3e534fd24 100644
--- a/apps/tests/pages/navigation/pageB-new-activity.ts
+++ b/apps/tests/pages/navigation/pageB-new-activity.ts
@@ -11,7 +11,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page C new activity";
     btn.on(button.knownEvents.tap, function () {
-        var nextPage = "app/tests/pages/navigation/pageC-new-activity";
+        var nextPage = "tests/pages/navigation/pageC-new-activity";
         frame.topmost().navigate(nextPage);
     });
     stack.addChild(btn);
diff --git a/apps/tests/pages/navigation/pageB.ts b/apps/tests/pages/navigation/pageB.ts
index abf8e40ad..e6caa0610 100644
--- a/apps/tests/pages/navigation/pageB.ts
+++ b/apps/tests/pages/navigation/pageB.ts
@@ -14,7 +14,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page C";
     btn.on(button.knownEvents.tap, function () {
-        var nextPage = "app/tests/pages/navigation/pageC";
+        var nextPage = "tests/pages/navigation/pageC";
         frame.topmost().navigate(nextPage);
     });
     stack.addChild(btn);
@@ -23,7 +23,7 @@ export function createPage() {
     btnActivity.text = "start activity";
     btnActivity.on(button.knownEvents.tap, function () {
         var newFrame = new frame.Frame();
-        var newPage = "app/tests/pages/navigation/pageA-new-activity";
+        var newPage = "tests/pages/navigation/pageA-new-activity";
         newFrame.navigate(newPage);
     });
     stack.addChild(btnActivity);
@@ -54,4 +54,4 @@ export function createPage() {
     page.content = stack;
     return page;
 }
-//export var Page = page;
\ No newline at end of file
+//export var Page = page;
diff --git a/apps/tests/pages/navigation/pageC-new-activity.ts b/apps/tests/pages/navigation/pageC-new-activity.ts
index 22d1c9f8b..42a5b8591 100644
--- a/apps/tests/pages/navigation/pageC-new-activity.ts
+++ b/apps/tests/pages/navigation/pageC-new-activity.ts
@@ -11,7 +11,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page A ???";
     btn.on(button.knownEvents.tap, function () {
-        var newPage = "app/tests/pages/navigation/pageA";
+        var newPage = "tests/pages/navigation/pageA";
         frame.topmost().navigate(newPage);
     });
     stack.addChild(btn);
diff --git a/apps/tests/pages/navigation/pageC.ts b/apps/tests/pages/navigation/pageC.ts
index 8097a32e1..4b04762c8 100644
--- a/apps/tests/pages/navigation/pageC.ts
+++ b/apps/tests/pages/navigation/pageC.ts
@@ -12,7 +12,7 @@ export function createPage() {
     newActivity.text = "start activity";
     newActivity.on(button.knownEvents.tap, function () {
         var newFrame = new frame.Frame();
-        var newPage = "app/tests/pages/navigation/pageA-new-activity";
+        var newPage = "tests/pages/navigation/pageA-new-activity";
         newFrame.navigate(newPage);
     });
     stack.addChild(newActivity);
@@ -20,7 +20,7 @@ export function createPage() {
     var btn = new button.Button();
     btn.text = "Page A ???";
     btn.on(button.knownEvents.tap, function () {
-        var nextPage = "app/tests/pages/navigation/pageA";
+        var nextPage = "tests/pages/navigation/pageA";
         frame.topmost().navigate(nextPage);
     });
     stack.addChild(btn);
diff --git a/apps/tests/pages/page14.xml b/apps/tests/pages/page14.xml
index 44b7be37d..45f44219d 100644
--- a/apps/tests/pages/page14.xml
+++ b/apps/tests/pages/page14.xml
@@ -7,6 +7,6 @@
     <Image src="http://www.google.com/images/errors/logo_sm_2.png" stretch="none" horizontalAlignment="left"/>
     
     <Label text="app file:" />
-    <Image  src="~/app/logo.png" stretch="none" horizontalAlignment="left" />
+    <Image  src="~/logo.png" stretch="none" horizontalAlignment="left" />
   </StackLayout>
 </Page>
diff --git a/apps/tests/styling/app.ts b/apps/tests/styling/app.ts
index 802394986..4bff1cb04 100644
--- a/apps/tests/styling/app.ts
+++ b/apps/tests/styling/app.ts
@@ -10,5 +10,5 @@ trace.setCategories(trace.categories.concat(
 //, trace.categories.VisualTreeEvents
     ));
 
-application.mainModule = "app/styling/mainPage";
+application.mainModule = "styling/mainPage";
 application.start();
diff --git a/apps/tests/ui/image/image-tests.ts b/apps/tests/ui/image/image-tests.ts
index 3f491dcbd..53851f756 100644
--- a/apps/tests/ui/image/image-tests.ts
+++ b/apps/tests/ui/image/image-tests.ts
@@ -13,9 +13,9 @@ import ImageModule = require("ui/image");
 //      <!--Bind the image source property to view-model property -->
 //      {%raw%}<Image src="{{ thumbnailImageUrl }}" />{%endraw%}
 //      <!--Load form image from application -->
-//      <Image source="~/app/logo.png" stretch ="none" / > 
+//      <Image source="~/logo.png" stretch ="none" / > 
 //      <!--Load form image resource -->
-//      <Image source="res://app/logo.png" stretch ="none" / > 
+//      <Image source="res://logo.png" stretch ="none" / > 
 //      <!--Load form image URL-->
 //      <Image source="http://www.google.com/images/errors/logo_sm_2.png" stretch ="none" /> 
 //   </StackLayout>
@@ -106,7 +106,7 @@ export var test_SettingImageSrcToFileWithinApp = function (done) {
     // ### How to create an image and set its src to file within the application.
     // ``` JavaScript
     var image = new ImageModule.Image();
-    image.src = "~/app/logo.png";
+    image.src = "~/logo.png";
     // ```
     // </snippet>
 
diff --git a/apps/tests/ui/label/label-tests.ts b/apps/tests/ui/label/label-tests.ts
index 0ed0bde4b..4c385a75a 100644
--- a/apps/tests/ui/label/label-tests.ts
+++ b/apps/tests/ui/label/label-tests.ts
@@ -477,7 +477,7 @@ export var testLocalTextAlignmentFromCssWhenAddingCssFileAllSelectorsAreApplied
         view.id = "testLabel";
         var page = <page.Page>views[1];
         page.addCss("#testLabel { text-align: " + expectedTextAlignment + "; }");
-        page.addCssFile("/app/tests/ui/label/label-tests.css");
+        page.addCssFile("/tests/ui/label/label-tests.css");
 
         var actualResult = view.style.textAlignment;
         // actual result is taken from #testLabel tag, because it has a greater priority (id vs type).
@@ -513,7 +513,7 @@ export var testErrorMessageWhenWrongCssIsAddedWithFile = function () {
         view.id = "testLabel";
         var page = <page.Page>views[1];
         errorMessage = undefined;   
-        page.addCssFile("/app/tests/ui/label/label-tests-wrong.css");
+        page.addCssFile("/tests/ui/label/label-tests-wrong.css");
 
         TKUnit.assertNotEqual(errorMessage, undefined);
     });
diff --git a/apps/tests/ui/page/page-tests-common.ts b/apps/tests/ui/page/page-tests-common.ts
index a184bbbf5..ef04d515e 100644
--- a/apps/tests/ui/page/page-tests-common.ts
+++ b/apps/tests/ui/page/page-tests-common.ts
@@ -237,7 +237,7 @@ export var test_FrameBackStack_WhenNavigatingForwardAndBack = function () {
 }
 
 export var test_LoadPageFromModule = function () {
-    helper.navigateToModule("app/ui/page/test-page-module");
+    helper.navigateToModule("ui/page/test-page-module");
     try {
         var topFrame = FrameModule.topmost();
         TKUnit.assert(topFrame.currentPage.content instanceof LabelModule.Label, "Content of the test page should be a Label created within test-page-module.");
diff --git a/apps/tests/xml-declaration/app.ts b/apps/tests/xml-declaration/app.ts
index 237ce3af7..cd2aee147 100644
--- a/apps/tests/xml-declaration/app.ts
+++ b/apps/tests/xml-declaration/app.ts
@@ -1,3 +1,3 @@
 import application = require("application");
-application.mainModule = "app/xml-declaration/mainPage";
+application.mainModule = "xml-declaration/mainPage";
 application.start();
diff --git a/apps/tests/xml-declaration/mainPage.xml b/apps/tests/xml-declaration/mainPage.xml
index 6b9980562..9589caee6 100644
--- a/apps/tests/xml-declaration/mainPage.xml
+++ b/apps/tests/xml-declaration/mainPage.xml
@@ -1,6 +1,6 @@
 <Page xmlns="http://www.nativescript.org/tns.xsd" loaded="MyPageLoaded"
-      xmlns:customControls="app/xml-declaration/mymodule"
-      xmlns:customControls2="app/xml-declaration/mymodulewithxml">
+      xmlns:customControls="xml-declaration/mymodule"
+      xmlns:customControls2="xml-declaration/mymodulewithxml">
   <TabView>
     <TabView.items>
       <TabViewItem title="Tab 1">
@@ -59,4 +59,4 @@
       </TabViewItem>
     </TabView.items>
   </TabView>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/apps/tests/xml-declaration/mymodulewithxml/MyControl.xml b/apps/tests/xml-declaration/mymodulewithxml/MyControl.xml
index c5a5efec3..016a2736c 100644
--- a/apps/tests/xml-declaration/mymodulewithxml/MyControl.xml
+++ b/apps/tests/xml-declaration/mymodulewithxml/MyControl.xml
@@ -1,4 +1,4 @@
-<StackLayout xmlns:customControls="app/xml-declaration/mymodule">
+<StackLayout xmlns:customControls="xml-declaration/mymodule">
   <Label id="Label1" text="mymodulewithxml" />
   <Button text="Click!" tap="buttonTap2" /> 
 </StackLayout>

From f3d1134058c510f81f3b907f1cd1ba4e6d7d1dfe Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Tue, 24 Mar 2015 16:43:28 +0200
Subject: [PATCH 23/24] Remove the platform-specific-template application (not
 an actual demo, covered with tests)

---
 apps/platform-specific-template/app.ts                | 3 ---
 apps/platform-specific-template/main-page.android.xml | 5 -----
 apps/platform-specific-template/main-page.ios.xml     | 5 -----
 apps/platform-specific-template/main-page.ts          | 1 -
 apps/platform-specific-template/package.json          | 2 --
 5 files changed, 16 deletions(-)
 delete mode 100644 apps/platform-specific-template/app.ts
 delete mode 100644 apps/platform-specific-template/main-page.android.xml
 delete mode 100644 apps/platform-specific-template/main-page.ios.xml
 delete mode 100644 apps/platform-specific-template/main-page.ts
 delete mode 100644 apps/platform-specific-template/package.json

diff --git a/apps/platform-specific-template/app.ts b/apps/platform-specific-template/app.ts
deleted file mode 100644
index cb572300b..000000000
--- a/apps/platform-specific-template/app.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import application = require("application");
-application.mainModule = "main-page";
-application.start();
diff --git a/apps/platform-specific-template/main-page.android.xml b/apps/platform-specific-template/main-page.android.xml
deleted file mode 100644
index a4508325e..000000000
--- a/apps/platform-specific-template/main-page.android.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Page loaded="onPageLoaded">
-  <StackLayout id="stack">
-    <Label id="label" text="Hello, Android!" />
-  </StackLayout>
-</Page>
diff --git a/apps/platform-specific-template/main-page.ios.xml b/apps/platform-specific-template/main-page.ios.xml
deleted file mode 100644
index c3be93a20..000000000
--- a/apps/platform-specific-template/main-page.ios.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Page loaded="onPageLoaded">
-  <StackLayout id="stack">
-    <Label id="label" text="Hello, iOS!" />
-  </StackLayout>
-</Page>
diff --git a/apps/platform-specific-template/main-page.ts b/apps/platform-specific-template/main-page.ts
deleted file mode 100644
index 5f282702b..000000000
--- a/apps/platform-specific-template/main-page.ts
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/platform-specific-template/package.json b/apps/platform-specific-template/package.json
deleted file mode 100644
index cdfd44208..000000000
--- a/apps/platform-specific-template/package.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "name" : "platform-specific-template",
-  "main" : "app.js" }

From 5b96287640822c938cf6685baac72eab00e2fa12 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Wed, 25 Mar 2015 09:21:05 +0200
Subject: [PATCH 24/24] Fix the ui-tests-app

---
 apps/ui-tests-app/mainPage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index 206ae6feb..b267d7a2a 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -10,7 +10,7 @@ trace.enable();
 trace.setCategories(trace.categories.Test);
 
 export function createPage() {
-    var basePath = "../tests/pages/";
+    var basePath = "pages/";
     var txtInput = new text.TextView();
 
     var btn = new button.Button();