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>