diff --git a/apps/tests/layouts/absolute-layout-tests.ts b/apps/tests/ui/layouts/absolute-layout-tests.ts
similarity index 98%
rename from apps/tests/layouts/absolute-layout-tests.ts
rename to apps/tests/ui/layouts/absolute-layout-tests.ts
index df28a37a2..3fd0b399d 100644
--- a/apps/tests/layouts/absolute-layout-tests.ts
+++ b/apps/tests/ui/layouts/absolute-layout-tests.ts
@@ -1,5 +1,5 @@
-import testModule = require("../ui-test");
-import TKUnit = require("../TKUnit");
+import testModule = require("../../ui-test");
+import TKUnit = require("../../TKUnit");
 import labelModule = require("ui/label");
 import colorModule = require("color");
 import layoutHelper = require("./layout-helper");
diff --git a/apps/tests/layouts/absolute-layout.md b/apps/tests/ui/layouts/absolute-layout.md
similarity index 100%
rename from apps/tests/layouts/absolute-layout.md
rename to apps/tests/ui/layouts/absolute-layout.md
diff --git a/apps/tests/layouts/common-layout-tests.ts b/apps/tests/ui/layouts/common-layout-tests.ts
similarity index 98%
rename from apps/tests/layouts/common-layout-tests.ts
rename to apps/tests/ui/layouts/common-layout-tests.ts
index d1c36909c..f87173408 100644
--- a/apps/tests/layouts/common-layout-tests.ts
+++ b/apps/tests/ui/layouts/common-layout-tests.ts
@@ -1,7 +1,7 @@
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import layoutHelper = require("./layout-helper");
 import enums = require("ui/enums");
-import testModule = require("../ui-test");
+import testModule = require("../../ui-test");
 import {LayoutBase} from "ui/layouts/layout-base";
 import {widthProperty} from "ui/styling/style"
 import platform = require("platform");
@@ -152,4 +152,4 @@ export function percent_support_test(test: testModule.UITest<LayoutBase>) {
     TKUnit.assertEqual(bounds.top, 0, "Reset Stretch layout TOP incorrect");
     TKUnit.assertEqual(bounds.right, 200, "Reset Stretch layout RIGHT incorrect");
     TKUnit.assertEqual(bounds.bottom, 200, "Reset Stretch layout BOTTOM incorrect");
-}
\ No newline at end of file
+}
diff --git a/apps/tests/layouts/dock-layout-tests.ts b/apps/tests/ui/layouts/dock-layout-tests.ts
similarity index 98%
rename from apps/tests/layouts/dock-layout-tests.ts
rename to apps/tests/ui/layouts/dock-layout-tests.ts
index 06c440475..a209b51d0 100644
--- a/apps/tests/layouts/dock-layout-tests.ts
+++ b/apps/tests/ui/layouts/dock-layout-tests.ts
@@ -1,8 +1,8 @@
 import button = require("ui/button");
 import {DockLayout} from "ui/layouts/dock-layout";
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import helper = require("./layout-helper");
-import testModule = require("../ui-test");
+import testModule = require("../../ui-test");
 import layoutHelper = require("./layout-helper");
 import commonTests = require("./common-layout-tests");
 
diff --git a/apps/tests/layouts/dock-layout.md b/apps/tests/ui/layouts/dock-layout.md
similarity index 100%
rename from apps/tests/layouts/dock-layout.md
rename to apps/tests/ui/layouts/dock-layout.md
diff --git a/apps/tests/layouts/grid-layout-tests.ts b/apps/tests/ui/layouts/grid-layout-tests.ts
similarity index 99%
rename from apps/tests/layouts/grid-layout-tests.ts
rename to apps/tests/ui/layouts/grid-layout-tests.ts
index f3ce31fed..34653e4a0 100644
--- a/apps/tests/layouts/grid-layout-tests.ts
+++ b/apps/tests/ui/layouts/grid-layout-tests.ts
@@ -1,11 +1,11 @@
 import {Page} from "ui/page";
 import {GridLayout, ItemSpec, GridUnitType} from "ui/layouts/grid-layout";
 import {Button} from "ui/button";
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import view = require("ui/core/view");
 import builder = require("ui/builder");
 import enums = require("ui/enums");
-import testModule = require("../ui-test");
+import testModule = require("../../ui-test");
 import layoutHelper = require("./layout-helper");
 import platform = require("platform");
 import commonTests = require("./common-layout-tests");
diff --git a/apps/tests/layouts/grid-layout.md b/apps/tests/ui/layouts/grid-layout.md
similarity index 100%
rename from apps/tests/layouts/grid-layout.md
rename to apps/tests/ui/layouts/grid-layout.md
diff --git a/apps/tests/layouts/layout-helper.android.ts b/apps/tests/ui/layouts/layout-helper.android.ts
similarity index 99%
rename from apps/tests/layouts/layout-helper.android.ts
rename to apps/tests/ui/layouts/layout-helper.android.ts
index 83ad1da07..33eec9f32 100644
--- a/apps/tests/layouts/layout-helper.android.ts
+++ b/apps/tests/ui/layouts/layout-helper.android.ts
@@ -3,7 +3,7 @@ import {StackLayout} from "ui/layouts/stack-layout";
 import {GridLayout} from "ui/layouts/grid-layout";
 
 import utils = require("utils/utils");
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import def = require("./layout-helper");
 
 var DELTA = 0.1;
diff --git a/apps/tests/layouts/layout-helper.d.ts b/apps/tests/ui/layouts/layout-helper.d.ts
similarity index 100%
rename from apps/tests/layouts/layout-helper.d.ts
rename to apps/tests/ui/layouts/layout-helper.d.ts
diff --git a/apps/tests/layouts/layout-helper.ios.ts b/apps/tests/ui/layouts/layout-helper.ios.ts
similarity index 99%
rename from apps/tests/layouts/layout-helper.ios.ts
rename to apps/tests/ui/layouts/layout-helper.ios.ts
index ad399eb7b..acb7498ad 100644
--- a/apps/tests/layouts/layout-helper.ios.ts
+++ b/apps/tests/ui/layouts/layout-helper.ios.ts
@@ -2,7 +2,7 @@
 import {StackLayout} from "ui/layouts/stack-layout";
 import {GridLayout} from "ui/layouts/grid-layout";
 import utils = require("utils/utils");
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import def = require("./layout-helper");
 
 var DELTA = 0.1;
@@ -197,4 +197,4 @@ export function dp(value: number): number {
 
 export function dip(value: number): number {
     return utils.layout.toDevicePixels(value);
-}
\ No newline at end of file
+}
diff --git a/apps/tests/layouts/stack-layout-tests.ts b/apps/tests/ui/layouts/stack-layout-tests.ts
similarity index 99%
rename from apps/tests/layouts/stack-layout-tests.ts
rename to apps/tests/ui/layouts/stack-layout-tests.ts
index 4c0c5a472..8a0be9256 100644
--- a/apps/tests/layouts/stack-layout-tests.ts
+++ b/apps/tests/ui/layouts/stack-layout-tests.ts
@@ -1,10 +1,10 @@
 import {StackLayout} from "ui/layouts/stack-layout";
 import {Button} from "ui/button";
-import TKUnit = require("../TKUnit");
+import TKUnit = require("../../TKUnit");
 import helper = require("./layout-helper");
 import enums = require("ui/enums");
 import utils = require("utils/utils");
-import testModule = require("../ui-test");
+import testModule = require("../../ui-test");
 import layoutHelper = require("./layout-helper");
 import commonTests = require("./common-layout-tests");
 
diff --git a/apps/tests/layouts/stack-layout.md b/apps/tests/ui/layouts/stack-layout.md
similarity index 100%
rename from apps/tests/layouts/stack-layout.md
rename to apps/tests/ui/layouts/stack-layout.md
diff --git a/apps/tests/layouts/wrap-layout-tests.ts b/apps/tests/ui/layouts/wrap-layout-tests.ts
similarity index 99%
rename from apps/tests/layouts/wrap-layout-tests.ts
rename to apps/tests/ui/layouts/wrap-layout-tests.ts
index 9c6ec4cbf..784350ea0 100644
--- a/apps/tests/layouts/wrap-layout-tests.ts
+++ b/apps/tests/ui/layouts/wrap-layout-tests.ts
@@ -1,7 +1,7 @@
 import TKUnit = require("../TKUnit");
 import {Label} from "ui/label";
 import layoutHelper = require("./layout-helper");
-import testModule = require("../ui-test");
+import testModule = require("../../ui-test");
 import commonTests = require("./common-layout-tests");
 
 // >> wrap-layout-require
diff --git a/apps/tests/layouts/wrap-layout.md b/apps/tests/ui/layouts/wrap-layout.md
similarity index 100%
rename from apps/tests/layouts/wrap-layout.md
rename to apps/tests/ui/layouts/wrap-layout.md