diff --git a/.gitignore b/.gitignore
index 93823e75a..9c7808b56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@ TestRunResult.txt
 tns-core-modules.base.d.ts
 tns-core-modules.d.ts
 tns-core-modules.es6.d.ts
+
+tests/platforms/
+tests/lib/
diff --git a/gruntfile.js b/gruntfile.js
index 6aa438984..870f6c842 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -1,6 +1,7 @@
 var tsconfig = require('./tsconfig.json');
 var shelljs = require("shelljs");
 var path = require("path");
+var fs=require("fs");
 
 module.exports = function(grunt) {
     if (grunt.option('profile')) {
@@ -14,9 +15,6 @@ module.exports = function(grunt) {
         return;
     }
 
-    var fs=require("fs");
-    var pathModule=require("path");
-
     var tsLintOption = grunt.option('runtslint');
     var skipTsLint = tsLintOption == 'false' || tsLintOption == false;
     if (tsLintOption == null) {
@@ -122,38 +120,40 @@ module.exports = function(grunt) {
 
     var getSubDirs = function(dir) {
         return shelljs.ls(dir).filter(function (subDir) {
-            return shelljs.test('-d', pathModule.join(dir, subDir));
+            return shelljs.test('-d', path.join(dir, subDir));
         });
     };
 
     var getApps = function() {
         var allApps = getSubDirs(localCfg.srcAppsDir);
         if (grunt.option('test-app-only')) {
-            allApps = allApps.filter(function(appName) {
-                return appName === 'tests';
+            allApps = allApps.filter(function(app) {
+                return app === 'tests';
             });
         }
         return allApps;
     };
 
+    var outDir = tsconfig.compilerOptions.outDir || "./bin/dist";
     var localCfg = {
         srcDir: ".",
         srcAppsDir: "./apps",
-        srcAppsTests: "./apps/tests",
-        packageJsonFilePath: "./package.json",
-        outDir: "./bin/dist",
+        srcAppsTestsDir: "./tests/app",
+        packageJsonFilePath: "./tns-core-modules/package.json",
         outArticlesDir: "./bin/dist/articles",
-        outModulesDir: tsconfig.compilerOptions.outDir || "./bin/dist/modules",
+        outDir: outDir,
+        outTnsCoreModules: path.join(outDir, "tns-core-modules"),
         outAppsDir: "./bin/dist/apps",
-        outTsAppsDir: "./bin/dist/ts-apps",
+        outAppsTestsDir: "./bin/dist/tests/app",
+        outTsAppsTestsDir: "./bin/dist/ts-tests/app",
+        outTsAppsDir: "./bin/dist/ts-apps/app",
         outApiRefDir: "./bin/dist/apiref"
     };
 
     var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
-    nodeTestEnv.NODE_PATH = localCfg.outModulesDir;
-
-    localCfg.nodeTestsDir = pathModule.join(localCfg.outModulesDir, 'node-tests');
+    nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules
 
+    localCfg.nodeTestsDir = path.join(localCfg.outDir, 'node-tests');
 
     localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
     localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
@@ -161,18 +161,20 @@ module.exports = function(grunt) {
     localCfg.typeScriptSrc = tsconfig.filesGlob;
     localCfg.defaultExcludes = localCfg.typeScriptSrc.filter(function(item) { return /^!/.test(item); });
     localCfg.typeScriptSrcForTsLint = localCfg.typeScriptSrc.concat([
-            "!ios.d.ts",
-            "!android17.d.ts",
-            "!libjs.d.ts"
+        "!tns-core-modules/ios.d.ts",
+        "!tns-core-modules/android17.d.ts",
+        "!tns-core-modules/libjs.d.ts",
+        "!tests/node_modules/"
     ]);
     localCfg.srcTsdFiles = [
         "**/*.d.ts",
         "!apps/**",
+        "!tests/**",
         "!node-tests/**",
-        "!org.nativescript.widgets.d.ts",
-        "!android17.d.ts",
+        "!tns-core-modules/org.nativescript.widgets.d.ts",
+        "!tns-core-modules/android17.d.ts",
         "!**/*.android.d.ts",
-        "!ios.d.ts",
+        "!tns-core-modules/ios.d.ts",
         "!**/*.ios.d.ts"
     ].concat(localCfg.defaultExcludes);
 
@@ -181,9 +183,9 @@ module.exports = function(grunt) {
     tsOptions.removeComments = !grunt.option('leavecomments') || '';
     tsOptions.compiler = "node_modules/typescript/bin/tsc";
     tsOptions.failOnTypeErrors = true;
-    tsOptions.outDir = localCfg.outModulesDir;
+    tsOptions.outDir = localCfg.outDir;
     var removeCommentsArgument = tsOptions.removeComments ? " --removeComments" : "";
-    tsOptions.additionalFlags = "--outDir " + localCfg.outModulesDir + removeCommentsArgument;
+    tsOptions.additionalFlags = "--outDir " + localCfg.outDir + removeCommentsArgument;
 
     grunt.initConfig({
         localCfg : localCfg,
@@ -199,13 +201,13 @@ module.exports = function(grunt) {
                     "_references.js",
                     "**/*.map"
                 ],
-                cwd: localCfg.outModulesDir
+                cwd: localCfg.outDir
             },
             nodeTests: {
                 src: localCfg.nodeTestsDir,
             },
             builtModules: {
-                src: localCfg.outModulesDir
+                src: localCfg.outDir
             },
             externalModules: {
                 expand: true,
@@ -214,9 +216,6 @@ module.exports = function(grunt) {
                     force: true
                 },
             },
-            readyAppFiles: {
-                src: [localCfg.outModulesDir + "/apps/**"]
-            },
             articles: {
                 src: [ localCfg.outArticlesDir ]
             },
@@ -228,26 +227,26 @@ module.exports = function(grunt) {
             jsLibs: {
                 expand: true,
                 src: [
-                    "js-libs/**/*.js",
-                    "fetch/**/*.js",
-                    "css/**/*.js",
-                    "css-value/**/*.js",
+                    "tns-core-modules/js-libs/**/*.js",
+                    "tns-core-modules/fetch/**/*.js",
+                    "tns-core-modules/css/**/*.js",
+                    "tns-core-modules/css-value/**/*.js",
                 ],
-                dest: localCfg.outModulesDir,
+                dest: localCfg.outDir,
                 cwd: localCfg.srcDir
             },
             articleMDs: {
                 expand: true,
                 src: [ "**/*.md" ],
                 dest: localCfg.outArticlesDir,
-                cwd: localCfg.srcAppsTests
+                cwd: localCfg.srcAppsTestsDir
             },
             license: {
                 expand: true,
                 src: [
                     "./LICENSE",
                 ],
-                dest: "<%= localCfg.outModulesDir %>/",
+                dest: localCfg.outTnsCoreModules,
                 cwd: localCfg.srcDir
             },
             appLicense: {
@@ -269,7 +268,7 @@ module.exports = function(grunt) {
                     "!ios.d.ts",
                     "!**/*.ios.d.ts",
                 ].concat(localCfg.defaultExcludes),
-                dest: localCfg.outModulesDir + "/",
+                dest: localCfg.outDir + "/",
                 expand: true,
                 options: {
                     process: filterTypeScriptFiles
@@ -278,7 +277,7 @@ module.exports = function(grunt) {
             modulesPackageDef: {
                 expand: true,
                 src: localCfg.packageJsonFilePath,
-                dest: localCfg.outModulesDir + "/",
+                dest: localCfg.outDir + "/",
                 options: {
                     process: updateModulesPackageDef
                 }
@@ -303,7 +302,7 @@ module.exports = function(grunt) {
                     "!node_modules/**/*.*",
                     "!" + localCfg.outDir + "/**/*.*"
                 ],
-                dest: localCfg.outModulesDir + "/"
+                dest: localCfg.outDir + "/"
             },
             rawAppsFiles: {
                 expand: true,
@@ -311,20 +310,33 @@ module.exports = function(grunt) {
                     "**/*.*",
                     "**/*",
                     "!**/*.map",
-                        "!**/*.ts"
+                    "!**/*.ts"
                 ],
                 dest: localCfg.outAppsDir,
                 cwd: localCfg.srcAppsDir,
                 dot: true
             },
+            rawTestsFiles: {
+                expand: true,
+                src: [
+                    "**/*.*",
+                    "**/*",
+                    "!**/*.map",
+                    "!**/*.ts"
+                ],
+                dest: localCfg.outAppsTestsDir,
+                cwd: localCfg.srcAppsTestsDir,
+                dot: true
+            },
             readyAppFiles: {
                 expand: true,
                 src: ["./**/*.*"],
                 dest: localCfg.outAppsDir + "/",
-                cwd: localCfg.outModulesDir + "/apps/",
-                options: {
-                    process: processAppFile
-                }
+                cwd: localCfg.outDir + "/apps/",
+                // WARNING: Why not insert BOMs in .png files?
+                // options: {
+                //     process: processAppFile
+                // }
             },
             readyTsAppFiles: {
                 expand: true,
@@ -332,6 +344,12 @@ module.exports = function(grunt) {
                 dest: localCfg.outTsAppsDir + "/",
                 cwd: localCfg.srcAppsDir
             },
+            readyTsAppsTestsFiles: {
+                expand: true,
+                src: ["./**/*.*", "!./**/*.map"],
+                dest: localCfg.outTsAppsTestsDir + "/",
+                cwd: localCfg.srcAppsTestsDir
+            },
             readyPackages: {
                 expand: true,
                 src: ["./**/*.tgz"],
@@ -348,7 +366,7 @@ module.exports = function(grunt) {
                     '!node_modules/**/*',
                     '!node-tests/**/*',
                 ],
-                cwd: localCfg.outModulesDir,
+                cwd: localCfg.outDir,
                 dest: "<%= grunt.option('path') %>/node_modules/tns-core-modules/",
             }
         },
@@ -358,8 +376,8 @@ module.exports = function(grunt) {
                     tsconfig: 'tsconfig.json',
                     passThrough: true,
                 },
-                outDir: localCfg.outModulesDir,
-                dest: localCfg.outModulesDir,
+                outDir: localCfg.outDir,
+                dest: localCfg.outDir,
                 options: tsOptions
             },
             "build-inplace": {
@@ -373,14 +391,14 @@ module.exports = function(grunt) {
             },
             buildNodeTests: {
                 src: [
-                        'js-libs/easysax/**/*.ts',
-                        'module.d.ts',
-                        'xml/**/*.ts',
-                        'node-tests/**/*.ts',
-                        'es-collections.d.ts',
-                    ],
-                outDir: localCfg.outModulesDir,
-                dest: localCfg.outModulesDir,
+                    'tns-core-modules/js-libs/easysax/**/*.ts',
+                    'tns-core-modules/module.d.ts',
+                    'tns-core-modules/xml/**/*.ts',
+                    'tns-core-modules/es-collections.d.ts',
+                    'node-tests/**/*.ts',
+                ],
+                outDir: localCfg.outDir,
+                dest: localCfg.outDir,
                 options: tsOptions
             },
             buildDts: {
@@ -389,21 +407,22 @@ module.exports = function(grunt) {
                     '!org.nativescript.widgets.d.ts',
                     '!**/*.android.d.ts',
                     '!node_modules/**/*',
+                    '!tests/node_modules/**/*.*',
                     '!bin/**/*',
                     '!apps/**/*',
                     '!android17.d.ts',
                     '!ios.d.ts',
                 ],
-                outDir: localCfg.outModulesDir,
-                dest: localCfg.outModulesDir,
+                outDir: localCfg.outDir,
+                dest: localCfg.outDir,
                 options: tsOptions
             },
             testCombinedDts: {
                 src: [
-                    pathModule.join(localCfg.outModulesDir, 'tns-core-modules.d.ts'),
+                    path.join(localCfg.outTnsCoreModules, 'tns-core-modules.d.ts'),
                 ],
-                outDir: localCfg.outModulesDir,
-                dest: localCfg.outModulesDir,
+                outDir: localCfg.outDir,
+                dest: localCfg.outDir,
                 options: tsOptions
             }
         },
@@ -420,7 +439,7 @@ module.exports = function(grunt) {
         exec: {
             packModules: {
                 cmd: "npm pack",
-                cwd: localCfg.outModulesDir + "/"
+                cwd: localCfg.outTnsCoreModules + "/"
             },
             packApp: {
                 cmd: "npm pack",
@@ -430,7 +449,7 @@ module.exports = function(grunt) {
                 cmd: "grunt simplemocha:node"
             },
             injectArticleSnippets: {
-                cmd: "node node_modules/markdown-snippet-injector/index.js --root=<%= localCfg.srcAppsTests %> --docsroot=<%= localCfg.outArticlesDir %>"
+                cmd: "node node_modules/markdown-snippet-injector/index.js --root=<%= localCfg.srcAppsTestsDir %> --docsroot=<%= localCfg.outArticlesDir %>"
             }
         },
         multidest: {
@@ -440,9 +459,11 @@ module.exports = function(grunt) {
                     var apps = getApps();
                     var targetDirs = [];
                     apps.forEach(function(item){
-                        targetDirs.push(pathModule.join(localCfg.outAppsDir, item));
-                        targetDirs.push(pathModule.join(localCfg.outTsAppsDir, item));
+                        targetDirs.push(path.join(localCfg.outAppsDir, item));
+                        targetDirs.push(path.join(localCfg.outTsAppsDir, item));
                     });
+                    targetDirs.push(localCfg.outAppsTestsDir);
+                    targetDirs.push(localCfg.outTsAppsTestsDir);
                     return targetDirs;
                 }()
             }
@@ -462,7 +483,7 @@ module.exports = function(grunt) {
         },
         env: {
             nodeTests: {
-                NODE_PATH: localCfg.outModulesDir,
+                NODE_PATH: nodeTestEnv.NODE_PATH,
             }
         },
         typedoc: {
@@ -492,16 +513,16 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-simple-mocha");
     grunt.loadNpmTasks('grunt-typedoc');
 
-    var cloneTasks = function(originalTasks, taskNameSuffix) {
+    var cloneTasks = function(originalTasks, app) {
         var clonedTasks = [];
         for(var i=0; i<originalTasks.length; i++) {
             var originalTask = originalTasks[i];
 
             var taskCfg = grunt.util._.clone(grunt.config(originalTask.name));
             var taskName = grunt.util._.clone(originalTask.name);
-            taskName[1] = taskName[1] + "_" + taskNameSuffix;
+            taskName[1] = taskName[1] + "_" + app;
 
-            originalTask.specializeCfg(taskCfg, taskNameSuffix);
+            originalTask.specializeCfg(taskCfg, app);
 
             clonedTasks.push({name: taskName, cfg: taskCfg});
         }
@@ -519,7 +540,7 @@ module.exports = function(grunt) {
         var dtsLines = dtsFiles.map(function(dtsFile) {
             return '/// <reference path="' + dtsFile + '" />';
         });
-        var combinedDtsPath = pathModule.join(outDir, outFile);
+        var combinedDtsPath = path.join(outDir, outFile);
         grunt.file.write(combinedDtsPath, dtsLines.join('\n'));
     }
     function generateModulesDts(outDir) {
@@ -536,10 +557,11 @@ module.exports = function(grunt) {
         var es6Excludes = nonES6Files.map(function(file) {
             return '!' + file;
         })
-        var dtsFiles = grunt.file.expand({cwd: outDir}, [
+        var dtsFiles = grunt.file.expand({cwd: localCfg.outTnsCoreModules }, [
             "**/*.d.ts",
             //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
             "!apps/**",
+            "!tests/**",
             "!ts-apps/**",
             "!node-tests/**",
             "!org.nativescript.widgets.d.ts",
@@ -549,39 +571,55 @@ module.exports = function(grunt) {
             "!**/*.ios.d.ts",
             "!tns-core-modules.d.ts",
             "!tns-core-modules.es6.d.ts",
-            "!tns-core-modules.base.d.ts",
+            "!tns-core-modules.base.d.ts"
         ].concat(localCfg.defaultExcludes).concat(es6Excludes).concat(angularExcludes));
         dtsFiles.sort();
 
-        writeDtsFile(dtsFiles, outDir, 'tns-core-modules.base.d.ts');
+        writeDtsFile(dtsFiles, outDir, 'tns-core-modules/tns-core-modules.base.d.ts');
         var es6Files = angularConflicts.concat(['tns-core-modules.base.d.ts']);
-        writeDtsFile(es6Files, outDir, 'tns-core-modules.es6.d.ts');
+        writeDtsFile(es6Files, outDir, 'tns-core-modules/tns-core-modules.es6.d.ts');
         var allFiles = angularConflicts.concat(nonES6Files).concat(['tns-core-modules.base.d.ts']);
-        writeDtsFile(allFiles, outDir, 'tns-core-modules.d.ts');
+        writeDtsFile(allFiles, outDir, 'tns-core-modules/tns-core-modules.d.ts');
     };
-
-    grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
-        var allApps = getApps();
-        if (grunt.option('test-app-only')) {
-            allApps = allApps.filter(function(appName) {
-                return appName === 'tests';
-            });
-        }
+    
+    grunt.registerTask("processTestsApp", function(outTestsAppDir, pkgAppNameSuffix) {
         var tasks = [
             {
                 name: ["copy", "appPackageDef"],
-                specializeCfg: function (cfg, currentAppName) {
-                    outAppDir = pathModule.join(outAppsDir, currentAppName);
-                    var pkgFilePath = pathModule.join(outAppDir, "package.json");
-                    cfg.src = pkgFilePath;
-                    cfg.dest = outAppDir;
-                    cfg.appName = currentAppName + (pkgAppNameSuffix || "");
+                specializeCfg: function (cfg, app) {
+                    cfg.src = path.join(outTestsAppDir, "package.json");
+                    cfg.dest = outTestsAppDir;
+                    cfg.appName = "tests" + (pkgAppNameSuffix || "");
                 }
             },
             {
                 name: ["exec", "packApp"],
-                specializeCfg: function(cfg, currentAppName) {
-                    cfg.cwd = pathModule.join(outAppsDir, currentAppName);
+                specializeCfg: function(cfg, app) {
+                    cfg.cwd = outTestsAppDir;
+                }
+            }
+        ];
+        var clonedTasks = cloneTasks(tasks, "tests");
+        enqueueTasks(clonedTasks);
+    });
+
+    grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
+        var allApps = getApps();
+        var tasks = [
+            {
+                name: ["copy", "appPackageDef"],
+                specializeCfg: function (cfg, app) {
+                    outAppDir = path.join(outAppsDir, app);
+                    var pkgFilePath = path.join(outAppDir, "package.json");
+                    cfg.src = pkgFilePath;
+                    cfg.dest = outAppDir;
+                    cfg.appName = app + (pkgAppNameSuffix || "");
+                }
+            },
+            {
+                name: ["exec", "packApp"],
+                specializeCfg: function(cfg, app) {
+                    cfg.cwd = path.join(outAppsDir, app);
                 }
             }
         ];
@@ -598,6 +636,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask("collect-apps-raw-files", [
         "copy:rawAppsFiles",
+        "copy:rawTestsFiles",
         "multidest:copyLicenseFiles"
     ]);
 
@@ -631,8 +670,7 @@ module.exports = function(grunt) {
         "copy:builtModules"
     ]);
     grunt.registerTask("distribute-apps-files", [
-            "copy:readyAppFiles",
-            "clean:readyAppFiles"
+            "copy:readyAppFiles"
     ]);
     grunt.registerTask("check-packagejson-boms", function() {
         function hasBOM(filepath) {
@@ -654,17 +692,18 @@ module.exports = function(grunt) {
             grunt.fail.fatal("\n" + errors.join("\n"));
     });
     grunt.registerTask("distribute-ts-apps-files", [
-            "copy:readyTsAppFiles"
+            "copy:readyTsAppFiles",
+            "copy:readyTsAppsTestsFiles"
     ]);
     grunt.registerTask("herdArticles", function() {
         var moveSinglesUp = function(dir) {
             var objs = fs.readdirSync(dir);
             for (var i=0; i<objs.length; i++) {
                 var obj = objs[i];
-                var fullPath = pathModule.join(dir, obj);
+                var fullPath = path.join(dir, obj);
                 if (objs.length == 1) {
-                    var parentDir = pathModule.dirname(dir);
-                    var newPath = pathModule.join(parentDir, obj);
+                    var parentDir = path.dirname(dir);
+                    var newPath = path.join(parentDir, obj);
                     fs.renameSync(fullPath, newPath);
                     fs.rmdirSync(dir);
                 } else {
@@ -680,7 +719,7 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask("generate-tns-core-modules-dev-dts", generateModulesDts.bind(null, "."));
-    grunt.registerTask("generate-tns-core-modules-dts", generateModulesDts.bind(null, localCfg.outModulesDir));
+    grunt.registerTask("generate-tns-core-modules-dts", generateModulesDts.bind(null, localCfg.outDir));
     //aliasing pack-modules for backwards compatibility
     grunt.registerTask("pack-modules", [
         "compile-modules",
@@ -688,9 +727,11 @@ module.exports = function(grunt) {
         "exec:packModules"
     ]);
     grunt.registerTask("pack-apps", [
+        "processTestsApp:" + localCfg.outAppsTestsDir,
         "processEachApp:" + localCfg.outAppsDir
     ]);
     grunt.registerTask("pack-ts-apps", [
+        "processTestsApp:" + localCfg.outTsAppsTestsDir + ":-ts",
         "processEachApp:" + localCfg.outTsAppsDir + ":-ts"
     ]);
     grunt.registerTask("get-ready-packages", [
diff --git a/package.json b/package.json
index fce092c3a..3271b6a0d 100644
--- a/package.json
+++ b/package.json
@@ -1,26 +1,4 @@
 {
-  "name": "tns-core-modules",
-  "description": "Telerik NativeScript Core Modules",
-  "version": "2.1.0",
-  "homepage":"https://www.nativescript.org",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/NativeScript/NativeScript"
-  },
-  "files": [
-    "**/*.d.ts",
-    "**/*.js",
-    "!android17.d.ts",
-    "!ios.d.ts",
-    "!bin/",
-    "!apps/",
-    "!build/",
-    "!node-tests/",
-    "!declarations.android.d.ts",
-    "!declarations.ios.d.ts",
-    "!gruntfile.js",
-    "!org.nativescript.widgets.d.ts"
-  ],
   "license": "Apache-2.0",
   "devDependencies": {
     "chai": "3.2.0",
@@ -43,15 +21,5 @@
     "time-grunt": "1.3.0",
     "tslint": "3.4.0",
     "typescript": "1.8.2"
-  },
-  "typings": "tns-core-modules.d.ts",
-  "dependencies": {
-    "tns-core-modules-widgets": "next"
-  },
-  "nativescript": {
-    "platforms": {
-      "ios": "2.0.0",
-      "android": "2.0.0"
-    }
   }
 }
diff --git a/tests/app/App_Resources/Android/AndroidManifest.xml b/tests/app/App_Resources/Android/AndroidManifest.xml
new file mode 100644
index 000000000..8d827dc8d
--- /dev/null
+++ b/tests/app/App_Resources/Android/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="__PACKAGE__"
+	android:versionCode="1"
+	android:versionName="1.0">
+
+	<supports-screens
+		android:smallScreens="true"
+		android:normalScreens="true"
+		android:largeScreens="true"
+		android:xlargeScreens="true"/>
+
+	<uses-sdk
+		android:minSdkVersion="17"
+		android:targetSdkVersion="__APILEVEL__"/>
+
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+
+	<application
+		android:name="com.tns.NativeScriptApplication"
+		android:allowBackup="true"
+		android:icon="@drawable/icon"
+		android:label="@string/app_name"
+		android:theme="@style/AppTheme" >
+		<activity
+			android:name="com.tns.NativeScriptActivity"
+			android:label="@string/title_activity_kimera"
+			android:configChanges="keyboardHidden|orientation|screenSize">
+
+				<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.tns.ErrorReportActivity"/>
+	</application>
+</manifest>
diff --git a/tests/app/App_Resources/Android/app.gradle b/tests/app/App_Resources/Android/app.gradle
new file mode 100644
index 000000000..725fb59b1
--- /dev/null
+++ b/tests/app/App_Resources/Android/app.gradle
@@ -0,0 +1,15 @@
+// Add your native dependencies here:
+
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	compile 'com.android.support:recyclerview-v7:+'
+//}
+
+android {  
+  defaultConfig {  
+    generatedDensities = []  
+  }  
+  aaptOptions {  
+    additionalParameters "--no-version-vectors"  
+  }  
+} 
diff --git a/tests/app/App_Resources/Android/drawable-hdpi/icon.png b/tests/app/App_Resources/Android/drawable-hdpi/icon.png
new file mode 100755
index 000000000..1034356e2
Binary files /dev/null and b/tests/app/App_Resources/Android/drawable-hdpi/icon.png differ
diff --git a/tests/app/App_Resources/Android/drawable-ldpi/icon.png b/tests/app/App_Resources/Android/drawable-ldpi/icon.png
new file mode 100755
index 000000000..ddfc17a71
Binary files /dev/null and b/tests/app/App_Resources/Android/drawable-ldpi/icon.png differ
diff --git a/tests/app/App_Resources/Android/drawable-mdpi/icon.png b/tests/app/App_Resources/Android/drawable-mdpi/icon.png
new file mode 100755
index 000000000..486e41091
Binary files /dev/null and b/tests/app/App_Resources/Android/drawable-mdpi/icon.png differ
diff --git a/tests/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png b/tests/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png
new file mode 100644
index 000000000..bd53be2ec
Binary files /dev/null and b/tests/app/App_Resources/Android/drawable-nodpi/splashscreen.9.png differ
diff --git a/tests/app/App_Resources/iOS/Default-568h@2x.png b/tests/app/App_Resources/iOS/Default-568h@2x.png
new file mode 100755
index 000000000..d7f17fcd2
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-568h@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-667h@2x.png b/tests/app/App_Resources/iOS/Default-667h@2x.png
new file mode 100644
index 000000000..b88415405
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-667h@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-736h@3x.png b/tests/app/App_Resources/iOS/Default-736h@3x.png
new file mode 100644
index 000000000..faab4b631
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-736h@3x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Landscape-568h@2x.png b/tests/app/App_Resources/iOS/Default-Landscape-568h@2x.png
new file mode 100644
index 000000000..d21bd292b
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Landscape-568h@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Landscape-667h@2x.png b/tests/app/App_Resources/iOS/Default-Landscape-667h@2x.png
new file mode 100644
index 000000000..5305bbdf2
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Landscape-667h@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Landscape.png b/tests/app/App_Resources/iOS/Default-Landscape.png
new file mode 100755
index 000000000..3365ba3cd
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Landscape.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Landscape@2x.png b/tests/app/App_Resources/iOS/Default-Landscape@2x.png
new file mode 100755
index 000000000..a44945c1a
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Landscape@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Landscape@3x.png b/tests/app/App_Resources/iOS/Default-Landscape@3x.png
new file mode 100644
index 000000000..e6dca6269
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Landscape@3x.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Portrait.png b/tests/app/App_Resources/iOS/Default-Portrait.png
new file mode 100755
index 000000000..1a5007962
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Portrait.png differ
diff --git a/tests/app/App_Resources/iOS/Default-Portrait@2x.png b/tests/app/App_Resources/iOS/Default-Portrait@2x.png
new file mode 100755
index 000000000..73d8b920f
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default-Portrait@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Default.png b/tests/app/App_Resources/iOS/Default.png
new file mode 100755
index 000000000..9f1f6ce3e
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default.png differ
diff --git a/tests/app/App_Resources/iOS/Default@2x.png b/tests/app/App_Resources/iOS/Default@2x.png
new file mode 100755
index 000000000..514fc5cde
Binary files /dev/null and b/tests/app/App_Resources/iOS/Default@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Icon-Small-50.png b/tests/app/App_Resources/iOS/Icon-Small-50.png
new file mode 100755
index 000000000..4a62478f9
Binary files /dev/null and b/tests/app/App_Resources/iOS/Icon-Small-50.png differ
diff --git a/tests/app/App_Resources/iOS/Icon-Small-50@2x.png b/tests/app/App_Resources/iOS/Icon-Small-50@2x.png
new file mode 100755
index 000000000..01ff7c16c
Binary files /dev/null and b/tests/app/App_Resources/iOS/Icon-Small-50@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Icon-Small.png b/tests/app/App_Resources/iOS/Icon-Small.png
new file mode 100755
index 000000000..9e13a222a
Binary files /dev/null and b/tests/app/App_Resources/iOS/Icon-Small.png differ
diff --git a/tests/app/App_Resources/iOS/Icon-Small@2x.png b/tests/app/App_Resources/iOS/Icon-Small@2x.png
new file mode 100755
index 000000000..89dd84cd8
Binary files /dev/null and b/tests/app/App_Resources/iOS/Icon-Small@2x.png differ
diff --git a/tests/app/App_Resources/iOS/Info.plist b/tests/app/App_Resources/iOS/Info.plist
new file mode 100644
index 000000000..8c9f281bb
--- /dev/null
+++ b/tests/app/App_Resources/iOS/Info.plist
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon.png</string>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>icon-40</string>
+				<string>icon-60</string>
+				<string>icon-72</string>
+				<string>icon-76</string>
+				<string>Icon-Small</string>
+				<string>Icon-Small-50</string>
+			</array>
+			<key>UIPrerenderedIcon</key>
+			<false/>
+		</dict>
+	</dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+</dict>
+</plist>
diff --git a/tests/app/App_Resources/iOS/build.xcconfig b/tests/app/App_Resources/iOS/build.xcconfig
new file mode 100644
index 000000000..26e7a5841
--- /dev/null
+++ b/tests/app/App_Resources/iOS/build.xcconfig
@@ -0,0 +1,5 @@
+// You can add custom settings here
+// for example you can uncomment the following line to force distribution code signing
+// CODE_SIGN_IDENTITY = iPhone Distribution 
+// ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+// ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Brand Assets;
diff --git a/tests/app/App_Resources/iOS/icon-40.png b/tests/app/App_Resources/iOS/icon-40.png
new file mode 100755
index 000000000..9b36ac4fe
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-40.png differ
diff --git a/tests/app/App_Resources/iOS/icon-40@2x.png b/tests/app/App_Resources/iOS/icon-40@2x.png
new file mode 100755
index 000000000..8ce4b8899
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-40@2x.png differ
diff --git a/tests/app/App_Resources/iOS/icon-60.png b/tests/app/App_Resources/iOS/icon-60.png
new file mode 100755
index 000000000..d2e951831
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-60.png differ
diff --git a/tests/app/App_Resources/iOS/icon-60@2x.png b/tests/app/App_Resources/iOS/icon-60@2x.png
new file mode 100755
index 000000000..693f67f66
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-60@2x.png differ
diff --git a/tests/app/App_Resources/iOS/icon-72.png b/tests/app/App_Resources/iOS/icon-72.png
new file mode 100755
index 000000000..556bdd688
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-72.png differ
diff --git a/tests/app/App_Resources/iOS/icon-72@2x.png b/tests/app/App_Resources/iOS/icon-72@2x.png
new file mode 100755
index 000000000..4f69cb25b
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-72@2x.png differ
diff --git a/tests/app/App_Resources/iOS/icon-76.png b/tests/app/App_Resources/iOS/icon-76.png
new file mode 100755
index 000000000..1c659c62a
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-76.png differ
diff --git a/tests/app/App_Resources/iOS/icon-76@2x.png b/tests/app/App_Resources/iOS/icon-76@2x.png
new file mode 100755
index 000000000..bcc126d30
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon-76@2x.png differ
diff --git a/tests/app/App_Resources/iOS/icon.png b/tests/app/App_Resources/iOS/icon.png
new file mode 100755
index 000000000..beea81999
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon.png differ
diff --git a/tests/app/App_Resources/iOS/icon@2x.png b/tests/app/App_Resources/iOS/icon@2x.png
new file mode 100755
index 000000000..c3dc7b035
Binary files /dev/null and b/tests/app/App_Resources/iOS/icon@2x.png differ
diff --git a/tests/app/App_Resources/package.json b/tests/app/App_Resources/package.json
new file mode 100644
index 000000000..08e44e117
--- /dev/null
+++ b/tests/app/App_Resources/package.json
@@ -0,0 +1,2 @@
+{ "name" : "app-resources",
+  "main" : "dummy.js" }
diff --git a/apps/tests/TKUnit.ts b/tests/app/TKUnit.ts
similarity index 100%
rename from apps/tests/TKUnit.ts
rename to tests/app/TKUnit.ts
diff --git a/apps/tests/app/app.ts b/tests/app/app/app.ts
similarity index 100%
rename from apps/tests/app/app.ts
rename to tests/app/app/app.ts
diff --git a/apps/tests/app/location-example.ts b/tests/app/app/location-example.ts
similarity index 100%
rename from apps/tests/app/location-example.ts
rename to tests/app/app/location-example.ts
diff --git a/apps/tests/app/location-example.xml b/tests/app/app/location-example.xml
similarity index 100%
rename from apps/tests/app/location-example.xml
rename to tests/app/app/location-example.xml
diff --git a/apps/tests/app/mainPage.ts b/tests/app/app/mainPage.ts
similarity index 100%
rename from apps/tests/app/mainPage.ts
rename to tests/app/app/mainPage.ts
diff --git a/apps/tests/app/package.json b/tests/app/app/package.json
similarity index 100%
rename from apps/tests/app/package.json
rename to tests/app/app/package.json
diff --git a/apps/tests/app/pageNavigation.ts b/tests/app/app/pageNavigation.ts
similarity index 100%
rename from apps/tests/app/pageNavigation.ts
rename to tests/app/app/pageNavigation.ts
diff --git a/apps/tests/app/style_props.ts b/tests/app/app/style_props.ts
similarity index 100%
rename from apps/tests/app/style_props.ts
rename to tests/app/app/style_props.ts
diff --git a/apps/tests/app/testPage.ts b/tests/app/app/testPage.ts
similarity index 100%
rename from apps/tests/app/testPage.ts
rename to tests/app/app/testPage.ts
diff --git a/apps/tests/app/testPage.xml b/tests/app/app/testPage.xml
similarity index 100%
rename from apps/tests/app/testPage.xml
rename to tests/app/app/testPage.xml
diff --git a/apps/tests/app/testRunnerPage.ts b/tests/app/app/testRunnerPage.ts
similarity index 100%
rename from apps/tests/app/testRunnerPage.ts
rename to tests/app/app/testRunnerPage.ts
diff --git a/apps/tests/application-settings-tests.ts b/tests/app/application-settings-tests.ts
similarity index 100%
rename from apps/tests/application-settings-tests.ts
rename to tests/app/application-settings-tests.ts
diff --git a/apps/tests/application-settings.md b/tests/app/application-settings.md
similarity index 100%
rename from apps/tests/application-settings.md
rename to tests/app/application-settings.md
diff --git a/apps/tests/application-tests-common.ts b/tests/app/application-tests-common.ts
similarity index 100%
rename from apps/tests/application-tests-common.ts
rename to tests/app/application-tests-common.ts
diff --git a/apps/tests/application-tests.android.ts b/tests/app/application-tests.android.ts
similarity index 100%
rename from apps/tests/application-tests.android.ts
rename to tests/app/application-tests.android.ts
diff --git a/apps/tests/application-tests.ios.ts b/tests/app/application-tests.ios.ts
similarity index 100%
rename from apps/tests/application-tests.ios.ts
rename to tests/app/application-tests.ios.ts
diff --git a/apps/tests/application.md b/tests/app/application.md
similarity index 100%
rename from apps/tests/application.md
rename to tests/app/application.md
diff --git a/apps/tests/camera-tests.ts b/tests/app/camera-tests.ts
similarity index 100%
rename from apps/tests/camera-tests.ts
rename to tests/app/camera-tests.ts
diff --git a/apps/tests/camera.md b/tests/app/camera.md
similarity index 100%
rename from apps/tests/camera.md
rename to tests/app/camera.md
diff --git a/apps/tests/color-tests.ts b/tests/app/color-tests.ts
similarity index 100%
rename from apps/tests/color-tests.ts
rename to tests/app/color-tests.ts
diff --git a/apps/tests/color.md b/tests/app/color.md
similarity index 100%
rename from apps/tests/color.md
rename to tests/app/color.md
diff --git a/apps/tests/connectivity-tests.ts b/tests/app/connectivity-tests.ts
similarity index 100%
rename from apps/tests/connectivity-tests.ts
rename to tests/app/connectivity-tests.ts
diff --git a/apps/tests/connectivity.md b/tests/app/connectivity.md
similarity index 100%
rename from apps/tests/connectivity.md
rename to tests/app/connectivity.md
diff --git a/apps/tests/console-tests.ts b/tests/app/console-tests.ts
similarity index 100%
rename from apps/tests/console-tests.ts
rename to tests/app/console-tests.ts
diff --git a/apps/tests/console.md b/tests/app/console.md
similarity index 100%
rename from apps/tests/console.md
rename to tests/app/console.md
diff --git a/apps/tests/data/observable-array-tests.ts b/tests/app/data/observable-array-tests.ts
similarity index 100%
rename from apps/tests/data/observable-array-tests.ts
rename to tests/app/data/observable-array-tests.ts
diff --git a/apps/tests/data/observable-array.md b/tests/app/data/observable-array.md
similarity index 100%
rename from apps/tests/data/observable-array.md
rename to tests/app/data/observable-array.md
diff --git a/apps/tests/data/observable-tests.ts b/tests/app/data/observable-tests.ts
similarity index 100%
rename from apps/tests/data/observable-tests.ts
rename to tests/app/data/observable-tests.ts
diff --git a/apps/tests/data/observable.md b/tests/app/data/observable.md
similarity index 100%
rename from apps/tests/data/observable.md
rename to tests/app/data/observable.md
diff --git a/apps/tests/data/virtual-array-tests.ts b/tests/app/data/virtual-array-tests.ts
similarity index 100%
rename from apps/tests/data/virtual-array-tests.ts
rename to tests/app/data/virtual-array-tests.ts
diff --git a/apps/tests/data/virtual-array.md b/tests/app/data/virtual-array.md
similarity index 100%
rename from apps/tests/data/virtual-array.md
rename to tests/app/data/virtual-array.md
diff --git a/apps/tests/fetch-tests.ts b/tests/app/fetch-tests.ts
similarity index 100%
rename from apps/tests/fetch-tests.ts
rename to tests/app/fetch-tests.ts
diff --git a/apps/tests/fetch.md b/tests/app/fetch.md
similarity index 100%
rename from apps/tests/fetch.md
rename to tests/app/fetch.md
diff --git a/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts b/tests/app/file-name-resolver-tests/file-name-resolver-tests.ts
similarity index 100%
rename from apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
rename to tests/app/file-name-resolver-tests/file-name-resolver-tests.ts
diff --git a/apps/tests/file-name-resolver-tests/files/other.xml b/tests/app/file-name-resolver-tests/files/other.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/other.xml
rename to tests/app/file-name-resolver-tests/files/other.xml
diff --git a/apps/tests/file-name-resolver-tests/files/test.land.xml b/tests/app/file-name-resolver-tests/files/test.land.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/test.land.xml
rename to tests/app/file-name-resolver-tests/files/test.land.xml
diff --git a/apps/tests/file-name-resolver-tests/files/test.minWH600.xml b/tests/app/file-name-resolver-tests/files/test.minWH600.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/test.minWH600.xml
rename to tests/app/file-name-resolver-tests/files/test.minWH600.xml
diff --git a/apps/tests/file-name-resolver-tests/files/test.xml b/tests/app/file-name-resolver-tests/files/test.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/test.xml
rename to tests/app/file-name-resolver-tests/files/test.xml
diff --git a/apps/tests/file-system-access-tests/file-system-access-tests.ts b/tests/app/file-system-access-tests/file-system-access-tests.ts
similarity index 100%
rename from apps/tests/file-system-access-tests/file-system-access-tests.ts
rename to tests/app/file-system-access-tests/file-system-access-tests.ts
diff --git a/apps/tests/file-system-access-tests/folder/file.expected b/tests/app/file-system-access-tests/folder/file.expected
similarity index 100%
rename from apps/tests/file-system-access-tests/folder/file.expected
rename to tests/app/file-system-access-tests/folder/file.expected
diff --git a/apps/tests/file-system-access-tests/xml.expected b/tests/app/file-system-access-tests/xml.expected
similarity index 100%
rename from apps/tests/file-system-access-tests/xml.expected
rename to tests/app/file-system-access-tests/xml.expected
diff --git a/apps/tests/file-system-tests.ts b/tests/app/file-system-tests.ts
similarity index 100%
rename from apps/tests/file-system-tests.ts
rename to tests/app/file-system-tests.ts
diff --git a/apps/tests/file-system.md b/tests/app/file-system.md
similarity index 100%
rename from apps/tests/file-system.md
rename to tests/app/file-system.md
diff --git a/apps/tests/fonts/Roboto-Bold.ttf b/tests/app/fonts/Roboto-Bold.ttf
similarity index 100%
rename from apps/tests/fonts/Roboto-Bold.ttf
rename to tests/app/fonts/Roboto-Bold.ttf
diff --git a/apps/tests/fonts/Roboto-BoldItalic.ttf b/tests/app/fonts/Roboto-BoldItalic.ttf
similarity index 100%
rename from apps/tests/fonts/Roboto-BoldItalic.ttf
rename to tests/app/fonts/Roboto-BoldItalic.ttf
diff --git a/apps/tests/fonts/Roboto-Italic.ttf b/tests/app/fonts/Roboto-Italic.ttf
similarity index 100%
rename from apps/tests/fonts/Roboto-Italic.ttf
rename to tests/app/fonts/Roboto-Italic.ttf
diff --git a/apps/tests/fonts/Roboto-Regular.ttf b/tests/app/fonts/Roboto-Regular.ttf
similarity index 100%
rename from apps/tests/fonts/Roboto-Regular.ttf
rename to tests/app/fonts/Roboto-Regular.ttf
diff --git a/apps/tests/fps-meter-tests.ts b/tests/app/fps-meter-tests.ts
similarity index 100%
rename from apps/tests/fps-meter-tests.ts
rename to tests/app/fps-meter-tests.ts
diff --git a/apps/tests/fps-meter.md b/tests/app/fps-meter.md
similarity index 100%
rename from apps/tests/fps-meter.md
rename to tests/app/fps-meter.md
diff --git a/apps/tests/http-tests.ts b/tests/app/http-tests.ts
similarity index 100%
rename from apps/tests/http-tests.ts
rename to tests/app/http-tests.ts
diff --git a/apps/tests/http.md b/tests/app/http.md
similarity index 100%
rename from apps/tests/http.md
rename to tests/app/http.md
diff --git a/apps/tests/image-source-tests.ts b/tests/app/image-source-tests.ts
similarity index 100%
rename from apps/tests/image-source-tests.ts
rename to tests/app/image-source-tests.ts
diff --git a/apps/tests/image-source.md b/tests/app/image-source.md
similarity index 100%
rename from apps/tests/image-source.md
rename to tests/app/image-source.md
diff --git a/apps/tests/location-tests.ts b/tests/app/location-tests.ts
similarity index 100%
rename from apps/tests/location-tests.ts
rename to tests/app/location-tests.ts
diff --git a/apps/tests/location.md b/tests/app/location.md
similarity index 100%
rename from apps/tests/location.md
rename to tests/app/location.md
diff --git a/apps/tests/logo.png b/tests/app/logo.png
similarity index 100%
rename from apps/tests/logo.png
rename to tests/app/logo.png
diff --git a/apps/tests/navigation/custom-transition.android.ts b/tests/app/navigation/custom-transition.android.ts
similarity index 100%
rename from apps/tests/navigation/custom-transition.android.ts
rename to tests/app/navigation/custom-transition.android.ts
diff --git a/apps/tests/navigation/custom-transition.ios.ts b/tests/app/navigation/custom-transition.ios.ts
similarity index 100%
rename from apps/tests/navigation/custom-transition.ios.ts
rename to tests/app/navigation/custom-transition.ios.ts
diff --git a/apps/tests/navigation/navigation-tests.ts b/tests/app/navigation/navigation-tests.ts
similarity index 100%
rename from apps/tests/navigation/navigation-tests.ts
rename to tests/app/navigation/navigation-tests.ts
diff --git a/apps/tests/navigation/transition-tests.ts b/tests/app/navigation/transition-tests.ts
similarity index 100%
rename from apps/tests/navigation/transition-tests.ts
rename to tests/app/navigation/transition-tests.ts
diff --git a/apps/tests/package.json b/tests/app/package.json
similarity index 100%
rename from apps/tests/package.json
rename to tests/app/package.json
diff --git a/apps/tests/pages/app.ts b/tests/app/pages/app.ts
similarity index 100%
rename from apps/tests/pages/app.ts
rename to tests/app/pages/app.ts
diff --git a/apps/tests/pages/background-test.ts b/tests/app/pages/background-test.ts
similarity index 100%
rename from apps/tests/pages/background-test.ts
rename to tests/app/pages/background-test.ts
diff --git a/apps/tests/pages/background-test.xml b/tests/app/pages/background-test.xml
similarity index 100%
rename from apps/tests/pages/background-test.xml
rename to tests/app/pages/background-test.xml
diff --git a/apps/tests/pages/file-load-test.ts b/tests/app/pages/file-load-test.ts
similarity index 100%
rename from apps/tests/pages/file-load-test.ts
rename to tests/app/pages/file-load-test.ts
diff --git a/apps/tests/pages/fonts-test.ts b/tests/app/pages/fonts-test.ts
similarity index 100%
rename from apps/tests/pages/fonts-test.ts
rename to tests/app/pages/fonts-test.ts
diff --git a/apps/tests/pages/fonts-test.xml b/tests/app/pages/fonts-test.xml
similarity index 100%
rename from apps/tests/pages/fonts-test.xml
rename to tests/app/pages/fonts-test.xml
diff --git a/apps/tests/pages/navigation/pageA-new-activity.ts b/tests/app/pages/navigation/pageA-new-activity.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageA-new-activity.ts
rename to tests/app/pages/navigation/pageA-new-activity.ts
diff --git a/apps/tests/pages/navigation/pageA.ts b/tests/app/pages/navigation/pageA.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageA.ts
rename to tests/app/pages/navigation/pageA.ts
diff --git a/apps/tests/pages/navigation/pageB-new-activity.ts b/tests/app/pages/navigation/pageB-new-activity.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageB-new-activity.ts
rename to tests/app/pages/navigation/pageB-new-activity.ts
diff --git a/apps/tests/pages/navigation/pageB.ts b/tests/app/pages/navigation/pageB.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageB.ts
rename to tests/app/pages/navigation/pageB.ts
diff --git a/apps/tests/pages/navigation/pageC-new-activity.ts b/tests/app/pages/navigation/pageC-new-activity.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageC-new-activity.ts
rename to tests/app/pages/navigation/pageC-new-activity.ts
diff --git a/apps/tests/pages/navigation/pageC.ts b/tests/app/pages/navigation/pageC.ts
similarity index 100%
rename from apps/tests/pages/navigation/pageC.ts
rename to tests/app/pages/navigation/pageC.ts
diff --git a/apps/tests/pages/package.json b/tests/app/pages/package.json
similarity index 100%
rename from apps/tests/pages/package.json
rename to tests/app/pages/package.json
diff --git a/apps/tests/pages/page10.ts b/tests/app/pages/page10.ts
similarity index 100%
rename from apps/tests/pages/page10.ts
rename to tests/app/pages/page10.ts
diff --git a/apps/tests/pages/page11.ts b/tests/app/pages/page11.ts
similarity index 100%
rename from apps/tests/pages/page11.ts
rename to tests/app/pages/page11.ts
diff --git a/apps/tests/pages/page12.ts b/tests/app/pages/page12.ts
similarity index 100%
rename from apps/tests/pages/page12.ts
rename to tests/app/pages/page12.ts
diff --git a/apps/tests/pages/page13.ts b/tests/app/pages/page13.ts
similarity index 100%
rename from apps/tests/pages/page13.ts
rename to tests/app/pages/page13.ts
diff --git a/apps/tests/pages/page14.xml b/tests/app/pages/page14.xml
similarity index 100%
rename from apps/tests/pages/page14.xml
rename to tests/app/pages/page14.xml
diff --git a/apps/tests/pages/page15.ts b/tests/app/pages/page15.ts
similarity index 100%
rename from apps/tests/pages/page15.ts
rename to tests/app/pages/page15.ts
diff --git a/apps/tests/pages/page16.ts b/tests/app/pages/page16.ts
similarity index 100%
rename from apps/tests/pages/page16.ts
rename to tests/app/pages/page16.ts
diff --git a/apps/tests/pages/page17.ts b/tests/app/pages/page17.ts
similarity index 100%
rename from apps/tests/pages/page17.ts
rename to tests/app/pages/page17.ts
diff --git a/apps/tests/pages/page17.xml b/tests/app/pages/page17.xml
similarity index 100%
rename from apps/tests/pages/page17.xml
rename to tests/app/pages/page17.xml
diff --git a/apps/tests/pages/page18.ts b/tests/app/pages/page18.ts
similarity index 100%
rename from apps/tests/pages/page18.ts
rename to tests/app/pages/page18.ts
diff --git a/apps/tests/pages/page18.xml b/tests/app/pages/page18.xml
similarity index 100%
rename from apps/tests/pages/page18.xml
rename to tests/app/pages/page18.xml
diff --git a/apps/tests/pages/page19.ts b/tests/app/pages/page19.ts
similarity index 100%
rename from apps/tests/pages/page19.ts
rename to tests/app/pages/page19.ts
diff --git a/apps/tests/pages/page19.xml b/tests/app/pages/page19.xml
similarity index 100%
rename from apps/tests/pages/page19.xml
rename to tests/app/pages/page19.xml
diff --git a/apps/tests/pages/page20.ts b/tests/app/pages/page20.ts
similarity index 100%
rename from apps/tests/pages/page20.ts
rename to tests/app/pages/page20.ts
diff --git a/apps/tests/pages/page20.xml b/tests/app/pages/page20.xml
similarity index 100%
rename from apps/tests/pages/page20.xml
rename to tests/app/pages/page20.xml
diff --git a/apps/tests/pages/page5.ts b/tests/app/pages/page5.ts
similarity index 100%
rename from apps/tests/pages/page5.ts
rename to tests/app/pages/page5.ts
diff --git a/apps/tests/pages/page6.ts b/tests/app/pages/page6.ts
similarity index 100%
rename from apps/tests/pages/page6.ts
rename to tests/app/pages/page6.ts
diff --git a/apps/tests/pages/page7.ts b/tests/app/pages/page7.ts
similarity index 100%
rename from apps/tests/pages/page7.ts
rename to tests/app/pages/page7.ts
diff --git a/apps/tests/pages/page8.ts b/tests/app/pages/page8.ts
similarity index 100%
rename from apps/tests/pages/page8.ts
rename to tests/app/pages/page8.ts
diff --git a/apps/tests/pages/page9.ts b/tests/app/pages/page9.ts
similarity index 100%
rename from apps/tests/pages/page9.ts
rename to tests/app/pages/page9.ts
diff --git a/apps/tests/pages/performance-test/start.ts b/tests/app/pages/performance-test/start.ts
similarity index 100%
rename from apps/tests/pages/performance-test/start.ts
rename to tests/app/pages/performance-test/start.ts
diff --git a/apps/tests/pages/performance-test/start.xml b/tests/app/pages/performance-test/start.xml
similarity index 100%
rename from apps/tests/pages/performance-test/start.xml
rename to tests/app/pages/performance-test/start.xml
diff --git a/apps/tests/pages/performance-test/test-big.ts b/tests/app/pages/performance-test/test-big.ts
similarity index 100%
rename from apps/tests/pages/performance-test/test-big.ts
rename to tests/app/pages/performance-test/test-big.ts
diff --git a/apps/tests/pages/performance-test/test-big.xml b/tests/app/pages/performance-test/test-big.xml
similarity index 100%
rename from apps/tests/pages/performance-test/test-big.xml
rename to tests/app/pages/performance-test/test-big.xml
diff --git a/apps/tests/pages/performance-test/test-small.ts b/tests/app/pages/performance-test/test-small.ts
similarity index 100%
rename from apps/tests/pages/performance-test/test-small.ts
rename to tests/app/pages/performance-test/test-small.ts
diff --git a/apps/tests/pages/performance-test/test-small.xml b/tests/app/pages/performance-test/test-small.xml
similarity index 100%
rename from apps/tests/pages/performance-test/test-small.xml
rename to tests/app/pages/performance-test/test-small.xml
diff --git a/apps/tests/pages/property-bindings.ts b/tests/app/pages/property-bindings.ts
similarity index 100%
rename from apps/tests/pages/property-bindings.ts
rename to tests/app/pages/property-bindings.ts
diff --git a/apps/tests/pages/sandbox-project.ts b/tests/app/pages/sandbox-project.ts
similarity index 100%
rename from apps/tests/pages/sandbox-project.ts
rename to tests/app/pages/sandbox-project.ts
diff --git a/apps/tests/pages/tab-view.ts b/tests/app/pages/tab-view.ts
similarity index 100%
rename from apps/tests/pages/tab-view.ts
rename to tests/app/pages/tab-view.ts
diff --git a/apps/tests/pages/tab-view.xml b/tests/app/pages/tab-view.xml
similarity index 100%
rename from apps/tests/pages/tab-view.xml
rename to tests/app/pages/tab-view.xml
diff --git a/apps/tests/pages/test.png b/tests/app/pages/test.png
similarity index 100%
rename from apps/tests/pages/test.png
rename to tests/app/pages/test.png
diff --git a/apps/tests/pages/test2.png b/tests/app/pages/test2.png
similarity index 100%
rename from apps/tests/pages/test2.png
rename to tests/app/pages/test2.png
diff --git a/apps/tests/platform-tests.ts b/tests/app/platform-tests.ts
similarity index 100%
rename from apps/tests/platform-tests.ts
rename to tests/app/platform-tests.ts
diff --git a/apps/tests/platform.md b/tests/app/platform.md
similarity index 100%
rename from apps/tests/platform.md
rename to tests/app/platform.md
diff --git a/apps/tests/small-image.png b/tests/app/small-image.png
similarity index 100%
rename from apps/tests/small-image.png
rename to tests/app/small-image.png
diff --git a/apps/tests/styling/app.ts b/tests/app/styling/app.ts
similarity index 100%
rename from apps/tests/styling/app.ts
rename to tests/app/styling/app.ts
diff --git a/apps/tests/styling/mainPage.ts b/tests/app/styling/mainPage.ts
similarity index 100%
rename from apps/tests/styling/mainPage.ts
rename to tests/app/styling/mainPage.ts
diff --git a/apps/tests/styling/package.json b/tests/app/styling/package.json
similarity index 100%
rename from apps/tests/styling/package.json
rename to tests/app/styling/package.json
diff --git a/apps/tests/test-icon.png b/tests/app/test-icon.png
similarity index 100%
rename from apps/tests/test-icon.png
rename to tests/app/test-icon.png
diff --git a/apps/tests/testRunner.ts b/tests/app/testRunner.ts
similarity index 100%
rename from apps/tests/testRunner.ts
rename to tests/app/testRunner.ts
diff --git a/apps/tests/text/formatted-string-tests.ts b/tests/app/text/formatted-string-tests.ts
similarity index 100%
rename from apps/tests/text/formatted-string-tests.ts
rename to tests/app/text/formatted-string-tests.ts
diff --git a/apps/tests/text/formatted-string.md b/tests/app/text/formatted-string.md
similarity index 100%
rename from apps/tests/text/formatted-string.md
rename to tests/app/text/formatted-string.md
diff --git a/apps/tests/timer-tests.ts b/tests/app/timer-tests.ts
similarity index 100%
rename from apps/tests/timer-tests.ts
rename to tests/app/timer-tests.ts
diff --git a/apps/tests/timer.md b/tests/app/timer.md
similarity index 100%
rename from apps/tests/timer.md
rename to tests/app/timer.md
diff --git a/apps/tests/trace-tests.ts b/tests/app/trace-tests.ts
similarity index 100%
rename from apps/tests/trace-tests.ts
rename to tests/app/trace-tests.ts
diff --git a/apps/tests/trace.md b/tests/app/trace.md
similarity index 100%
rename from apps/tests/trace.md
rename to tests/app/trace.md
diff --git a/apps/tests/ui-test.ts b/tests/app/ui-test.ts
similarity index 100%
rename from apps/tests/ui-test.ts
rename to tests/app/ui-test.ts
diff --git a/apps/tests/ui/action-bar/ActionBar_BetweenTags.xml b/tests/app/ui/action-bar/ActionBar_BetweenTags.xml
similarity index 100%
rename from apps/tests/ui/action-bar/ActionBar_BetweenTags.xml
rename to tests/app/ui/action-bar/ActionBar_BetweenTags.xml
diff --git a/apps/tests/ui/action-bar/ActionBar_NumberAsText.ts b/tests/app/ui/action-bar/ActionBar_NumberAsText.ts
similarity index 100%
rename from apps/tests/ui/action-bar/ActionBar_NumberAsText.ts
rename to tests/app/ui/action-bar/ActionBar_NumberAsText.ts
diff --git a/apps/tests/ui/action-bar/ActionBar_NumberAsText.xml b/tests/app/ui/action-bar/ActionBar_NumberAsText.xml
similarity index 100%
rename from apps/tests/ui/action-bar/ActionBar_NumberAsText.xml
rename to tests/app/ui/action-bar/ActionBar_NumberAsText.xml
diff --git a/apps/tests/ui/action-bar/action-bar-tests-common.ts b/tests/app/ui/action-bar/action-bar-tests-common.ts
similarity index 100%
rename from apps/tests/ui/action-bar/action-bar-tests-common.ts
rename to tests/app/ui/action-bar/action-bar-tests-common.ts
diff --git a/apps/tests/ui/action-bar/action-bar-tests.android.ts b/tests/app/ui/action-bar/action-bar-tests.android.ts
similarity index 100%
rename from apps/tests/ui/action-bar/action-bar-tests.android.ts
rename to tests/app/ui/action-bar/action-bar-tests.android.ts
diff --git a/apps/tests/ui/action-bar/action-bar-tests.ios.ts b/tests/app/ui/action-bar/action-bar-tests.ios.ts
similarity index 100%
rename from apps/tests/ui/action-bar/action-bar-tests.ios.ts
rename to tests/app/ui/action-bar/action-bar-tests.ios.ts
diff --git a/apps/tests/ui/action-bar/action-bar.md b/tests/app/ui/action-bar/action-bar.md
similarity index 100%
rename from apps/tests/ui/action-bar/action-bar.md
rename to tests/app/ui/action-bar/action-bar.md
diff --git a/apps/tests/ui/activity-indicator/activity-indicator-tests.ts b/tests/app/ui/activity-indicator/activity-indicator-tests.ts
similarity index 100%
rename from apps/tests/ui/activity-indicator/activity-indicator-tests.ts
rename to tests/app/ui/activity-indicator/activity-indicator-tests.ts
diff --git a/apps/tests/ui/activity-indicator/activity-indicator.md b/tests/app/ui/activity-indicator/activity-indicator.md
similarity index 100%
rename from apps/tests/ui/activity-indicator/activity-indicator.md
rename to tests/app/ui/activity-indicator/activity-indicator.md
diff --git a/apps/tests/ui/animation/animation-tests.ts b/tests/app/ui/animation/animation-tests.ts
similarity index 100%
rename from apps/tests/ui/animation/animation-tests.ts
rename to tests/app/ui/animation/animation-tests.ts
diff --git a/apps/tests/ui/animation/animation.md b/tests/app/ui/animation/animation.md
similarity index 100%
rename from apps/tests/ui/animation/animation.md
rename to tests/app/ui/animation/animation.md
diff --git a/apps/tests/ui/animation/css-animation-tests.ts b/tests/app/ui/animation/css-animation-tests.ts
similarity index 100%
rename from apps/tests/ui/animation/css-animation-tests.ts
rename to tests/app/ui/animation/css-animation-tests.ts
diff --git a/apps/tests/ui/animation/test.css b/tests/app/ui/animation/test.css
similarity index 100%
rename from apps/tests/ui/animation/test.css
rename to tests/app/ui/animation/test.css
diff --git a/apps/tests/ui/bindable-tests.ts b/tests/app/ui/bindable-tests.ts
similarity index 100%
rename from apps/tests/ui/bindable-tests.ts
rename to tests/app/ui/bindable-tests.ts
diff --git a/apps/tests/ui/binding-expressions-tests.ts b/tests/app/ui/binding-expressions-tests.ts
similarity index 100%
rename from apps/tests/ui/binding-expressions-tests.ts
rename to tests/app/ui/binding-expressions-tests.ts
diff --git a/apps/tests/ui/bindingContext_testPage.ts b/tests/app/ui/bindingContext_testPage.ts
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage.ts
rename to tests/app/ui/bindingContext_testPage.ts
diff --git a/apps/tests/ui/bindingContext_testPage.xml b/tests/app/ui/bindingContext_testPage.xml
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage.xml
rename to tests/app/ui/bindingContext_testPage.xml
diff --git a/apps/tests/ui/bindingContext_testPage1.ts b/tests/app/ui/bindingContext_testPage1.ts
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage1.ts
rename to tests/app/ui/bindingContext_testPage1.ts
diff --git a/apps/tests/ui/bindingContext_testPage1.xml b/tests/app/ui/bindingContext_testPage1.xml
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage1.xml
rename to tests/app/ui/bindingContext_testPage1.xml
diff --git a/apps/tests/ui/bindingContext_testPage2.ts b/tests/app/ui/bindingContext_testPage2.ts
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage2.ts
rename to tests/app/ui/bindingContext_testPage2.ts
diff --git a/apps/tests/ui/bindingContext_testPage2.xml b/tests/app/ui/bindingContext_testPage2.xml
similarity index 100%
rename from apps/tests/ui/bindingContext_testPage2.xml
rename to tests/app/ui/bindingContext_testPage2.xml
diff --git a/apps/tests/ui/border/border-tests.ts b/tests/app/ui/border/border-tests.ts
similarity index 100%
rename from apps/tests/ui/border/border-tests.ts
rename to tests/app/ui/border/border-tests.ts
diff --git a/apps/tests/ui/border/border.md b/tests/app/ui/border/border.md
similarity index 100%
rename from apps/tests/ui/border/border.md
rename to tests/app/ui/border/border.md
diff --git a/apps/tests/ui/button/button-tests-native.android.ts b/tests/app/ui/button/button-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/button/button-tests-native.android.ts
rename to tests/app/ui/button/button-tests-native.android.ts
diff --git a/apps/tests/ui/button/button-tests-native.d.ts b/tests/app/ui/button/button-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/button/button-tests-native.d.ts
rename to tests/app/ui/button/button-tests-native.d.ts
diff --git a/apps/tests/ui/button/button-tests-native.ios.ts b/tests/app/ui/button/button-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/button/button-tests-native.ios.ts
rename to tests/app/ui/button/button-tests-native.ios.ts
diff --git a/apps/tests/ui/button/button-tests.ts b/tests/app/ui/button/button-tests.ts
similarity index 100%
rename from apps/tests/ui/button/button-tests.ts
rename to tests/app/ui/button/button-tests.ts
diff --git a/apps/tests/ui/button/button.md b/tests/app/ui/button/button.md
similarity index 100%
rename from apps/tests/ui/button/button.md
rename to tests/app/ui/button/button.md
diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.android.ts b/tests/app/ui/date-picker/date-picker-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/date-picker/date-picker-tests-native.android.ts
rename to tests/app/ui/date-picker/date-picker-tests-native.android.ts
diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.d.ts b/tests/app/ui/date-picker/date-picker-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/date-picker/date-picker-tests-native.d.ts
rename to tests/app/ui/date-picker/date-picker-tests-native.d.ts
diff --git a/apps/tests/ui/date-picker/date-picker-tests-native.ios.ts b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/date-picker/date-picker-tests-native.ios.ts
rename to tests/app/ui/date-picker/date-picker-tests-native.ios.ts
diff --git a/apps/tests/ui/date-picker/date-picker-tests.ts b/tests/app/ui/date-picker/date-picker-tests.ts
similarity index 100%
rename from apps/tests/ui/date-picker/date-picker-tests.ts
rename to tests/app/ui/date-picker/date-picker-tests.ts
diff --git a/apps/tests/ui/date-picker/date-picker.md b/tests/app/ui/date-picker/date-picker.md
similarity index 100%
rename from apps/tests/ui/date-picker/date-picker.md
rename to tests/app/ui/date-picker/date-picker.md
diff --git a/apps/tests/ui/dependency-observable-tests.ts b/tests/app/ui/dependency-observable-tests.ts
similarity index 100%
rename from apps/tests/ui/dependency-observable-tests.ts
rename to tests/app/ui/dependency-observable-tests.ts
diff --git a/apps/tests/ui/dialogs/dialog-tests.ts b/tests/app/ui/dialogs/dialog-tests.ts
similarity index 100%
rename from apps/tests/ui/dialogs/dialog-tests.ts
rename to tests/app/ui/dialogs/dialog-tests.ts
diff --git a/apps/tests/ui/dialogs/dialogs.md b/tests/app/ui/dialogs/dialogs.md
similarity index 100%
rename from apps/tests/ui/dialogs/dialogs.md
rename to tests/app/ui/dialogs/dialogs.md
diff --git a/apps/tests/ui/frame/frame-tests.ts b/tests/app/ui/frame/frame-tests.ts
similarity index 100%
rename from apps/tests/ui/frame/frame-tests.ts
rename to tests/app/ui/frame/frame-tests.ts
diff --git a/apps/tests/ui/frame/frame.md b/tests/app/ui/frame/frame.md
similarity index 100%
rename from apps/tests/ui/frame/frame.md
rename to tests/app/ui/frame/frame.md
diff --git a/apps/tests/ui/gestures/gestures-tests.ts b/tests/app/ui/gestures/gestures-tests.ts
similarity index 100%
rename from apps/tests/ui/gestures/gestures-tests.ts
rename to tests/app/ui/gestures/gestures-tests.ts
diff --git a/apps/tests/ui/gestures/gestures.md b/tests/app/ui/gestures/gestures.md
similarity index 100%
rename from apps/tests/ui/gestures/gestures.md
rename to tests/app/ui/gestures/gestures.md
diff --git a/apps/tests/ui/helper.ts b/tests/app/ui/helper.ts
similarity index 100%
rename from apps/tests/ui/helper.ts
rename to tests/app/ui/helper.ts
diff --git a/apps/tests/ui/html-view/htm-view.md b/tests/app/ui/html-view/htm-view.md
similarity index 100%
rename from apps/tests/ui/html-view/htm-view.md
rename to tests/app/ui/html-view/htm-view.md
diff --git a/apps/tests/ui/html-view/html-view-tests.ts b/tests/app/ui/html-view/html-view-tests.ts
similarity index 100%
rename from apps/tests/ui/html-view/html-view-tests.ts
rename to tests/app/ui/html-view/html-view-tests.ts
diff --git a/apps/tests/ui/image-cache/image-cache-tests.ts b/tests/app/ui/image-cache/image-cache-tests.ts
similarity index 100%
rename from apps/tests/ui/image-cache/image-cache-tests.ts
rename to tests/app/ui/image-cache/image-cache-tests.ts
diff --git a/apps/tests/ui/image-cache/image-cache.md b/tests/app/ui/image-cache/image-cache.md
similarity index 100%
rename from apps/tests/ui/image-cache/image-cache.md
rename to tests/app/ui/image-cache/image-cache.md
diff --git a/apps/tests/ui/image/image-tests.ts b/tests/app/ui/image/image-tests.ts
similarity index 100%
rename from apps/tests/ui/image/image-tests.ts
rename to tests/app/ui/image/image-tests.ts
diff --git a/apps/tests/ui/image/image.md b/tests/app/ui/image/image.md
similarity index 100%
rename from apps/tests/ui/image/image.md
rename to tests/app/ui/image/image.md
diff --git a/apps/tests/ui/label/label-tests-native.android.ts b/tests/app/ui/label/label-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/label/label-tests-native.android.ts
rename to tests/app/ui/label/label-tests-native.android.ts
diff --git a/apps/tests/ui/label/label-tests-native.d.ts b/tests/app/ui/label/label-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/label/label-tests-native.d.ts
rename to tests/app/ui/label/label-tests-native.d.ts
diff --git a/apps/tests/ui/label/label-tests-native.ios.ts b/tests/app/ui/label/label-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/label/label-tests-native.ios.ts
rename to tests/app/ui/label/label-tests-native.ios.ts
diff --git a/apps/tests/ui/label/label-tests-wrong.css b/tests/app/ui/label/label-tests-wrong.css
similarity index 100%
rename from apps/tests/ui/label/label-tests-wrong.css
rename to tests/app/ui/label/label-tests-wrong.css
diff --git a/apps/tests/ui/label/label-tests.css b/tests/app/ui/label/label-tests.css
similarity index 100%
rename from apps/tests/ui/label/label-tests.css
rename to tests/app/ui/label/label-tests.css
diff --git a/apps/tests/ui/label/label-tests.ts b/tests/app/ui/label/label-tests.ts
similarity index 100%
rename from apps/tests/ui/label/label-tests.ts
rename to tests/app/ui/label/label-tests.ts
diff --git a/apps/tests/ui/label/label.md b/tests/app/ui/label/label.md
similarity index 100%
rename from apps/tests/ui/label/label.md
rename to tests/app/ui/label/label.md
diff --git a/apps/tests/ui/layouts/absolute-layout-tests.ts b/tests/app/ui/layouts/absolute-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/absolute-layout-tests.ts
rename to tests/app/ui/layouts/absolute-layout-tests.ts
diff --git a/apps/tests/ui/layouts/absolute-layout.md b/tests/app/ui/layouts/absolute-layout.md
similarity index 100%
rename from apps/tests/ui/layouts/absolute-layout.md
rename to tests/app/ui/layouts/absolute-layout.md
diff --git a/apps/tests/ui/layouts/common-layout-tests.ts b/tests/app/ui/layouts/common-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/common-layout-tests.ts
rename to tests/app/ui/layouts/common-layout-tests.ts
diff --git a/apps/tests/ui/layouts/dock-layout-tests.ts b/tests/app/ui/layouts/dock-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/dock-layout-tests.ts
rename to tests/app/ui/layouts/dock-layout-tests.ts
diff --git a/apps/tests/ui/layouts/dock-layout.md b/tests/app/ui/layouts/dock-layout.md
similarity index 100%
rename from apps/tests/ui/layouts/dock-layout.md
rename to tests/app/ui/layouts/dock-layout.md
diff --git a/apps/tests/ui/layouts/grid-layout-tests.ts b/tests/app/ui/layouts/grid-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/grid-layout-tests.ts
rename to tests/app/ui/layouts/grid-layout-tests.ts
diff --git a/apps/tests/ui/layouts/grid-layout.md b/tests/app/ui/layouts/grid-layout.md
similarity index 100%
rename from apps/tests/ui/layouts/grid-layout.md
rename to tests/app/ui/layouts/grid-layout.md
diff --git a/apps/tests/ui/layouts/layout-helper.android.ts b/tests/app/ui/layouts/layout-helper.android.ts
similarity index 100%
rename from apps/tests/ui/layouts/layout-helper.android.ts
rename to tests/app/ui/layouts/layout-helper.android.ts
diff --git a/apps/tests/ui/layouts/layout-helper.d.ts b/tests/app/ui/layouts/layout-helper.d.ts
similarity index 100%
rename from apps/tests/ui/layouts/layout-helper.d.ts
rename to tests/app/ui/layouts/layout-helper.d.ts
diff --git a/apps/tests/ui/layouts/layout-helper.ios.ts b/tests/app/ui/layouts/layout-helper.ios.ts
similarity index 100%
rename from apps/tests/ui/layouts/layout-helper.ios.ts
rename to tests/app/ui/layouts/layout-helper.ios.ts
diff --git a/apps/tests/ui/layouts/stack-layout-tests.ts b/tests/app/ui/layouts/stack-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/stack-layout-tests.ts
rename to tests/app/ui/layouts/stack-layout-tests.ts
diff --git a/apps/tests/ui/layouts/stack-layout.md b/tests/app/ui/layouts/stack-layout.md
similarity index 100%
rename from apps/tests/ui/layouts/stack-layout.md
rename to tests/app/ui/layouts/stack-layout.md
diff --git a/apps/tests/ui/layouts/wrap-layout-tests.ts b/tests/app/ui/layouts/wrap-layout-tests.ts
similarity index 100%
rename from apps/tests/ui/layouts/wrap-layout-tests.ts
rename to tests/app/ui/layouts/wrap-layout-tests.ts
diff --git a/apps/tests/ui/layouts/wrap-layout.md b/tests/app/ui/layouts/wrap-layout.md
similarity index 100%
rename from apps/tests/ui/layouts/wrap-layout.md
rename to tests/app/ui/layouts/wrap-layout.md
diff --git a/apps/tests/ui/list-picker/list-picker-tests-native.android.ts b/tests/app/ui/list-picker/list-picker-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/list-picker/list-picker-tests-native.android.ts
rename to tests/app/ui/list-picker/list-picker-tests-native.android.ts
diff --git a/apps/tests/ui/list-picker/list-picker-tests-native.d.ts b/tests/app/ui/list-picker/list-picker-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/list-picker/list-picker-tests-native.d.ts
rename to tests/app/ui/list-picker/list-picker-tests-native.d.ts
diff --git a/apps/tests/ui/list-picker/list-picker-tests-native.ios.ts b/tests/app/ui/list-picker/list-picker-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/list-picker/list-picker-tests-native.ios.ts
rename to tests/app/ui/list-picker/list-picker-tests-native.ios.ts
diff --git a/apps/tests/ui/list-picker/list-picker-tests.ts b/tests/app/ui/list-picker/list-picker-tests.ts
similarity index 100%
rename from apps/tests/ui/list-picker/list-picker-tests.ts
rename to tests/app/ui/list-picker/list-picker-tests.ts
diff --git a/apps/tests/ui/list-picker/list-picker.md b/tests/app/ui/list-picker/list-picker.md
similarity index 100%
rename from apps/tests/ui/list-picker/list-picker.md
rename to tests/app/ui/list-picker/list-picker.md
diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/tests/app/ui/list-view/list-view-tests.ts
similarity index 100%
rename from apps/tests/ui/list-view/list-view-tests.ts
rename to tests/app/ui/list-view/list-view-tests.ts
diff --git a/apps/tests/ui/list-view/list-view.md b/tests/app/ui/list-view/list-view.md
similarity index 100%
rename from apps/tests/ui/list-view/list-view.md
rename to tests/app/ui/list-view/list-view.md
diff --git a/apps/tests/ui/page/modal-page.ts b/tests/app/ui/page/modal-page.ts
similarity index 100%
rename from apps/tests/ui/page/modal-page.ts
rename to tests/app/ui/page/modal-page.ts
diff --git a/apps/tests/ui/page/modal-page.xml b/tests/app/ui/page/modal-page.xml
similarity index 100%
rename from apps/tests/ui/page/modal-page.xml
rename to tests/app/ui/page/modal-page.xml
diff --git a/apps/tests/ui/page/page-tests-common.ts b/tests/app/ui/page/page-tests-common.ts
similarity index 100%
rename from apps/tests/ui/page/page-tests-common.ts
rename to tests/app/ui/page/page-tests-common.ts
diff --git a/apps/tests/ui/page/page-tests.android.ts b/tests/app/ui/page/page-tests.android.ts
similarity index 100%
rename from apps/tests/ui/page/page-tests.android.ts
rename to tests/app/ui/page/page-tests.android.ts
diff --git a/apps/tests/ui/page/page-tests.ios.ts b/tests/app/ui/page/page-tests.ios.ts
similarity index 100%
rename from apps/tests/ui/page/page-tests.ios.ts
rename to tests/app/ui/page/page-tests.ios.ts
diff --git a/apps/tests/ui/page/page.md b/tests/app/ui/page/page.md
similarity index 100%
rename from apps/tests/ui/page/page.md
rename to tests/app/ui/page/page.md
diff --git a/apps/tests/ui/page/page21.ts b/tests/app/ui/page/page21.ts
similarity index 100%
rename from apps/tests/ui/page/page21.ts
rename to tests/app/ui/page/page21.ts
diff --git a/apps/tests/ui/page/page21.xml b/tests/app/ui/page/page21.xml
similarity index 100%
rename from apps/tests/ui/page/page21.xml
rename to tests/app/ui/page/page21.xml
diff --git a/apps/tests/ui/page/test-page-declarative-css.css b/tests/app/ui/page/test-page-declarative-css.css
similarity index 100%
rename from apps/tests/ui/page/test-page-declarative-css.css
rename to tests/app/ui/page/test-page-declarative-css.css
diff --git a/apps/tests/ui/page/test-page-declarative-css.xml b/tests/app/ui/page/test-page-declarative-css.xml
similarity index 100%
rename from apps/tests/ui/page/test-page-declarative-css.xml
rename to tests/app/ui/page/test-page-declarative-css.xml
diff --git a/apps/tests/ui/page/test-page-module-css.css b/tests/app/ui/page/test-page-module-css.css
similarity index 100%
rename from apps/tests/ui/page/test-page-module-css.css
rename to tests/app/ui/page/test-page-module-css.css
diff --git a/apps/tests/ui/page/test-page-module-css.ts b/tests/app/ui/page/test-page-module-css.ts
similarity index 100%
rename from apps/tests/ui/page/test-page-module-css.ts
rename to tests/app/ui/page/test-page-module-css.ts
diff --git a/apps/tests/ui/page/test-page-module.ts b/tests/app/ui/page/test-page-module.ts
similarity index 100%
rename from apps/tests/ui/page/test-page-module.ts
rename to tests/app/ui/page/test-page-module.ts
diff --git a/apps/tests/ui/placeholder/placeholder-tests.ts b/tests/app/ui/placeholder/placeholder-tests.ts
similarity index 100%
rename from apps/tests/ui/placeholder/placeholder-tests.ts
rename to tests/app/ui/placeholder/placeholder-tests.ts
diff --git a/apps/tests/ui/placeholder/placeholder.md b/tests/app/ui/placeholder/placeholder.md
similarity index 100%
rename from apps/tests/ui/placeholder/placeholder.md
rename to tests/app/ui/placeholder/placeholder.md
diff --git a/apps/tests/ui/progress/progress-tests.ts b/tests/app/ui/progress/progress-tests.ts
similarity index 100%
rename from apps/tests/ui/progress/progress-tests.ts
rename to tests/app/ui/progress/progress-tests.ts
diff --git a/apps/tests/ui/progress/progress.md b/tests/app/ui/progress/progress.md
similarity index 100%
rename from apps/tests/ui/progress/progress.md
rename to tests/app/ui/progress/progress.md
diff --git a/apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts b/tests/app/ui/proxy-view-container/proxy-view-container-tests.ts
similarity index 100%
rename from apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts
rename to tests/app/ui/proxy-view-container/proxy-view-container-tests.ts
diff --git a/apps/tests/ui/repeater/repeater-tests.ts b/tests/app/ui/repeater/repeater-tests.ts
similarity index 100%
rename from apps/tests/ui/repeater/repeater-tests.ts
rename to tests/app/ui/repeater/repeater-tests.ts
diff --git a/apps/tests/ui/repeater/repeater.md b/tests/app/ui/repeater/repeater.md
similarity index 100%
rename from apps/tests/ui/repeater/repeater.md
rename to tests/app/ui/repeater/repeater.md
diff --git a/apps/tests/ui/repeater/repeaterItems-bindingToGestures.ts b/tests/app/ui/repeater/repeaterItems-bindingToGestures.ts
similarity index 100%
rename from apps/tests/ui/repeater/repeaterItems-bindingToGestures.ts
rename to tests/app/ui/repeater/repeaterItems-bindingToGestures.ts
diff --git a/apps/tests/ui/repeater/repeaterItems-bindingToGestures.xml b/tests/app/ui/repeater/repeaterItems-bindingToGestures.xml
similarity index 100%
rename from apps/tests/ui/repeater/repeaterItems-bindingToGestures.xml
rename to tests/app/ui/repeater/repeaterItems-bindingToGestures.xml
diff --git a/apps/tests/ui/scroll-view/scroll-view-tests.ts b/tests/app/ui/scroll-view/scroll-view-tests.ts
similarity index 100%
rename from apps/tests/ui/scroll-view/scroll-view-tests.ts
rename to tests/app/ui/scroll-view/scroll-view-tests.ts
diff --git a/apps/tests/ui/scroll-view/scroll-view.md b/tests/app/ui/scroll-view/scroll-view.md
similarity index 100%
rename from apps/tests/ui/scroll-view/scroll-view.md
rename to tests/app/ui/scroll-view/scroll-view.md
diff --git a/apps/tests/ui/search-bar/search-bar-tests-native.android.ts b/tests/app/ui/search-bar/search-bar-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/search-bar/search-bar-tests-native.android.ts
rename to tests/app/ui/search-bar/search-bar-tests-native.android.ts
diff --git a/apps/tests/ui/search-bar/search-bar-tests-native.d.ts b/tests/app/ui/search-bar/search-bar-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/search-bar/search-bar-tests-native.d.ts
rename to tests/app/ui/search-bar/search-bar-tests-native.d.ts
diff --git a/apps/tests/ui/search-bar/search-bar-tests-native.ios.ts b/tests/app/ui/search-bar/search-bar-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/search-bar/search-bar-tests-native.ios.ts
rename to tests/app/ui/search-bar/search-bar-tests-native.ios.ts
diff --git a/apps/tests/ui/search-bar/search-bar-tests.ts b/tests/app/ui/search-bar/search-bar-tests.ts
similarity index 100%
rename from apps/tests/ui/search-bar/search-bar-tests.ts
rename to tests/app/ui/search-bar/search-bar-tests.ts
diff --git a/apps/tests/ui/search-bar/search-bar.md b/tests/app/ui/search-bar/search-bar.md
similarity index 100%
rename from apps/tests/ui/search-bar/search-bar.md
rename to tests/app/ui/search-bar/search-bar.md
diff --git a/apps/tests/ui/segmented-bar/segmented-bar-tests-native.android.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/segmented-bar/segmented-bar-tests-native.android.ts
rename to tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts
diff --git a/apps/tests/ui/segmented-bar/segmented-bar-tests-native.d.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/segmented-bar/segmented-bar-tests-native.d.ts
rename to tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts
diff --git a/apps/tests/ui/segmented-bar/segmented-bar-tests-native.ios.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/segmented-bar/segmented-bar-tests-native.ios.ts
rename to tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts
diff --git a/apps/tests/ui/segmented-bar/segmented-bar-tests.ts b/tests/app/ui/segmented-bar/segmented-bar-tests.ts
similarity index 100%
rename from apps/tests/ui/segmented-bar/segmented-bar-tests.ts
rename to tests/app/ui/segmented-bar/segmented-bar-tests.ts
diff --git a/apps/tests/ui/segmented-bar/segmented-bar.md b/tests/app/ui/segmented-bar/segmented-bar.md
similarity index 100%
rename from apps/tests/ui/segmented-bar/segmented-bar.md
rename to tests/app/ui/segmented-bar/segmented-bar.md
diff --git a/apps/tests/ui/slider/slider-tests.ts b/tests/app/ui/slider/slider-tests.ts
similarity index 100%
rename from apps/tests/ui/slider/slider-tests.ts
rename to tests/app/ui/slider/slider-tests.ts
diff --git a/apps/tests/ui/slider/slider.md b/tests/app/ui/slider/slider.md
similarity index 100%
rename from apps/tests/ui/slider/slider.md
rename to tests/app/ui/slider/slider.md
diff --git a/apps/tests/ui/styling/style-properties-tests.ts b/tests/app/ui/styling/style-properties-tests.ts
similarity index 100%
rename from apps/tests/ui/styling/style-properties-tests.ts
rename to tests/app/ui/styling/style-properties-tests.ts
diff --git a/apps/tests/ui/styling/style-tests.ts b/tests/app/ui/styling/style-tests.ts
similarity index 100%
rename from apps/tests/ui/styling/style-tests.ts
rename to tests/app/ui/styling/style-tests.ts
diff --git a/apps/tests/ui/styling/styling.md b/tests/app/ui/styling/styling.md
similarity index 100%
rename from apps/tests/ui/styling/styling.md
rename to tests/app/ui/styling/styling.md
diff --git a/apps/tests/ui/styling/test.css b/tests/app/ui/styling/test.css
similarity index 100%
rename from apps/tests/ui/styling/test.css
rename to tests/app/ui/styling/test.css
diff --git a/apps/tests/ui/styling/value-source-tests.ts b/tests/app/ui/styling/value-source-tests.ts
similarity index 100%
rename from apps/tests/ui/styling/value-source-tests.ts
rename to tests/app/ui/styling/value-source-tests.ts
diff --git a/apps/tests/ui/styling/visual-state-tests.ts b/tests/app/ui/styling/visual-state-tests.ts
similarity index 100%
rename from apps/tests/ui/styling/visual-state-tests.ts
rename to tests/app/ui/styling/visual-state-tests.ts
diff --git a/apps/tests/ui/switch/switch-tests.ts b/tests/app/ui/switch/switch-tests.ts
similarity index 100%
rename from apps/tests/ui/switch/switch-tests.ts
rename to tests/app/ui/switch/switch-tests.ts
diff --git a/apps/tests/ui/switch/switch.md b/tests/app/ui/switch/switch.md
similarity index 100%
rename from apps/tests/ui/switch/switch.md
rename to tests/app/ui/switch/switch.md
diff --git a/apps/tests/ui/tab-view/tab-view-navigation-tests.ts b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view-navigation-tests.ts
rename to tests/app/ui/tab-view/tab-view-navigation-tests.ts
diff --git a/apps/tests/ui/tab-view/tab-view-tests-native.android.ts b/tests/app/ui/tab-view/tab-view-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view-tests-native.android.ts
rename to tests/app/ui/tab-view/tab-view-tests-native.android.ts
diff --git a/apps/tests/ui/tab-view/tab-view-tests-native.d.ts b/tests/app/ui/tab-view/tab-view-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view-tests-native.d.ts
rename to tests/app/ui/tab-view/tab-view-tests-native.d.ts
diff --git a/apps/tests/ui/tab-view/tab-view-tests-native.ios.ts b/tests/app/ui/tab-view/tab-view-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view-tests-native.ios.ts
rename to tests/app/ui/tab-view/tab-view-tests-native.ios.ts
diff --git a/apps/tests/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view-tests.ts
rename to tests/app/ui/tab-view/tab-view-tests.ts
diff --git a/apps/tests/ui/tab-view/tab-view.md b/tests/app/ui/tab-view/tab-view.md
similarity index 100%
rename from apps/tests/ui/tab-view/tab-view.md
rename to tests/app/ui/tab-view/tab-view.md
diff --git a/apps/tests/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_arrayAccess_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_arrayAccess_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_binaryOperators_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_binaryOperators_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_comparisonOperators_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_comparisonOperators_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_logicalOperators_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_logicalOperators_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_ternaryOperator_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_ternaryOperator_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.xml
diff --git a/apps/tests/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts
rename to tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts
diff --git a/apps/tests/ui/test-pages/bindingExpressions_unaryOperators_testPage.xml b/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.xml
similarity index 100%
rename from apps/tests/ui/test-pages/bindingExpressions_unaryOperators_testPage.xml
rename to tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.xml
diff --git a/apps/tests/ui/text-field/text-field-tests-native.android.ts b/tests/app/ui/text-field/text-field-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/text-field/text-field-tests-native.android.ts
rename to tests/app/ui/text-field/text-field-tests-native.android.ts
diff --git a/apps/tests/ui/text-field/text-field-tests-native.d.ts b/tests/app/ui/text-field/text-field-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/text-field/text-field-tests-native.d.ts
rename to tests/app/ui/text-field/text-field-tests-native.d.ts
diff --git a/apps/tests/ui/text-field/text-field-tests-native.ios.ts b/tests/app/ui/text-field/text-field-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/text-field/text-field-tests-native.ios.ts
rename to tests/app/ui/text-field/text-field-tests-native.ios.ts
diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/tests/app/ui/text-field/text-field-tests.ts
similarity index 100%
rename from apps/tests/ui/text-field/text-field-tests.ts
rename to tests/app/ui/text-field/text-field-tests.ts
diff --git a/apps/tests/ui/text-field/text-field.md b/tests/app/ui/text-field/text-field.md
similarity index 100%
rename from apps/tests/ui/text-field/text-field.md
rename to tests/app/ui/text-field/text-field.md
diff --git a/apps/tests/ui/text-view/text-view-tests-native.android.ts b/tests/app/ui/text-view/text-view-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/text-view/text-view-tests-native.android.ts
rename to tests/app/ui/text-view/text-view-tests-native.android.ts
diff --git a/apps/tests/ui/text-view/text-view-tests-native.d.ts b/tests/app/ui/text-view/text-view-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/text-view/text-view-tests-native.d.ts
rename to tests/app/ui/text-view/text-view-tests-native.d.ts
diff --git a/apps/tests/ui/text-view/text-view-tests-native.ios.ts b/tests/app/ui/text-view/text-view-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/text-view/text-view-tests-native.ios.ts
rename to tests/app/ui/text-view/text-view-tests-native.ios.ts
diff --git a/apps/tests/ui/text-view/text-view-tests.ts b/tests/app/ui/text-view/text-view-tests.ts
similarity index 100%
rename from apps/tests/ui/text-view/text-view-tests.ts
rename to tests/app/ui/text-view/text-view-tests.ts
diff --git a/apps/tests/ui/text-view/text-view.md b/tests/app/ui/text-view/text-view.md
similarity index 100%
rename from apps/tests/ui/text-view/text-view.md
rename to tests/app/ui/text-view/text-view.md
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.android.ts b/tests/app/ui/time-picker/time-picker-tests-native.android.ts
similarity index 100%
rename from apps/tests/ui/time-picker/time-picker-tests-native.android.ts
rename to tests/app/ui/time-picker/time-picker-tests-native.android.ts
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.d.ts b/tests/app/ui/time-picker/time-picker-tests-native.d.ts
similarity index 100%
rename from apps/tests/ui/time-picker/time-picker-tests-native.d.ts
rename to tests/app/ui/time-picker/time-picker-tests-native.d.ts
diff --git a/apps/tests/ui/time-picker/time-picker-tests-native.ios.ts b/tests/app/ui/time-picker/time-picker-tests-native.ios.ts
similarity index 100%
rename from apps/tests/ui/time-picker/time-picker-tests-native.ios.ts
rename to tests/app/ui/time-picker/time-picker-tests-native.ios.ts
diff --git a/apps/tests/ui/time-picker/time-picker-tests.ts b/tests/app/ui/time-picker/time-picker-tests.ts
similarity index 100%
rename from apps/tests/ui/time-picker/time-picker-tests.ts
rename to tests/app/ui/time-picker/time-picker-tests.ts
diff --git a/apps/tests/ui/time-picker/time-picker.md b/tests/app/ui/time-picker/time-picker.md
similarity index 100%
rename from apps/tests/ui/time-picker/time-picker.md
rename to tests/app/ui/time-picker/time-picker.md
diff --git a/apps/tests/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
similarity index 100%
rename from apps/tests/ui/view/view-tests-common.ts
rename to tests/app/ui/view/view-tests-common.ts
diff --git a/apps/tests/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts
similarity index 100%
rename from apps/tests/ui/view/view-tests.android.ts
rename to tests/app/ui/view/view-tests.android.ts
diff --git a/apps/tests/ui/view/view-tests.d.ts b/tests/app/ui/view/view-tests.d.ts
similarity index 100%
rename from apps/tests/ui/view/view-tests.d.ts
rename to tests/app/ui/view/view-tests.d.ts
diff --git a/apps/tests/ui/view/view-tests.ios.ts b/tests/app/ui/view/view-tests.ios.ts
similarity index 100%
rename from apps/tests/ui/view/view-tests.ios.ts
rename to tests/app/ui/view/view-tests.ios.ts
diff --git a/apps/tests/ui/web-view/test.html b/tests/app/ui/web-view/test.html
similarity index 100%
rename from apps/tests/ui/web-view/test.html
rename to tests/app/ui/web-view/test.html
diff --git a/apps/tests/ui/web-view/web-view-tests.ts b/tests/app/ui/web-view/web-view-tests.ts
similarity index 100%
rename from apps/tests/ui/web-view/web-view-tests.ts
rename to tests/app/ui/web-view/web-view-tests.ts
diff --git a/apps/tests/ui/web-view/web-view.md b/tests/app/ui/web-view/web-view.md
similarity index 100%
rename from apps/tests/ui/web-view/web-view.md
rename to tests/app/ui/web-view/web-view.md
diff --git a/apps/tests/weak-event-listener-tests.ts b/tests/app/weak-event-listener-tests.ts
similarity index 100%
rename from apps/tests/weak-event-listener-tests.ts
rename to tests/app/weak-event-listener-tests.ts
diff --git a/apps/tests/xhr-tests.ts b/tests/app/xhr-tests.ts
similarity index 100%
rename from apps/tests/xhr-tests.ts
rename to tests/app/xhr-tests.ts
diff --git a/apps/tests/xml-declaration/app.ts b/tests/app/xml-declaration/app.ts
similarity index 100%
rename from apps/tests/xml-declaration/app.ts
rename to tests/app/xml-declaration/app.ts
diff --git a/apps/tests/xml-declaration/custom-code-file.ts b/tests/app/xml-declaration/custom-code-file.ts
similarity index 100%
rename from apps/tests/xml-declaration/custom-code-file.ts
rename to tests/app/xml-declaration/custom-code-file.ts
diff --git a/apps/tests/xml-declaration/custom-css-file.css b/tests/app/xml-declaration/custom-css-file.css
similarity index 100%
rename from apps/tests/xml-declaration/custom-css-file.css
rename to tests/app/xml-declaration/custom-css-file.css
diff --git a/apps/tests/xml-declaration/errors/non-existing-element-in-template.xml b/tests/app/xml-declaration/errors/non-existing-element-in-template.xml
similarity index 100%
rename from apps/tests/xml-declaration/errors/non-existing-element-in-template.xml
rename to tests/app/xml-declaration/errors/non-existing-element-in-template.xml
diff --git a/apps/tests/xml-declaration/errors/non-existing-element.xml b/tests/app/xml-declaration/errors/non-existing-element.xml
similarity index 100%
rename from apps/tests/xml-declaration/errors/non-existing-element.xml
rename to tests/app/xml-declaration/errors/non-existing-element.xml
diff --git a/apps/tests/xml-declaration/examples/test-page.xml b/tests/app/xml-declaration/examples/test-page.xml
similarity index 100%
rename from apps/tests/xml-declaration/examples/test-page.xml
rename to tests/app/xml-declaration/examples/test-page.xml
diff --git a/apps/tests/xml-declaration/inherited-base-page.ts b/tests/app/xml-declaration/inherited-base-page.ts
similarity index 100%
rename from apps/tests/xml-declaration/inherited-base-page.ts
rename to tests/app/xml-declaration/inherited-base-page.ts
diff --git a/apps/tests/xml-declaration/inherited-page.ts b/tests/app/xml-declaration/inherited-page.ts
similarity index 100%
rename from apps/tests/xml-declaration/inherited-page.ts
rename to tests/app/xml-declaration/inherited-page.ts
diff --git a/apps/tests/xml-declaration/inherited-page.xml b/tests/app/xml-declaration/inherited-page.xml
similarity index 100%
rename from apps/tests/xml-declaration/inherited-page.xml
rename to tests/app/xml-declaration/inherited-page.xml
diff --git a/apps/tests/xml-declaration/mainPage.ts b/tests/app/xml-declaration/mainPage.ts
similarity index 100%
rename from apps/tests/xml-declaration/mainPage.ts
rename to tests/app/xml-declaration/mainPage.ts
diff --git a/apps/tests/xml-declaration/mainPage.xml b/tests/app/xml-declaration/mainPage.xml
similarity index 100%
rename from apps/tests/xml-declaration/mainPage.xml
rename to tests/app/xml-declaration/mainPage.xml
diff --git a/apps/tests/xml-declaration/mymodule/MyControl.css b/tests/app/xml-declaration/mymodule/MyControl.css
similarity index 100%
rename from apps/tests/xml-declaration/mymodule/MyControl.css
rename to tests/app/xml-declaration/mymodule/MyControl.css
diff --git a/apps/tests/xml-declaration/mymodule/MyControl.ts b/tests/app/xml-declaration/mymodule/MyControl.ts
similarity index 100%
rename from apps/tests/xml-declaration/mymodule/MyControl.ts
rename to tests/app/xml-declaration/mymodule/MyControl.ts
diff --git a/apps/tests/xml-declaration/mymodule/package.json b/tests/app/xml-declaration/mymodule/package.json
similarity index 100%
rename from apps/tests/xml-declaration/mymodule/package.json
rename to tests/app/xml-declaration/mymodule/package.json
diff --git a/apps/tests/xml-declaration/mymodulewithxml/MyControl.css b/tests/app/xml-declaration/mymodulewithxml/MyControl.css
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/MyControl.css
rename to tests/app/xml-declaration/mymodulewithxml/MyControl.css
diff --git a/apps/tests/xml-declaration/mymodulewithxml/MyControl.ts b/tests/app/xml-declaration/mymodulewithxml/MyControl.ts
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/MyControl.ts
rename to tests/app/xml-declaration/mymodulewithxml/MyControl.ts
diff --git a/apps/tests/xml-declaration/mymodulewithxml/MyControl.xml b/tests/app/xml-declaration/mymodulewithxml/MyControl.xml
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/MyControl.xml
rename to tests/app/xml-declaration/mymodulewithxml/MyControl.xml
diff --git a/apps/tests/xml-declaration/mymodulewithxml/TabViewParentChain.ts b/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/TabViewParentChain.ts
rename to tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts
diff --git a/apps/tests/xml-declaration/mymodulewithxml/TabViewParentChain.xml b/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.xml
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/TabViewParentChain.xml
rename to tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.xml
diff --git a/apps/tests/xml-declaration/mymodulewithxml/my-control-no-js.xml b/tests/app/xml-declaration/mymodulewithxml/my-control-no-js.xml
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/my-control-no-js.xml
rename to tests/app/xml-declaration/mymodulewithxml/my-control-no-js.xml
diff --git a/apps/tests/xml-declaration/mymodulewithxml/package.json b/tests/app/xml-declaration/mymodulewithxml/package.json
similarity index 100%
rename from apps/tests/xml-declaration/mymodulewithxml/package.json
rename to tests/app/xml-declaration/mymodulewithxml/package.json
diff --git a/apps/tests/xml-declaration/package.json b/tests/app/xml-declaration/package.json
similarity index 100%
rename from apps/tests/xml-declaration/package.json
rename to tests/app/xml-declaration/package.json
diff --git a/apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment-the-fragment.xml b/tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment-the-fragment.xml
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment-the-fragment.xml
rename to tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment-the-fragment.xml
diff --git a/apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts b/tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts
rename to tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts
diff --git a/apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.xml b/tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment.xml
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.xml
rename to tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment.xml
diff --git a/apps/tests/xml-declaration/template-builder-tests/event-in-template.ts b/tests/app/xml-declaration/template-builder-tests/event-in-template.ts
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/event-in-template.ts
rename to tests/app/xml-declaration/template-builder-tests/event-in-template.ts
diff --git a/apps/tests/xml-declaration/template-builder-tests/event-in-template.xml b/tests/app/xml-declaration/template-builder-tests/event-in-template.xml
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/event-in-template.xml
rename to tests/app/xml-declaration/template-builder-tests/event-in-template.xml
diff --git a/apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml b/tests/app/xml-declaration/template-builder-tests/simple-template-test.xml
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/simple-template-test.xml
rename to tests/app/xml-declaration/template-builder-tests/simple-template-test.xml
diff --git a/apps/tests/xml-declaration/template-builder-tests/template-view.ts b/tests/app/xml-declaration/template-builder-tests/template-view.ts
similarity index 100%
rename from apps/tests/xml-declaration/template-builder-tests/template-view.ts
rename to tests/app/xml-declaration/template-builder-tests/template-view.ts
diff --git a/apps/tests/xml-declaration/tns.xsd b/tests/app/xml-declaration/tns.xsd
similarity index 100%
rename from apps/tests/xml-declaration/tns.xsd
rename to tests/app/xml-declaration/tns.xsd
diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
similarity index 100%
rename from apps/tests/xml-declaration/xml-declaration-tests.ts
rename to tests/app/xml-declaration/xml-declaration-tests.ts
diff --git a/apps/tests/xml-parser-tests/xml-parser-tests.ts b/tests/app/xml-parser-tests/xml-parser-tests.ts
similarity index 100%
rename from apps/tests/xml-parser-tests/xml-parser-tests.ts
rename to tests/app/xml-parser-tests/xml-parser-tests.ts
diff --git a/apps/tests/xml-parser-tests/xml-parser.md b/tests/app/xml-parser-tests/xml-parser.md
similarity index 100%
rename from apps/tests/xml-parser-tests/xml-parser.md
rename to tests/app/xml-parser-tests/xml-parser.md
diff --git a/apps/tests/xml-parser-tests/xml-with-namespaces.xml b/tests/app/xml-parser-tests/xml-with-namespaces.xml
similarity index 100%
rename from apps/tests/xml-parser-tests/xml-with-namespaces.xml
rename to tests/app/xml-parser-tests/xml-with-namespaces.xml
diff --git a/apps/tests/xml-parser-tests/xml.expected b/tests/app/xml-parser-tests/xml.expected
similarity index 100%
rename from apps/tests/xml-parser-tests/xml.expected
rename to tests/app/xml-parser-tests/xml.expected
diff --git a/apps/tests/xml-parser-tests/xml.xml b/tests/app/xml-parser-tests/xml.xml
similarity index 100%
rename from apps/tests/xml-parser-tests/xml.xml
rename to tests/app/xml-parser-tests/xml.xml
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 000000000..d774ea1c0
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,15 @@
+{
+	"description": "NativeScript Application",
+	"license": "SEE LICENSE IN <your-license-filename>",
+	"readme": "NativeScript Application",
+	"repository": "<fill-your-repository-here>",
+	"nativescript": {
+		"id": "org.nativescript.tests",
+		"tns-ios": {
+			"version": "2.0.0"
+		}
+	},
+	"dependencies": {
+		"tns-core-modules": "2.0.1"
+	}
+}
\ No newline at end of file
diff --git a/tns-core-modules/LICENSE b/tns-core-modules/LICENSE
new file mode 100755
index 000000000..ac41823d0
--- /dev/null
+++ b/tns-core-modules/LICENSE
@@ -0,0 +1,13 @@
+   Copyright (c) 2015-2016 Telerik AD
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tns-core-modules/LICENSE.md b/tns-core-modules/LICENSE.md
new file mode 100644
index 000000000..58cd2ce04
--- /dev/null
+++ b/tns-core-modules/LICENSE.md
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2015-2016 Telerik AD
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/android17.d.ts b/tns-core-modules/android17.d.ts
similarity index 100%
rename from android17.d.ts
rename to tns-core-modules/android17.d.ts
diff --git a/application-settings/Readme.md b/tns-core-modules/application-settings/Readme.md
similarity index 100%
rename from application-settings/Readme.md
rename to tns-core-modules/application-settings/Readme.md
diff --git a/application-settings/application-settings-common.ts b/tns-core-modules/application-settings/application-settings-common.ts
similarity index 100%
rename from application-settings/application-settings-common.ts
rename to tns-core-modules/application-settings/application-settings-common.ts
diff --git a/application-settings/application-settings.android.ts b/tns-core-modules/application-settings/application-settings.android.ts
similarity index 100%
rename from application-settings/application-settings.android.ts
rename to tns-core-modules/application-settings/application-settings.android.ts
diff --git a/application-settings/application-settings.d.ts b/tns-core-modules/application-settings/application-settings.d.ts
similarity index 100%
rename from application-settings/application-settings.d.ts
rename to tns-core-modules/application-settings/application-settings.d.ts
diff --git a/application-settings/application-settings.ios.ts b/tns-core-modules/application-settings/application-settings.ios.ts
similarity index 100%
rename from application-settings/application-settings.ios.ts
rename to tns-core-modules/application-settings/application-settings.ios.ts
diff --git a/application-settings/package.json b/tns-core-modules/application-settings/package.json
similarity index 100%
rename from application-settings/package.json
rename to tns-core-modules/application-settings/package.json
diff --git a/application/Readme.md b/tns-core-modules/application/Readme.md
similarity index 100%
rename from application/Readme.md
rename to tns-core-modules/application/Readme.md
diff --git a/application/application-common.ts b/tns-core-modules/application/application-common.ts
similarity index 100%
rename from application/application-common.ts
rename to tns-core-modules/application/application-common.ts
diff --git a/application/application.android.ts b/tns-core-modules/application/application.android.ts
similarity index 100%
rename from application/application.android.ts
rename to tns-core-modules/application/application.android.ts
diff --git a/application/application.d.ts b/tns-core-modules/application/application.d.ts
similarity index 100%
rename from application/application.d.ts
rename to tns-core-modules/application/application.d.ts
diff --git a/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
similarity index 100%
rename from application/application.ios.ts
rename to tns-core-modules/application/application.ios.ts
diff --git a/application/package.json b/tns-core-modules/application/package.json
similarity index 100%
rename from application/package.json
rename to tns-core-modules/application/package.json
diff --git a/camera/Readme.md b/tns-core-modules/camera/Readme.md
similarity index 100%
rename from camera/Readme.md
rename to tns-core-modules/camera/Readme.md
diff --git a/camera/camera-common.ts b/tns-core-modules/camera/camera-common.ts
similarity index 100%
rename from camera/camera-common.ts
rename to tns-core-modules/camera/camera-common.ts
diff --git a/camera/camera.android.ts b/tns-core-modules/camera/camera.android.ts
similarity index 100%
rename from camera/camera.android.ts
rename to tns-core-modules/camera/camera.android.ts
diff --git a/camera/camera.d.ts b/tns-core-modules/camera/camera.d.ts
similarity index 100%
rename from camera/camera.d.ts
rename to tns-core-modules/camera/camera.d.ts
diff --git a/camera/camera.ios.ts b/tns-core-modules/camera/camera.ios.ts
similarity index 100%
rename from camera/camera.ios.ts
rename to tns-core-modules/camera/camera.ios.ts
diff --git a/camera/package.json b/tns-core-modules/camera/package.json
similarity index 100%
rename from camera/package.json
rename to tns-core-modules/camera/package.json
diff --git a/color/color-common.ts b/tns-core-modules/color/color-common.ts
similarity index 100%
rename from color/color-common.ts
rename to tns-core-modules/color/color-common.ts
diff --git a/color/color.android.ts b/tns-core-modules/color/color.android.ts
similarity index 100%
rename from color/color.android.ts
rename to tns-core-modules/color/color.android.ts
diff --git a/color/color.d.ts b/tns-core-modules/color/color.d.ts
similarity index 100%
rename from color/color.d.ts
rename to tns-core-modules/color/color.d.ts
diff --git a/color/color.ios.ts b/tns-core-modules/color/color.ios.ts
similarity index 100%
rename from color/color.ios.ts
rename to tns-core-modules/color/color.ios.ts
diff --git a/color/known-colors.d.ts b/tns-core-modules/color/known-colors.d.ts
similarity index 100%
rename from color/known-colors.d.ts
rename to tns-core-modules/color/known-colors.d.ts
diff --git a/color/known-colors.ts b/tns-core-modules/color/known-colors.ts
similarity index 100%
rename from color/known-colors.ts
rename to tns-core-modules/color/known-colors.ts
diff --git a/color/package.json b/tns-core-modules/color/package.json
similarity index 100%
rename from color/package.json
rename to tns-core-modules/color/package.json
diff --git a/connectivity/connectivity-common.ts b/tns-core-modules/connectivity/connectivity-common.ts
similarity index 100%
rename from connectivity/connectivity-common.ts
rename to tns-core-modules/connectivity/connectivity-common.ts
diff --git a/connectivity/connectivity.android.ts b/tns-core-modules/connectivity/connectivity.android.ts
similarity index 100%
rename from connectivity/connectivity.android.ts
rename to tns-core-modules/connectivity/connectivity.android.ts
diff --git a/connectivity/connectivity.d.ts b/tns-core-modules/connectivity/connectivity.d.ts
similarity index 100%
rename from connectivity/connectivity.d.ts
rename to tns-core-modules/connectivity/connectivity.d.ts
diff --git a/connectivity/connectivity.ios.ts b/tns-core-modules/connectivity/connectivity.ios.ts
similarity index 100%
rename from connectivity/connectivity.ios.ts
rename to tns-core-modules/connectivity/connectivity.ios.ts
diff --git a/connectivity/package.json b/tns-core-modules/connectivity/package.json
similarity index 100%
rename from connectivity/package.json
rename to tns-core-modules/connectivity/package.json
diff --git a/console/Readme.md b/tns-core-modules/console/Readme.md
similarity index 100%
rename from console/Readme.md
rename to tns-core-modules/console/Readme.md
diff --git a/console/console.d.ts b/tns-core-modules/console/console.d.ts
similarity index 100%
rename from console/console.d.ts
rename to tns-core-modules/console/console.d.ts
diff --git a/console/console.ts b/tns-core-modules/console/console.ts
similarity index 100%
rename from console/console.ts
rename to tns-core-modules/console/console.ts
diff --git a/console/package.json b/tns-core-modules/console/package.json
similarity index 100%
rename from console/package.json
rename to tns-core-modules/console/package.json
diff --git a/css-value/LICENSE b/tns-core-modules/css-value/LICENSE
similarity index 100%
rename from css-value/LICENSE
rename to tns-core-modules/css-value/LICENSE
diff --git a/css-value/Readme.md b/tns-core-modules/css-value/Readme.md
similarity index 100%
rename from css-value/Readme.md
rename to tns-core-modules/css-value/Readme.md
diff --git a/css-value/UPGRADING.md b/tns-core-modules/css-value/UPGRADING.md
similarity index 100%
rename from css-value/UPGRADING.md
rename to tns-core-modules/css-value/UPGRADING.md
diff --git a/css-value/index.js b/tns-core-modules/css-value/index.js
similarity index 100%
rename from css-value/index.js
rename to tns-core-modules/css-value/index.js
diff --git a/css-value/package.json b/tns-core-modules/css-value/package.json
similarity index 100%
rename from css-value/package.json
rename to tns-core-modules/css-value/package.json
diff --git a/css-value/reworkcss-value.d.ts b/tns-core-modules/css-value/reworkcss-value.d.ts
similarity index 100%
rename from css-value/reworkcss-value.d.ts
rename to tns-core-modules/css-value/reworkcss-value.d.ts
diff --git a/css/LICENSE b/tns-core-modules/css/LICENSE
similarity index 100%
rename from css/LICENSE
rename to tns-core-modules/css/LICENSE
diff --git a/css/Readme.md b/tns-core-modules/css/Readme.md
similarity index 100%
rename from css/Readme.md
rename to tns-core-modules/css/Readme.md
diff --git a/css/index.js b/tns-core-modules/css/index.js
similarity index 100%
rename from css/index.js
rename to tns-core-modules/css/index.js
diff --git a/css/lib/parse/index.js b/tns-core-modules/css/lib/parse/index.js
similarity index 100%
rename from css/lib/parse/index.js
rename to tns-core-modules/css/lib/parse/index.js
diff --git a/css/package.json b/tns-core-modules/css/package.json
similarity index 100%
rename from css/package.json
rename to tns-core-modules/css/package.json
diff --git a/css/reworkcss.d.ts b/tns-core-modules/css/reworkcss.d.ts
similarity index 100%
rename from css/reworkcss.d.ts
rename to tns-core-modules/css/reworkcss.d.ts
diff --git a/data/observable-array/observable-array.d.ts b/tns-core-modules/data/observable-array/observable-array.d.ts
similarity index 100%
rename from data/observable-array/observable-array.d.ts
rename to tns-core-modules/data/observable-array/observable-array.d.ts
diff --git a/data/observable-array/observable-array.ts b/tns-core-modules/data/observable-array/observable-array.ts
similarity index 100%
rename from data/observable-array/observable-array.ts
rename to tns-core-modules/data/observable-array/observable-array.ts
diff --git a/data/observable-array/package.json b/tns-core-modules/data/observable-array/package.json
similarity index 100%
rename from data/observable-array/package.json
rename to tns-core-modules/data/observable-array/package.json
diff --git a/data/observable/observable.d.ts b/tns-core-modules/data/observable/observable.d.ts
similarity index 100%
rename from data/observable/observable.d.ts
rename to tns-core-modules/data/observable/observable.d.ts
diff --git a/data/observable/observable.ts b/tns-core-modules/data/observable/observable.ts
similarity index 100%
rename from data/observable/observable.ts
rename to tns-core-modules/data/observable/observable.ts
diff --git a/data/observable/package.json b/tns-core-modules/data/observable/package.json
similarity index 100%
rename from data/observable/package.json
rename to tns-core-modules/data/observable/package.json
diff --git a/data/package.json b/tns-core-modules/data/package.json
similarity index 100%
rename from data/package.json
rename to tns-core-modules/data/package.json
diff --git a/data/virtual-array/package.json b/tns-core-modules/data/virtual-array/package.json
similarity index 100%
rename from data/virtual-array/package.json
rename to tns-core-modules/data/virtual-array/package.json
diff --git a/data/virtual-array/virtual-array.d.ts b/tns-core-modules/data/virtual-array/virtual-array.d.ts
similarity index 100%
rename from data/virtual-array/virtual-array.d.ts
rename to tns-core-modules/data/virtual-array/virtual-array.d.ts
diff --git a/data/virtual-array/virtual-array.ts b/tns-core-modules/data/virtual-array/virtual-array.ts
similarity index 100%
rename from data/virtual-array/virtual-array.ts
rename to tns-core-modules/data/virtual-array/virtual-array.ts
diff --git a/debugger/InspectorBackendCommands.ios.ts b/tns-core-modules/debugger/InspectorBackendCommands.ios.ts
similarity index 100%
rename from debugger/InspectorBackendCommands.ios.ts
rename to tns-core-modules/debugger/InspectorBackendCommands.ios.ts
diff --git a/debugger/debugger.ts b/tns-core-modules/debugger/debugger.ts
similarity index 100%
rename from debugger/debugger.ts
rename to tns-core-modules/debugger/debugger.ts
diff --git a/debugger/package.json b/tns-core-modules/debugger/package.json
similarity index 100%
rename from debugger/package.json
rename to tns-core-modules/debugger/package.json
diff --git a/debugger/webinspector.ios.ts b/tns-core-modules/debugger/webinspector.ios.ts
similarity index 100%
rename from debugger/webinspector.ios.ts
rename to tns-core-modules/debugger/webinspector.ios.ts
diff --git a/declarations.android.d.ts b/tns-core-modules/declarations.android.d.ts
similarity index 100%
rename from declarations.android.d.ts
rename to tns-core-modules/declarations.android.d.ts
diff --git a/declarations.d.ts b/tns-core-modules/declarations.d.ts
similarity index 100%
rename from declarations.d.ts
rename to tns-core-modules/declarations.d.ts
diff --git a/declarations.ios.d.ts b/tns-core-modules/declarations.ios.d.ts
similarity index 100%
rename from declarations.ios.d.ts
rename to tns-core-modules/declarations.ios.d.ts
diff --git a/es-collections.d.ts b/tns-core-modules/es-collections.d.ts
similarity index 100%
rename from es-collections.d.ts
rename to tns-core-modules/es-collections.d.ts
diff --git a/es6-promise.d.ts b/tns-core-modules/es6-promise.d.ts
similarity index 100%
rename from es6-promise.d.ts
rename to tns-core-modules/es6-promise.d.ts
diff --git a/es6.d.ts b/tns-core-modules/es6.d.ts
similarity index 100%
rename from es6.d.ts
rename to tns-core-modules/es6.d.ts
diff --git a/expect.exp b/tns-core-modules/expect.exp
similarity index 100%
rename from expect.exp
rename to tns-core-modules/expect.exp
diff --git a/fetch/LICENSE b/tns-core-modules/fetch/LICENSE
similarity index 100%
rename from fetch/LICENSE
rename to tns-core-modules/fetch/LICENSE
diff --git a/fetch/README.md b/tns-core-modules/fetch/README.md
similarity index 100%
rename from fetch/README.md
rename to tns-core-modules/fetch/README.md
diff --git a/fetch/fetch.js b/tns-core-modules/fetch/fetch.js
similarity index 100%
rename from fetch/fetch.js
rename to tns-core-modules/fetch/fetch.js
diff --git a/fetch/package.json b/tns-core-modules/fetch/package.json
similarity index 100%
rename from fetch/package.json
rename to tns-core-modules/fetch/package.json
diff --git a/file-system/file-name-resolver.d.ts b/tns-core-modules/file-system/file-name-resolver.d.ts
similarity index 100%
rename from file-system/file-name-resolver.d.ts
rename to tns-core-modules/file-system/file-name-resolver.d.ts
diff --git a/file-system/file-name-resolver.ts b/tns-core-modules/file-system/file-name-resolver.ts
similarity index 100%
rename from file-system/file-name-resolver.ts
rename to tns-core-modules/file-system/file-name-resolver.ts
diff --git a/file-system/file-system-access.android.ts b/tns-core-modules/file-system/file-system-access.android.ts
similarity index 100%
rename from file-system/file-system-access.android.ts
rename to tns-core-modules/file-system/file-system-access.android.ts
diff --git a/file-system/file-system-access.d.ts b/tns-core-modules/file-system/file-system-access.d.ts
similarity index 100%
rename from file-system/file-system-access.d.ts
rename to tns-core-modules/file-system/file-system-access.d.ts
diff --git a/file-system/file-system-access.ios.ts b/tns-core-modules/file-system/file-system-access.ios.ts
similarity index 100%
rename from file-system/file-system-access.ios.ts
rename to tns-core-modules/file-system/file-system-access.ios.ts
diff --git a/file-system/file-system.d.ts b/tns-core-modules/file-system/file-system.d.ts
similarity index 100%
rename from file-system/file-system.d.ts
rename to tns-core-modules/file-system/file-system.d.ts
diff --git a/file-system/file-system.ts b/tns-core-modules/file-system/file-system.ts
similarity index 100%
rename from file-system/file-system.ts
rename to tns-core-modules/file-system/file-system.ts
diff --git a/file-system/package.json b/tns-core-modules/file-system/package.json
similarity index 100%
rename from file-system/package.json
rename to tns-core-modules/file-system/package.json
diff --git a/fps-meter/fps-meter.d.ts b/tns-core-modules/fps-meter/fps-meter.d.ts
similarity index 100%
rename from fps-meter/fps-meter.d.ts
rename to tns-core-modules/fps-meter/fps-meter.d.ts
diff --git a/fps-meter/fps-meter.ts b/tns-core-modules/fps-meter/fps-meter.ts
similarity index 100%
rename from fps-meter/fps-meter.ts
rename to tns-core-modules/fps-meter/fps-meter.ts
diff --git a/fps-meter/fps-native.android.ts b/tns-core-modules/fps-meter/fps-native.android.ts
similarity index 100%
rename from fps-meter/fps-native.android.ts
rename to tns-core-modules/fps-meter/fps-native.android.ts
diff --git a/fps-meter/fps-native.d.ts b/tns-core-modules/fps-meter/fps-native.d.ts
similarity index 100%
rename from fps-meter/fps-native.d.ts
rename to tns-core-modules/fps-meter/fps-native.d.ts
diff --git a/fps-meter/fps-native.ios.ts b/tns-core-modules/fps-meter/fps-native.ios.ts
similarity index 100%
rename from fps-meter/fps-native.ios.ts
rename to tns-core-modules/fps-meter/fps-native.ios.ts
diff --git a/fps-meter/package.json b/tns-core-modules/fps-meter/package.json
similarity index 100%
rename from fps-meter/package.json
rename to tns-core-modules/fps-meter/package.json
diff --git a/globals/Readme.md b/tns-core-modules/globals/Readme.md
similarity index 100%
rename from globals/Readme.md
rename to tns-core-modules/globals/Readme.md
diff --git a/globals/decorators.ts b/tns-core-modules/globals/decorators.ts
similarity index 100%
rename from globals/decorators.ts
rename to tns-core-modules/globals/decorators.ts
diff --git a/globals/globals.ts b/tns-core-modules/globals/globals.ts
similarity index 100%
rename from globals/globals.ts
rename to tns-core-modules/globals/globals.ts
diff --git a/globals/package.json b/tns-core-modules/globals/package.json
similarity index 100%
rename from globals/package.json
rename to tns-core-modules/globals/package.json
diff --git a/http/Readme.md b/tns-core-modules/http/Readme.md
similarity index 100%
rename from http/Readme.md
rename to tns-core-modules/http/Readme.md
diff --git a/http/http-request.android.ts b/tns-core-modules/http/http-request.android.ts
similarity index 100%
rename from http/http-request.android.ts
rename to tns-core-modules/http/http-request.android.ts
diff --git a/http/http-request.d.ts b/tns-core-modules/http/http-request.d.ts
similarity index 100%
rename from http/http-request.d.ts
rename to tns-core-modules/http/http-request.d.ts
diff --git a/http/http-request.ios.ts b/tns-core-modules/http/http-request.ios.ts
similarity index 100%
rename from http/http-request.ios.ts
rename to tns-core-modules/http/http-request.ios.ts
diff --git a/http/http.d.ts b/tns-core-modules/http/http.d.ts
similarity index 100%
rename from http/http.d.ts
rename to tns-core-modules/http/http.d.ts
diff --git a/http/http.ts b/tns-core-modules/http/http.ts
similarity index 100%
rename from http/http.ts
rename to tns-core-modules/http/http.ts
diff --git a/http/package.json b/tns-core-modules/http/package.json
similarity index 100%
rename from http/package.json
rename to tns-core-modules/http/package.json
diff --git a/image-source/Readme.md b/tns-core-modules/image-source/Readme.md
similarity index 100%
rename from image-source/Readme.md
rename to tns-core-modules/image-source/Readme.md
diff --git a/image-source/image-source-common.ts b/tns-core-modules/image-source/image-source-common.ts
similarity index 100%
rename from image-source/image-source-common.ts
rename to tns-core-modules/image-source/image-source-common.ts
diff --git a/image-source/image-source.android.ts b/tns-core-modules/image-source/image-source.android.ts
similarity index 100%
rename from image-source/image-source.android.ts
rename to tns-core-modules/image-source/image-source.android.ts
diff --git a/image-source/image-source.d.ts b/tns-core-modules/image-source/image-source.d.ts
similarity index 100%
rename from image-source/image-source.d.ts
rename to tns-core-modules/image-source/image-source.d.ts
diff --git a/image-source/image-source.ios.ts b/tns-core-modules/image-source/image-source.ios.ts
similarity index 100%
rename from image-source/image-source.ios.ts
rename to tns-core-modules/image-source/image-source.ios.ts
diff --git a/image-source/package.json b/tns-core-modules/image-source/package.json
similarity index 100%
rename from image-source/package.json
rename to tns-core-modules/image-source/package.json
diff --git a/inspector_modules.ios.ts b/tns-core-modules/inspector_modules.ios.ts
similarity index 100%
rename from inspector_modules.ios.ts
rename to tns-core-modules/inspector_modules.ios.ts
diff --git a/ios.d.ts b/tns-core-modules/ios.d.ts
similarity index 100%
rename from ios.d.ts
rename to tns-core-modules/ios.d.ts
diff --git a/js-libs/easysax/LICENSE b/tns-core-modules/js-libs/easysax/LICENSE
similarity index 100%
rename from js-libs/easysax/LICENSE
rename to tns-core-modules/js-libs/easysax/LICENSE
diff --git a/js-libs/easysax/README.md b/tns-core-modules/js-libs/easysax/README.md
similarity index 100%
rename from js-libs/easysax/README.md
rename to tns-core-modules/js-libs/easysax/README.md
diff --git a/js-libs/easysax/easysax.d.ts b/tns-core-modules/js-libs/easysax/easysax.d.ts
similarity index 100%
rename from js-libs/easysax/easysax.d.ts
rename to tns-core-modules/js-libs/easysax/easysax.d.ts
diff --git a/js-libs/easysax/easysax.js b/tns-core-modules/js-libs/easysax/easysax.js
similarity index 100%
rename from js-libs/easysax/easysax.js
rename to tns-core-modules/js-libs/easysax/easysax.js
diff --git a/js-libs/easysax/package.json b/tns-core-modules/js-libs/easysax/package.json
similarity index 100%
rename from js-libs/easysax/package.json
rename to tns-core-modules/js-libs/easysax/package.json
diff --git a/js-libs/esprima/LICENSE.BSD b/tns-core-modules/js-libs/esprima/LICENSE.BSD
similarity index 100%
rename from js-libs/esprima/LICENSE.BSD
rename to tns-core-modules/js-libs/esprima/LICENSE.BSD
diff --git a/js-libs/esprima/README.md b/tns-core-modules/js-libs/esprima/README.md
similarity index 100%
rename from js-libs/esprima/README.md
rename to tns-core-modules/js-libs/esprima/README.md
diff --git a/js-libs/esprima/esprima.d.ts b/tns-core-modules/js-libs/esprima/esprima.d.ts
similarity index 100%
rename from js-libs/esprima/esprima.d.ts
rename to tns-core-modules/js-libs/esprima/esprima.d.ts
diff --git a/js-libs/esprima/esprima.js b/tns-core-modules/js-libs/esprima/esprima.js
similarity index 100%
rename from js-libs/esprima/esprima.js
rename to tns-core-modules/js-libs/esprima/esprima.js
diff --git a/js-libs/esprima/package.json b/tns-core-modules/js-libs/esprima/package.json
similarity index 100%
rename from js-libs/esprima/package.json
rename to tns-core-modules/js-libs/esprima/package.json
diff --git a/js-libs/polymer-expressions/LICENSE b/tns-core-modules/js-libs/polymer-expressions/LICENSE
similarity index 100%
rename from js-libs/polymer-expressions/LICENSE
rename to tns-core-modules/js-libs/polymer-expressions/LICENSE
diff --git a/js-libs/polymer-expressions/README.md b/tns-core-modules/js-libs/polymer-expressions/README.md
similarity index 100%
rename from js-libs/polymer-expressions/README.md
rename to tns-core-modules/js-libs/polymer-expressions/README.md
diff --git a/js-libs/polymer-expressions/package.json b/tns-core-modules/js-libs/polymer-expressions/package.json
similarity index 100%
rename from js-libs/polymer-expressions/package.json
rename to tns-core-modules/js-libs/polymer-expressions/package.json
diff --git a/js-libs/polymer-expressions/path-parser.js b/tns-core-modules/js-libs/polymer-expressions/path-parser.js
similarity index 100%
rename from js-libs/polymer-expressions/path-parser.js
rename to tns-core-modules/js-libs/polymer-expressions/path-parser.js
diff --git a/js-libs/polymer-expressions/polymer-expressions.d.ts b/tns-core-modules/js-libs/polymer-expressions/polymer-expressions.d.ts
similarity index 100%
rename from js-libs/polymer-expressions/polymer-expressions.d.ts
rename to tns-core-modules/js-libs/polymer-expressions/polymer-expressions.d.ts
diff --git a/js-libs/polymer-expressions/polymer-expressions.js b/tns-core-modules/js-libs/polymer-expressions/polymer-expressions.js
similarity index 100%
rename from js-libs/polymer-expressions/polymer-expressions.js
rename to tns-core-modules/js-libs/polymer-expressions/polymer-expressions.js
diff --git a/location/Readme.md b/tns-core-modules/location/Readme.md
similarity index 100%
rename from location/Readme.md
rename to tns-core-modules/location/Readme.md
diff --git a/location/location-common.ts b/tns-core-modules/location/location-common.ts
similarity index 100%
rename from location/location-common.ts
rename to tns-core-modules/location/location-common.ts
diff --git a/location/location.android.ts b/tns-core-modules/location/location.android.ts
similarity index 100%
rename from location/location.android.ts
rename to tns-core-modules/location/location.android.ts
diff --git a/location/location.d.ts b/tns-core-modules/location/location.d.ts
similarity index 100%
rename from location/location.d.ts
rename to tns-core-modules/location/location.d.ts
diff --git a/location/location.ios.ts b/tns-core-modules/location/location.ios.ts
similarity index 100%
rename from location/location.ios.ts
rename to tns-core-modules/location/location.ios.ts
diff --git a/location/package.json b/tns-core-modules/location/package.json
similarity index 100%
rename from location/package.json
rename to tns-core-modules/location/package.json
diff --git a/module.d.ts b/tns-core-modules/module.d.ts
similarity index 100%
rename from module.d.ts
rename to tns-core-modules/module.d.ts
diff --git a/org.nativescript.widgets.d.ts b/tns-core-modules/org.nativescript.widgets.d.ts
similarity index 100%
rename from org.nativescript.widgets.d.ts
rename to tns-core-modules/org.nativescript.widgets.d.ts
diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json
new file mode 100644
index 000000000..0eba4790f
--- /dev/null
+++ b/tns-core-modules/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "tns-core-modules",
+  "description": "Telerik NativeScript Core Modules",
+  "version": "2.1.0",
+  "homepage":"https://www.nativescript.org",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/NativeScript"
+  },
+  "files": [
+    "**/*.d.ts",
+    "**/*.js",
+    "!android17.d.ts",
+    "!ios.d.ts",
+    "!bin/",
+    "!apps/",
+    "!build/",
+    "!node-tests/",
+    "!declarations.android.d.ts",
+    "!declarations.ios.d.ts",
+    "!gruntfile.js",
+    "!org.nativescript.widgets.d.ts"
+  ],
+  "license": "Apache-2.0",
+  "typings": "tns-core-modules.d.ts",
+  "dependencies": {
+    "tns-core-modules-widgets": "next"
+  },
+  "nativescript": {
+    "platforms": {
+      "ios": "2.0.0",
+      "android": "2.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform/package.json b/tns-core-modules/platform/package.json
similarity index 100%
rename from platform/package.json
rename to tns-core-modules/platform/package.json
diff --git a/platform/platform.android.ts b/tns-core-modules/platform/platform.android.ts
similarity index 100%
rename from platform/platform.android.ts
rename to tns-core-modules/platform/platform.android.ts
diff --git a/platform/platform.d.ts b/tns-core-modules/platform/platform.d.ts
similarity index 100%
rename from platform/platform.d.ts
rename to tns-core-modules/platform/platform.d.ts
diff --git a/platform/platform.ios.ts b/tns-core-modules/platform/platform.ios.ts
similarity index 100%
rename from platform/platform.ios.ts
rename to tns-core-modules/platform/platform.ios.ts
diff --git a/text/formatted-string-common.ts b/tns-core-modules/text/formatted-string-common.ts
similarity index 100%
rename from text/formatted-string-common.ts
rename to tns-core-modules/text/formatted-string-common.ts
diff --git a/text/formatted-string.android.ts b/tns-core-modules/text/formatted-string.android.ts
similarity index 100%
rename from text/formatted-string.android.ts
rename to tns-core-modules/text/formatted-string.android.ts
diff --git a/text/formatted-string.d.ts b/tns-core-modules/text/formatted-string.d.ts
similarity index 100%
rename from text/formatted-string.d.ts
rename to tns-core-modules/text/formatted-string.d.ts
diff --git a/text/formatted-string.ios.ts b/tns-core-modules/text/formatted-string.ios.ts
similarity index 100%
rename from text/formatted-string.ios.ts
rename to tns-core-modules/text/formatted-string.ios.ts
diff --git a/text/package.json b/tns-core-modules/text/package.json
similarity index 100%
rename from text/package.json
rename to tns-core-modules/text/package.json
diff --git a/text/span-common.ts b/tns-core-modules/text/span-common.ts
similarity index 100%
rename from text/span-common.ts
rename to tns-core-modules/text/span-common.ts
diff --git a/text/span.android.ts b/tns-core-modules/text/span.android.ts
similarity index 100%
rename from text/span.android.ts
rename to tns-core-modules/text/span.android.ts
diff --git a/text/span.d.ts b/tns-core-modules/text/span.d.ts
similarity index 100%
rename from text/span.d.ts
rename to tns-core-modules/text/span.d.ts
diff --git a/text/span.ios.ts b/tns-core-modules/text/span.ios.ts
similarity index 100%
rename from text/span.ios.ts
rename to tns-core-modules/text/span.ios.ts
diff --git a/text/text.android.ts b/tns-core-modules/text/text.android.ts
similarity index 100%
rename from text/text.android.ts
rename to tns-core-modules/text/text.android.ts
diff --git a/text/text.d.ts b/tns-core-modules/text/text.d.ts
similarity index 100%
rename from text/text.d.ts
rename to tns-core-modules/text/text.d.ts
diff --git a/text/text.ios.ts b/tns-core-modules/text/text.ios.ts
similarity index 100%
rename from text/text.ios.ts
rename to tns-core-modules/text/text.ios.ts
diff --git a/timer/Readme.md b/tns-core-modules/timer/Readme.md
similarity index 100%
rename from timer/Readme.md
rename to tns-core-modules/timer/Readme.md
diff --git a/timer/package.json b/tns-core-modules/timer/package.json
similarity index 100%
rename from timer/package.json
rename to tns-core-modules/timer/package.json
diff --git a/timer/timer.android.ts b/tns-core-modules/timer/timer.android.ts
similarity index 100%
rename from timer/timer.android.ts
rename to tns-core-modules/timer/timer.android.ts
diff --git a/timer/timer.d.ts b/tns-core-modules/timer/timer.d.ts
similarity index 100%
rename from timer/timer.d.ts
rename to tns-core-modules/timer/timer.d.ts
diff --git a/timer/timer.ios.ts b/tns-core-modules/timer/timer.ios.ts
similarity index 100%
rename from timer/timer.ios.ts
rename to tns-core-modules/timer/timer.ios.ts
diff --git a/trace/Readme.md b/tns-core-modules/trace/Readme.md
similarity index 100%
rename from trace/Readme.md
rename to tns-core-modules/trace/Readme.md
diff --git a/trace/package.json b/tns-core-modules/trace/package.json
similarity index 100%
rename from trace/package.json
rename to tns-core-modules/trace/package.json
diff --git a/trace/trace.d.ts b/tns-core-modules/trace/trace.d.ts
similarity index 100%
rename from trace/trace.d.ts
rename to tns-core-modules/trace/trace.d.ts
diff --git a/trace/trace.ts b/tns-core-modules/trace/trace.ts
similarity index 100%
rename from trace/trace.ts
rename to tns-core-modules/trace/trace.ts
diff --git a/tns-core-modules/tsconfig.json b/tns-core-modules/tsconfig.json
new file mode 100644
index 000000000..6de6def8f
--- /dev/null
+++ b/tns-core-modules/tsconfig.json
@@ -0,0 +1,13 @@
+{
+    "compilerOptions": {
+        "noEmitOnError": true,
+        "noEmitHelpers": true,
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": false,
+        "noImplicitUseStrict": true,
+        "experimentalDecorators": true,
+        "diagnostics": false
+    }
+}
diff --git a/ui/action-bar/action-bar-common.ts b/tns-core-modules/ui/action-bar/action-bar-common.ts
similarity index 100%
rename from ui/action-bar/action-bar-common.ts
rename to tns-core-modules/ui/action-bar/action-bar-common.ts
diff --git a/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
similarity index 100%
rename from ui/action-bar/action-bar.android.ts
rename to tns-core-modules/ui/action-bar/action-bar.android.ts
diff --git a/ui/action-bar/action-bar.d.ts b/tns-core-modules/ui/action-bar/action-bar.d.ts
similarity index 100%
rename from ui/action-bar/action-bar.d.ts
rename to tns-core-modules/ui/action-bar/action-bar.d.ts
diff --git a/ui/action-bar/action-bar.ios.ts b/tns-core-modules/ui/action-bar/action-bar.ios.ts
similarity index 100%
rename from ui/action-bar/action-bar.ios.ts
rename to tns-core-modules/ui/action-bar/action-bar.ios.ts
diff --git a/ui/action-bar/package.json b/tns-core-modules/ui/action-bar/package.json
similarity index 100%
rename from ui/action-bar/package.json
rename to tns-core-modules/ui/action-bar/package.json
diff --git a/ui/activity-indicator/activity-indicator-common.ts b/tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
similarity index 100%
rename from ui/activity-indicator/activity-indicator-common.ts
rename to tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
diff --git a/ui/activity-indicator/activity-indicator.android.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts
similarity index 100%
rename from ui/activity-indicator/activity-indicator.android.ts
rename to tns-core-modules/ui/activity-indicator/activity-indicator.android.ts
diff --git a/ui/activity-indicator/activity-indicator.d.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.d.ts
similarity index 100%
rename from ui/activity-indicator/activity-indicator.d.ts
rename to tns-core-modules/ui/activity-indicator/activity-indicator.d.ts
diff --git a/ui/activity-indicator/activity-indicator.ios.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts
similarity index 100%
rename from ui/activity-indicator/activity-indicator.ios.ts
rename to tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts
diff --git a/ui/activity-indicator/package.json b/tns-core-modules/ui/activity-indicator/package.json
similarity index 100%
rename from ui/activity-indicator/package.json
rename to tns-core-modules/ui/activity-indicator/package.json
diff --git a/ui/animation/animation-common.ts b/tns-core-modules/ui/animation/animation-common.ts
similarity index 100%
rename from ui/animation/animation-common.ts
rename to tns-core-modules/ui/animation/animation-common.ts
diff --git a/ui/animation/animation.android.ts b/tns-core-modules/ui/animation/animation.android.ts
similarity index 100%
rename from ui/animation/animation.android.ts
rename to tns-core-modules/ui/animation/animation.android.ts
diff --git a/ui/animation/animation.d.ts b/tns-core-modules/ui/animation/animation.d.ts
similarity index 100%
rename from ui/animation/animation.d.ts
rename to tns-core-modules/ui/animation/animation.d.ts
diff --git a/ui/animation/animation.ios.ts b/tns-core-modules/ui/animation/animation.ios.ts
similarity index 100%
rename from ui/animation/animation.ios.ts
rename to tns-core-modules/ui/animation/animation.ios.ts
diff --git a/ui/animation/keyframe-animation.d.ts b/tns-core-modules/ui/animation/keyframe-animation.d.ts
similarity index 100%
rename from ui/animation/keyframe-animation.d.ts
rename to tns-core-modules/ui/animation/keyframe-animation.d.ts
diff --git a/ui/animation/keyframe-animation.ts b/tns-core-modules/ui/animation/keyframe-animation.ts
similarity index 100%
rename from ui/animation/keyframe-animation.ts
rename to tns-core-modules/ui/animation/keyframe-animation.ts
diff --git a/ui/animation/package.json b/tns-core-modules/ui/animation/package.json
similarity index 100%
rename from ui/animation/package.json
rename to tns-core-modules/ui/animation/package.json
diff --git a/ui/border/border.d.ts b/tns-core-modules/ui/border/border.d.ts
similarity index 100%
rename from ui/border/border.d.ts
rename to tns-core-modules/ui/border/border.d.ts
diff --git a/ui/border/border.ts b/tns-core-modules/ui/border/border.ts
similarity index 100%
rename from ui/border/border.ts
rename to tns-core-modules/ui/border/border.ts
diff --git a/ui/border/package.json b/tns-core-modules/ui/border/package.json
similarity index 100%
rename from ui/border/package.json
rename to tns-core-modules/ui/border/package.json
diff --git a/ui/builder/binding-builder.d.ts b/tns-core-modules/ui/builder/binding-builder.d.ts
similarity index 100%
rename from ui/builder/binding-builder.d.ts
rename to tns-core-modules/ui/builder/binding-builder.d.ts
diff --git a/ui/builder/binding-builder.ts b/tns-core-modules/ui/builder/binding-builder.ts
similarity index 100%
rename from ui/builder/binding-builder.ts
rename to tns-core-modules/ui/builder/binding-builder.ts
diff --git a/ui/builder/builder.d.ts b/tns-core-modules/ui/builder/builder.d.ts
similarity index 100%
rename from ui/builder/builder.d.ts
rename to tns-core-modules/ui/builder/builder.d.ts
diff --git a/ui/builder/builder.ts b/tns-core-modules/ui/builder/builder.ts
similarity index 100%
rename from ui/builder/builder.ts
rename to tns-core-modules/ui/builder/builder.ts
diff --git a/ui/builder/component-builder.d.ts b/tns-core-modules/ui/builder/component-builder.d.ts
similarity index 100%
rename from ui/builder/component-builder.d.ts
rename to tns-core-modules/ui/builder/component-builder.d.ts
diff --git a/ui/builder/component-builder.ts b/tns-core-modules/ui/builder/component-builder.ts
similarity index 100%
rename from ui/builder/component-builder.ts
rename to tns-core-modules/ui/builder/component-builder.ts
diff --git a/ui/builder/package.json b/tns-core-modules/ui/builder/package.json
similarity index 100%
rename from ui/builder/package.json
rename to tns-core-modules/ui/builder/package.json
diff --git a/ui/builder/special-properties.d.ts b/tns-core-modules/ui/builder/special-properties.d.ts
similarity index 100%
rename from ui/builder/special-properties.d.ts
rename to tns-core-modules/ui/builder/special-properties.d.ts
diff --git a/ui/builder/special-properties.ts b/tns-core-modules/ui/builder/special-properties.ts
similarity index 100%
rename from ui/builder/special-properties.ts
rename to tns-core-modules/ui/builder/special-properties.ts
diff --git a/ui/button/button-common.ts b/tns-core-modules/ui/button/button-common.ts
similarity index 100%
rename from ui/button/button-common.ts
rename to tns-core-modules/ui/button/button-common.ts
diff --git a/ui/button/button.android.ts b/tns-core-modules/ui/button/button.android.ts
similarity index 100%
rename from ui/button/button.android.ts
rename to tns-core-modules/ui/button/button.android.ts
diff --git a/ui/button/button.d.ts b/tns-core-modules/ui/button/button.d.ts
similarity index 100%
rename from ui/button/button.d.ts
rename to tns-core-modules/ui/button/button.d.ts
diff --git a/ui/button/button.ios.ts b/tns-core-modules/ui/button/button.ios.ts
similarity index 100%
rename from ui/button/button.ios.ts
rename to tns-core-modules/ui/button/button.ios.ts
diff --git a/ui/button/package.json b/tns-core-modules/ui/button/package.json
similarity index 100%
rename from ui/button/package.json
rename to tns-core-modules/ui/button/package.json
diff --git a/ui/content-view/content-view.d.ts b/tns-core-modules/ui/content-view/content-view.d.ts
similarity index 100%
rename from ui/content-view/content-view.d.ts
rename to tns-core-modules/ui/content-view/content-view.d.ts
diff --git a/ui/content-view/content-view.ts b/tns-core-modules/ui/content-view/content-view.ts
similarity index 100%
rename from ui/content-view/content-view.ts
rename to tns-core-modules/ui/content-view/content-view.ts
diff --git a/ui/content-view/package.json b/tns-core-modules/ui/content-view/package.json
similarity index 100%
rename from ui/content-view/package.json
rename to tns-core-modules/ui/content-view/package.json
diff --git a/ui/core/bindable.d.ts b/tns-core-modules/ui/core/bindable.d.ts
similarity index 100%
rename from ui/core/bindable.d.ts
rename to tns-core-modules/ui/core/bindable.d.ts
diff --git a/ui/core/bindable.ts b/tns-core-modules/ui/core/bindable.ts
similarity index 100%
rename from ui/core/bindable.ts
rename to tns-core-modules/ui/core/bindable.ts
diff --git a/ui/core/control-state-change.d.ts b/tns-core-modules/ui/core/control-state-change.d.ts
similarity index 100%
rename from ui/core/control-state-change.d.ts
rename to tns-core-modules/ui/core/control-state-change.d.ts
diff --git a/ui/core/control-state-change.ios.ts b/tns-core-modules/ui/core/control-state-change.ios.ts
similarity index 100%
rename from ui/core/control-state-change.ios.ts
rename to tns-core-modules/ui/core/control-state-change.ios.ts
diff --git a/ui/core/dependency-observable.d.ts b/tns-core-modules/ui/core/dependency-observable.d.ts
similarity index 100%
rename from ui/core/dependency-observable.d.ts
rename to tns-core-modules/ui/core/dependency-observable.d.ts
diff --git a/ui/core/dependency-observable.ts b/tns-core-modules/ui/core/dependency-observable.ts
similarity index 100%
rename from ui/core/dependency-observable.ts
rename to tns-core-modules/ui/core/dependency-observable.ts
diff --git a/ui/core/proxy.d.ts b/tns-core-modules/ui/core/proxy.d.ts
similarity index 100%
rename from ui/core/proxy.d.ts
rename to tns-core-modules/ui/core/proxy.d.ts
diff --git a/ui/core/proxy.ts b/tns-core-modules/ui/core/proxy.ts
similarity index 100%
rename from ui/core/proxy.ts
rename to tns-core-modules/ui/core/proxy.ts
diff --git a/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts
similarity index 100%
rename from ui/core/view-common.ts
rename to tns-core-modules/ui/core/view-common.ts
diff --git a/ui/core/view.android.ts b/tns-core-modules/ui/core/view.android.ts
similarity index 100%
rename from ui/core/view.android.ts
rename to tns-core-modules/ui/core/view.android.ts
diff --git a/ui/core/view.d.ts b/tns-core-modules/ui/core/view.d.ts
similarity index 100%
rename from ui/core/view.d.ts
rename to tns-core-modules/ui/core/view.d.ts
diff --git a/ui/core/view.ios.ts b/tns-core-modules/ui/core/view.ios.ts
similarity index 100%
rename from ui/core/view.ios.ts
rename to tns-core-modules/ui/core/view.ios.ts
diff --git a/ui/core/weak-event-listener.d.ts b/tns-core-modules/ui/core/weak-event-listener.d.ts
similarity index 100%
rename from ui/core/weak-event-listener.d.ts
rename to tns-core-modules/ui/core/weak-event-listener.d.ts
diff --git a/ui/core/weak-event-listener.ts b/tns-core-modules/ui/core/weak-event-listener.ts
similarity index 100%
rename from ui/core/weak-event-listener.ts
rename to tns-core-modules/ui/core/weak-event-listener.ts
diff --git a/ui/date-picker/date-picker-common.ts b/tns-core-modules/ui/date-picker/date-picker-common.ts
similarity index 100%
rename from ui/date-picker/date-picker-common.ts
rename to tns-core-modules/ui/date-picker/date-picker-common.ts
diff --git a/ui/date-picker/date-picker.android.ts b/tns-core-modules/ui/date-picker/date-picker.android.ts
similarity index 100%
rename from ui/date-picker/date-picker.android.ts
rename to tns-core-modules/ui/date-picker/date-picker.android.ts
diff --git a/ui/date-picker/date-picker.d.ts b/tns-core-modules/ui/date-picker/date-picker.d.ts
similarity index 100%
rename from ui/date-picker/date-picker.d.ts
rename to tns-core-modules/ui/date-picker/date-picker.d.ts
diff --git a/ui/date-picker/date-picker.ios.ts b/tns-core-modules/ui/date-picker/date-picker.ios.ts
similarity index 100%
rename from ui/date-picker/date-picker.ios.ts
rename to tns-core-modules/ui/date-picker/date-picker.ios.ts
diff --git a/ui/date-picker/package.json b/tns-core-modules/ui/date-picker/package.json
similarity index 100%
rename from ui/date-picker/package.json
rename to tns-core-modules/ui/date-picker/package.json
diff --git a/ui/dialogs/Readme.md b/tns-core-modules/ui/dialogs/Readme.md
similarity index 100%
rename from ui/dialogs/Readme.md
rename to tns-core-modules/ui/dialogs/Readme.md
diff --git a/ui/dialogs/dialogs-common.ts b/tns-core-modules/ui/dialogs/dialogs-common.ts
similarity index 100%
rename from ui/dialogs/dialogs-common.ts
rename to tns-core-modules/ui/dialogs/dialogs-common.ts
diff --git a/ui/dialogs/dialogs.android.ts b/tns-core-modules/ui/dialogs/dialogs.android.ts
similarity index 100%
rename from ui/dialogs/dialogs.android.ts
rename to tns-core-modules/ui/dialogs/dialogs.android.ts
diff --git a/ui/dialogs/dialogs.d.ts b/tns-core-modules/ui/dialogs/dialogs.d.ts
similarity index 100%
rename from ui/dialogs/dialogs.d.ts
rename to tns-core-modules/ui/dialogs/dialogs.d.ts
diff --git a/ui/dialogs/dialogs.ios.ts b/tns-core-modules/ui/dialogs/dialogs.ios.ts
similarity index 100%
rename from ui/dialogs/dialogs.ios.ts
rename to tns-core-modules/ui/dialogs/dialogs.ios.ts
diff --git a/ui/dialogs/package.json b/tns-core-modules/ui/dialogs/package.json
similarity index 100%
rename from ui/dialogs/package.json
rename to tns-core-modules/ui/dialogs/package.json
diff --git a/ui/editable-text-base/editable-text-base-common.ts b/tns-core-modules/ui/editable-text-base/editable-text-base-common.ts
similarity index 100%
rename from ui/editable-text-base/editable-text-base-common.ts
rename to tns-core-modules/ui/editable-text-base/editable-text-base-common.ts
diff --git a/ui/editable-text-base/editable-text-base.android.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
similarity index 100%
rename from ui/editable-text-base/editable-text-base.android.ts
rename to tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
diff --git a/ui/editable-text-base/editable-text-base.d.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.d.ts
similarity index 100%
rename from ui/editable-text-base/editable-text-base.d.ts
rename to tns-core-modules/ui/editable-text-base/editable-text-base.d.ts
diff --git a/ui/editable-text-base/editable-text-base.ios.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts
similarity index 100%
rename from ui/editable-text-base/editable-text-base.ios.ts
rename to tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts
diff --git a/ui/editable-text-base/package.json b/tns-core-modules/ui/editable-text-base/package.json
similarity index 100%
rename from ui/editable-text-base/package.json
rename to tns-core-modules/ui/editable-text-base/package.json
diff --git a/ui/enums/enums.d.ts b/tns-core-modules/ui/enums/enums.d.ts
similarity index 100%
rename from ui/enums/enums.d.ts
rename to tns-core-modules/ui/enums/enums.d.ts
diff --git a/ui/enums/enums.ts b/tns-core-modules/ui/enums/enums.ts
similarity index 100%
rename from ui/enums/enums.ts
rename to tns-core-modules/ui/enums/enums.ts
diff --git a/ui/enums/package.json b/tns-core-modules/ui/enums/package.json
similarity index 100%
rename from ui/enums/package.json
rename to tns-core-modules/ui/enums/package.json
diff --git a/ui/frame/Readme.md b/tns-core-modules/ui/frame/Readme.md
similarity index 100%
rename from ui/frame/Readme.md
rename to tns-core-modules/ui/frame/Readme.md
diff --git a/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
similarity index 100%
rename from ui/frame/frame-common.ts
rename to tns-core-modules/ui/frame/frame-common.ts
diff --git a/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
similarity index 100%
rename from ui/frame/frame.android.ts
rename to tns-core-modules/ui/frame/frame.android.ts
diff --git a/ui/frame/frame.d.ts b/tns-core-modules/ui/frame/frame.d.ts
similarity index 100%
rename from ui/frame/frame.d.ts
rename to tns-core-modules/ui/frame/frame.d.ts
diff --git a/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts
similarity index 100%
rename from ui/frame/frame.ios.ts
rename to tns-core-modules/ui/frame/frame.ios.ts
diff --git a/ui/frame/package.json b/tns-core-modules/ui/frame/package.json
similarity index 100%
rename from ui/frame/package.json
rename to tns-core-modules/ui/frame/package.json
diff --git a/ui/gestures/gestures-common.ts b/tns-core-modules/ui/gestures/gestures-common.ts
similarity index 100%
rename from ui/gestures/gestures-common.ts
rename to tns-core-modules/ui/gestures/gestures-common.ts
diff --git a/ui/gestures/gestures.android.ts b/tns-core-modules/ui/gestures/gestures.android.ts
similarity index 100%
rename from ui/gestures/gestures.android.ts
rename to tns-core-modules/ui/gestures/gestures.android.ts
diff --git a/ui/gestures/gestures.d.ts b/tns-core-modules/ui/gestures/gestures.d.ts
similarity index 100%
rename from ui/gestures/gestures.d.ts
rename to tns-core-modules/ui/gestures/gestures.d.ts
diff --git a/ui/gestures/gestures.ios.ts b/tns-core-modules/ui/gestures/gestures.ios.ts
similarity index 100%
rename from ui/gestures/gestures.ios.ts
rename to tns-core-modules/ui/gestures/gestures.ios.ts
diff --git a/ui/gestures/package.json b/tns-core-modules/ui/gestures/package.json
similarity index 100%
rename from ui/gestures/package.json
rename to tns-core-modules/ui/gestures/package.json
diff --git a/ui/html-view/html-view-common.ts b/tns-core-modules/ui/html-view/html-view-common.ts
similarity index 100%
rename from ui/html-view/html-view-common.ts
rename to tns-core-modules/ui/html-view/html-view-common.ts
diff --git a/ui/html-view/html-view.android.ts b/tns-core-modules/ui/html-view/html-view.android.ts
similarity index 100%
rename from ui/html-view/html-view.android.ts
rename to tns-core-modules/ui/html-view/html-view.android.ts
diff --git a/ui/html-view/html-view.d.ts b/tns-core-modules/ui/html-view/html-view.d.ts
similarity index 100%
rename from ui/html-view/html-view.d.ts
rename to tns-core-modules/ui/html-view/html-view.d.ts
diff --git a/ui/html-view/html-view.ios.ts b/tns-core-modules/ui/html-view/html-view.ios.ts
similarity index 100%
rename from ui/html-view/html-view.ios.ts
rename to tns-core-modules/ui/html-view/html-view.ios.ts
diff --git a/ui/html-view/package.json b/tns-core-modules/ui/html-view/package.json
similarity index 100%
rename from ui/html-view/package.json
rename to tns-core-modules/ui/html-view/package.json
diff --git a/ui/image-cache/image-cache-common.ts b/tns-core-modules/ui/image-cache/image-cache-common.ts
similarity index 100%
rename from ui/image-cache/image-cache-common.ts
rename to tns-core-modules/ui/image-cache/image-cache-common.ts
diff --git a/ui/image-cache/image-cache.android.ts b/tns-core-modules/ui/image-cache/image-cache.android.ts
similarity index 100%
rename from ui/image-cache/image-cache.android.ts
rename to tns-core-modules/ui/image-cache/image-cache.android.ts
diff --git a/ui/image-cache/image-cache.d.ts b/tns-core-modules/ui/image-cache/image-cache.d.ts
similarity index 100%
rename from ui/image-cache/image-cache.d.ts
rename to tns-core-modules/ui/image-cache/image-cache.d.ts
diff --git a/ui/image-cache/image-cache.ios.ts b/tns-core-modules/ui/image-cache/image-cache.ios.ts
similarity index 100%
rename from ui/image-cache/image-cache.ios.ts
rename to tns-core-modules/ui/image-cache/image-cache.ios.ts
diff --git a/ui/image-cache/package.json b/tns-core-modules/ui/image-cache/package.json
similarity index 100%
rename from ui/image-cache/package.json
rename to tns-core-modules/ui/image-cache/package.json
diff --git a/ui/image/image-common.ts b/tns-core-modules/ui/image/image-common.ts
similarity index 100%
rename from ui/image/image-common.ts
rename to tns-core-modules/ui/image/image-common.ts
diff --git a/ui/image/image.android.ts b/tns-core-modules/ui/image/image.android.ts
similarity index 100%
rename from ui/image/image.android.ts
rename to tns-core-modules/ui/image/image.android.ts
diff --git a/ui/image/image.d.ts b/tns-core-modules/ui/image/image.d.ts
similarity index 97%
rename from ui/image/image.d.ts
rename to tns-core-modules/ui/image/image.d.ts
index d58a90f3b..c95218b3a 100644
--- a/ui/image/image.d.ts
+++ b/tns-core-modules/ui/image/image.d.ts
@@ -50,6 +50,6 @@ declare module "ui/image" {
          * - **sync** *(default)* - blocks the UI if necessary to display immediately, good for small icons.
          * - **async** - will try to load in the background, may appear with short delay, good for large images.
          */
-        loadMode: "sync" | "async";
+        loadMode: string; // "sync" | "async";
     }
 }
\ No newline at end of file
diff --git a/ui/image/image.ios.ts b/tns-core-modules/ui/image/image.ios.ts
similarity index 100%
rename from ui/image/image.ios.ts
rename to tns-core-modules/ui/image/image.ios.ts
diff --git a/ui/image/package.json b/tns-core-modules/ui/image/package.json
similarity index 100%
rename from ui/image/package.json
rename to tns-core-modules/ui/image/package.json
diff --git a/ui/label/label-common.ts b/tns-core-modules/ui/label/label-common.ts
similarity index 100%
rename from ui/label/label-common.ts
rename to tns-core-modules/ui/label/label-common.ts
diff --git a/ui/label/label.android.ts b/tns-core-modules/ui/label/label.android.ts
similarity index 100%
rename from ui/label/label.android.ts
rename to tns-core-modules/ui/label/label.android.ts
diff --git a/ui/label/label.d.ts b/tns-core-modules/ui/label/label.d.ts
similarity index 100%
rename from ui/label/label.d.ts
rename to tns-core-modules/ui/label/label.d.ts
diff --git a/ui/label/label.ios.ts b/tns-core-modules/ui/label/label.ios.ts
similarity index 100%
rename from ui/label/label.ios.ts
rename to tns-core-modules/ui/label/label.ios.ts
diff --git a/ui/label/package.json b/tns-core-modules/ui/label/package.json
similarity index 100%
rename from ui/label/package.json
rename to tns-core-modules/ui/label/package.json
diff --git a/ui/layouts/absolute-layout/absolute-layout-common.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
similarity index 100%
rename from ui/layouts/absolute-layout/absolute-layout-common.ts
rename to tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
diff --git a/ui/layouts/absolute-layout/absolute-layout.android.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts
similarity index 100%
rename from ui/layouts/absolute-layout/absolute-layout.android.ts
rename to tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts
diff --git a/ui/layouts/absolute-layout/absolute-layout.d.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.d.ts
similarity index 100%
rename from ui/layouts/absolute-layout/absolute-layout.d.ts
rename to tns-core-modules/ui/layouts/absolute-layout/absolute-layout.d.ts
diff --git a/ui/layouts/absolute-layout/absolute-layout.ios.ts b/tns-core-modules/ui/layouts/absolute-layout/absolute-layout.ios.ts
similarity index 100%
rename from ui/layouts/absolute-layout/absolute-layout.ios.ts
rename to tns-core-modules/ui/layouts/absolute-layout/absolute-layout.ios.ts
diff --git a/ui/layouts/absolute-layout/package.json b/tns-core-modules/ui/layouts/absolute-layout/package.json
similarity index 100%
rename from ui/layouts/absolute-layout/package.json
rename to tns-core-modules/ui/layouts/absolute-layout/package.json
diff --git a/ui/layouts/dock-layout/dock-layout-common.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
similarity index 100%
rename from ui/layouts/dock-layout/dock-layout-common.ts
rename to tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
diff --git a/ui/layouts/dock-layout/dock-layout.android.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts
similarity index 100%
rename from ui/layouts/dock-layout/dock-layout.android.ts
rename to tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts
diff --git a/ui/layouts/dock-layout/dock-layout.d.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout.d.ts
similarity index 100%
rename from ui/layouts/dock-layout/dock-layout.d.ts
rename to tns-core-modules/ui/layouts/dock-layout/dock-layout.d.ts
diff --git a/ui/layouts/dock-layout/dock-layout.ios.ts b/tns-core-modules/ui/layouts/dock-layout/dock-layout.ios.ts
similarity index 100%
rename from ui/layouts/dock-layout/dock-layout.ios.ts
rename to tns-core-modules/ui/layouts/dock-layout/dock-layout.ios.ts
diff --git a/ui/layouts/dock-layout/package.json b/tns-core-modules/ui/layouts/dock-layout/package.json
similarity index 100%
rename from ui/layouts/dock-layout/package.json
rename to tns-core-modules/ui/layouts/dock-layout/package.json
diff --git a/ui/layouts/grid-layout/grid-layout-common.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
similarity index 100%
rename from ui/layouts/grid-layout/grid-layout-common.ts
rename to tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
diff --git a/ui/layouts/grid-layout/grid-layout.android.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
similarity index 100%
rename from ui/layouts/grid-layout/grid-layout.android.ts
rename to tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
diff --git a/ui/layouts/grid-layout/grid-layout.d.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout.d.ts
similarity index 100%
rename from ui/layouts/grid-layout/grid-layout.d.ts
rename to tns-core-modules/ui/layouts/grid-layout/grid-layout.d.ts
diff --git a/ui/layouts/grid-layout/grid-layout.ios.ts b/tns-core-modules/ui/layouts/grid-layout/grid-layout.ios.ts
similarity index 100%
rename from ui/layouts/grid-layout/grid-layout.ios.ts
rename to tns-core-modules/ui/layouts/grid-layout/grid-layout.ios.ts
diff --git a/ui/layouts/grid-layout/package.json b/tns-core-modules/ui/layouts/grid-layout/package.json
similarity index 100%
rename from ui/layouts/grid-layout/package.json
rename to tns-core-modules/ui/layouts/grid-layout/package.json
diff --git a/ui/layouts/layout-base-common.ts b/tns-core-modules/ui/layouts/layout-base-common.ts
similarity index 100%
rename from ui/layouts/layout-base-common.ts
rename to tns-core-modules/ui/layouts/layout-base-common.ts
diff --git a/ui/layouts/layout-base.android.ts b/tns-core-modules/ui/layouts/layout-base.android.ts
similarity index 100%
rename from ui/layouts/layout-base.android.ts
rename to tns-core-modules/ui/layouts/layout-base.android.ts
diff --git a/ui/layouts/layout-base.d.ts b/tns-core-modules/ui/layouts/layout-base.d.ts
similarity index 100%
rename from ui/layouts/layout-base.d.ts
rename to tns-core-modules/ui/layouts/layout-base.d.ts
diff --git a/ui/layouts/layout-base.ios.ts b/tns-core-modules/ui/layouts/layout-base.ios.ts
similarity index 100%
rename from ui/layouts/layout-base.ios.ts
rename to tns-core-modules/ui/layouts/layout-base.ios.ts
diff --git a/ui/layouts/layout.android.ts b/tns-core-modules/ui/layouts/layout.android.ts
similarity index 100%
rename from ui/layouts/layout.android.ts
rename to tns-core-modules/ui/layouts/layout.android.ts
diff --git a/ui/layouts/layout.d.ts b/tns-core-modules/ui/layouts/layout.d.ts
similarity index 100%
rename from ui/layouts/layout.d.ts
rename to tns-core-modules/ui/layouts/layout.d.ts
diff --git a/ui/layouts/layout.ios.ts b/tns-core-modules/ui/layouts/layout.ios.ts
similarity index 100%
rename from ui/layouts/layout.ios.ts
rename to tns-core-modules/ui/layouts/layout.ios.ts
diff --git a/ui/layouts/stack-layout/package.json b/tns-core-modules/ui/layouts/stack-layout/package.json
similarity index 100%
rename from ui/layouts/stack-layout/package.json
rename to tns-core-modules/ui/layouts/stack-layout/package.json
diff --git a/ui/layouts/stack-layout/stack-layout-common.ts b/tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
similarity index 100%
rename from ui/layouts/stack-layout/stack-layout-common.ts
rename to tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
diff --git a/ui/layouts/stack-layout/stack-layout.android.ts b/tns-core-modules/ui/layouts/stack-layout/stack-layout.android.ts
similarity index 100%
rename from ui/layouts/stack-layout/stack-layout.android.ts
rename to tns-core-modules/ui/layouts/stack-layout/stack-layout.android.ts
diff --git a/ui/layouts/stack-layout/stack-layout.d.ts b/tns-core-modules/ui/layouts/stack-layout/stack-layout.d.ts
similarity index 100%
rename from ui/layouts/stack-layout/stack-layout.d.ts
rename to tns-core-modules/ui/layouts/stack-layout/stack-layout.d.ts
diff --git a/ui/layouts/stack-layout/stack-layout.ios.ts b/tns-core-modules/ui/layouts/stack-layout/stack-layout.ios.ts
similarity index 100%
rename from ui/layouts/stack-layout/stack-layout.ios.ts
rename to tns-core-modules/ui/layouts/stack-layout/stack-layout.ios.ts
diff --git a/ui/layouts/wrap-layout/package.json b/tns-core-modules/ui/layouts/wrap-layout/package.json
similarity index 100%
rename from ui/layouts/wrap-layout/package.json
rename to tns-core-modules/ui/layouts/wrap-layout/package.json
diff --git a/ui/layouts/wrap-layout/wrap-layout-common.ts b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
similarity index 100%
rename from ui/layouts/wrap-layout/wrap-layout-common.ts
rename to tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
diff --git a/ui/layouts/wrap-layout/wrap-layout.android.ts b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout.android.ts
similarity index 100%
rename from ui/layouts/wrap-layout/wrap-layout.android.ts
rename to tns-core-modules/ui/layouts/wrap-layout/wrap-layout.android.ts
diff --git a/ui/layouts/wrap-layout/wrap-layout.d.ts b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout.d.ts
similarity index 100%
rename from ui/layouts/wrap-layout/wrap-layout.d.ts
rename to tns-core-modules/ui/layouts/wrap-layout/wrap-layout.d.ts
diff --git a/ui/layouts/wrap-layout/wrap-layout.ios.ts b/tns-core-modules/ui/layouts/wrap-layout/wrap-layout.ios.ts
similarity index 100%
rename from ui/layouts/wrap-layout/wrap-layout.ios.ts
rename to tns-core-modules/ui/layouts/wrap-layout/wrap-layout.ios.ts
diff --git a/ui/list-picker/list-picker-common.ts b/tns-core-modules/ui/list-picker/list-picker-common.ts
similarity index 100%
rename from ui/list-picker/list-picker-common.ts
rename to tns-core-modules/ui/list-picker/list-picker-common.ts
diff --git a/ui/list-picker/list-picker.android.ts b/tns-core-modules/ui/list-picker/list-picker.android.ts
similarity index 100%
rename from ui/list-picker/list-picker.android.ts
rename to tns-core-modules/ui/list-picker/list-picker.android.ts
diff --git a/ui/list-picker/list-picker.d.ts b/tns-core-modules/ui/list-picker/list-picker.d.ts
similarity index 100%
rename from ui/list-picker/list-picker.d.ts
rename to tns-core-modules/ui/list-picker/list-picker.d.ts
diff --git a/ui/list-picker/list-picker.ios.ts b/tns-core-modules/ui/list-picker/list-picker.ios.ts
similarity index 100%
rename from ui/list-picker/list-picker.ios.ts
rename to tns-core-modules/ui/list-picker/list-picker.ios.ts
diff --git a/ui/list-picker/package.json b/tns-core-modules/ui/list-picker/package.json
similarity index 100%
rename from ui/list-picker/package.json
rename to tns-core-modules/ui/list-picker/package.json
diff --git a/ui/list-view/Readme.md b/tns-core-modules/ui/list-view/Readme.md
similarity index 100%
rename from ui/list-view/Readme.md
rename to tns-core-modules/ui/list-view/Readme.md
diff --git a/ui/list-view/list-view-common.ts b/tns-core-modules/ui/list-view/list-view-common.ts
similarity index 100%
rename from ui/list-view/list-view-common.ts
rename to tns-core-modules/ui/list-view/list-view-common.ts
diff --git a/ui/list-view/list-view.android.ts b/tns-core-modules/ui/list-view/list-view.android.ts
similarity index 100%
rename from ui/list-view/list-view.android.ts
rename to tns-core-modules/ui/list-view/list-view.android.ts
diff --git a/ui/list-view/list-view.d.ts b/tns-core-modules/ui/list-view/list-view.d.ts
similarity index 100%
rename from ui/list-view/list-view.d.ts
rename to tns-core-modules/ui/list-view/list-view.d.ts
diff --git a/ui/list-view/list-view.ios.ts b/tns-core-modules/ui/list-view/list-view.ios.ts
similarity index 100%
rename from ui/list-view/list-view.ios.ts
rename to tns-core-modules/ui/list-view/list-view.ios.ts
diff --git a/ui/list-view/package.json b/tns-core-modules/ui/list-view/package.json
similarity index 100%
rename from ui/list-view/package.json
rename to tns-core-modules/ui/list-view/package.json
diff --git a/ui/package.json b/tns-core-modules/ui/package.json
similarity index 100%
rename from ui/package.json
rename to tns-core-modules/ui/package.json
diff --git a/ui/page/package.json b/tns-core-modules/ui/page/package.json
similarity index 100%
rename from ui/page/package.json
rename to tns-core-modules/ui/page/package.json
diff --git a/ui/page/page-common.ts b/tns-core-modules/ui/page/page-common.ts
similarity index 100%
rename from ui/page/page-common.ts
rename to tns-core-modules/ui/page/page-common.ts
diff --git a/ui/page/page.android.ts b/tns-core-modules/ui/page/page.android.ts
similarity index 100%
rename from ui/page/page.android.ts
rename to tns-core-modules/ui/page/page.android.ts
diff --git a/ui/page/page.d.ts b/tns-core-modules/ui/page/page.d.ts
similarity index 100%
rename from ui/page/page.d.ts
rename to tns-core-modules/ui/page/page.d.ts
diff --git a/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts
similarity index 100%
rename from ui/page/page.ios.ts
rename to tns-core-modules/ui/page/page.ios.ts
diff --git a/ui/placeholder/package.json b/tns-core-modules/ui/placeholder/package.json
similarity index 100%
rename from ui/placeholder/package.json
rename to tns-core-modules/ui/placeholder/package.json
diff --git a/ui/placeholder/placeholder-common.ts b/tns-core-modules/ui/placeholder/placeholder-common.ts
similarity index 100%
rename from ui/placeholder/placeholder-common.ts
rename to tns-core-modules/ui/placeholder/placeholder-common.ts
diff --git a/ui/placeholder/placeholder.android.ts b/tns-core-modules/ui/placeholder/placeholder.android.ts
similarity index 100%
rename from ui/placeholder/placeholder.android.ts
rename to tns-core-modules/ui/placeholder/placeholder.android.ts
diff --git a/ui/placeholder/placeholder.d.ts b/tns-core-modules/ui/placeholder/placeholder.d.ts
similarity index 100%
rename from ui/placeholder/placeholder.d.ts
rename to tns-core-modules/ui/placeholder/placeholder.d.ts
diff --git a/ui/placeholder/placeholder.ios.ts b/tns-core-modules/ui/placeholder/placeholder.ios.ts
similarity index 100%
rename from ui/placeholder/placeholder.ios.ts
rename to tns-core-modules/ui/placeholder/placeholder.ios.ts
diff --git a/ui/progress/package.json b/tns-core-modules/ui/progress/package.json
similarity index 100%
rename from ui/progress/package.json
rename to tns-core-modules/ui/progress/package.json
diff --git a/ui/progress/progress-common.ts b/tns-core-modules/ui/progress/progress-common.ts
similarity index 100%
rename from ui/progress/progress-common.ts
rename to tns-core-modules/ui/progress/progress-common.ts
diff --git a/ui/progress/progress.android.ts b/tns-core-modules/ui/progress/progress.android.ts
similarity index 100%
rename from ui/progress/progress.android.ts
rename to tns-core-modules/ui/progress/progress.android.ts
diff --git a/ui/progress/progress.d.ts b/tns-core-modules/ui/progress/progress.d.ts
similarity index 100%
rename from ui/progress/progress.d.ts
rename to tns-core-modules/ui/progress/progress.d.ts
diff --git a/ui/progress/progress.ios.ts b/tns-core-modules/ui/progress/progress.ios.ts
similarity index 100%
rename from ui/progress/progress.ios.ts
rename to tns-core-modules/ui/progress/progress.ios.ts
diff --git a/ui/proxy-view-container/package.json b/tns-core-modules/ui/proxy-view-container/package.json
similarity index 100%
rename from ui/proxy-view-container/package.json
rename to tns-core-modules/ui/proxy-view-container/package.json
diff --git a/ui/proxy-view-container/proxy-view-container.d.ts b/tns-core-modules/ui/proxy-view-container/proxy-view-container.d.ts
similarity index 100%
rename from ui/proxy-view-container/proxy-view-container.d.ts
rename to tns-core-modules/ui/proxy-view-container/proxy-view-container.d.ts
diff --git a/ui/proxy-view-container/proxy-view-container.ts b/tns-core-modules/ui/proxy-view-container/proxy-view-container.ts
similarity index 100%
rename from ui/proxy-view-container/proxy-view-container.ts
rename to tns-core-modules/ui/proxy-view-container/proxy-view-container.ts
diff --git a/ui/repeater/package.json b/tns-core-modules/ui/repeater/package.json
similarity index 100%
rename from ui/repeater/package.json
rename to tns-core-modules/ui/repeater/package.json
diff --git a/ui/repeater/repeater.d.ts b/tns-core-modules/ui/repeater/repeater.d.ts
similarity index 100%
rename from ui/repeater/repeater.d.ts
rename to tns-core-modules/ui/repeater/repeater.d.ts
diff --git a/ui/repeater/repeater.ts b/tns-core-modules/ui/repeater/repeater.ts
similarity index 100%
rename from ui/repeater/repeater.ts
rename to tns-core-modules/ui/repeater/repeater.ts
diff --git a/ui/scroll-view/package.json b/tns-core-modules/ui/scroll-view/package.json
similarity index 100%
rename from ui/scroll-view/package.json
rename to tns-core-modules/ui/scroll-view/package.json
diff --git a/ui/scroll-view/scroll-view-common.ts b/tns-core-modules/ui/scroll-view/scroll-view-common.ts
similarity index 100%
rename from ui/scroll-view/scroll-view-common.ts
rename to tns-core-modules/ui/scroll-view/scroll-view-common.ts
diff --git a/ui/scroll-view/scroll-view.android.ts b/tns-core-modules/ui/scroll-view/scroll-view.android.ts
similarity index 100%
rename from ui/scroll-view/scroll-view.android.ts
rename to tns-core-modules/ui/scroll-view/scroll-view.android.ts
diff --git a/ui/scroll-view/scroll-view.d.ts b/tns-core-modules/ui/scroll-view/scroll-view.d.ts
similarity index 100%
rename from ui/scroll-view/scroll-view.d.ts
rename to tns-core-modules/ui/scroll-view/scroll-view.d.ts
diff --git a/ui/scroll-view/scroll-view.ios.ts b/tns-core-modules/ui/scroll-view/scroll-view.ios.ts
similarity index 100%
rename from ui/scroll-view/scroll-view.ios.ts
rename to tns-core-modules/ui/scroll-view/scroll-view.ios.ts
diff --git a/ui/search-bar/package.json b/tns-core-modules/ui/search-bar/package.json
similarity index 100%
rename from ui/search-bar/package.json
rename to tns-core-modules/ui/search-bar/package.json
diff --git a/ui/search-bar/search-bar-common.ts b/tns-core-modules/ui/search-bar/search-bar-common.ts
similarity index 100%
rename from ui/search-bar/search-bar-common.ts
rename to tns-core-modules/ui/search-bar/search-bar-common.ts
diff --git a/ui/search-bar/search-bar.android.ts b/tns-core-modules/ui/search-bar/search-bar.android.ts
similarity index 100%
rename from ui/search-bar/search-bar.android.ts
rename to tns-core-modules/ui/search-bar/search-bar.android.ts
diff --git a/ui/search-bar/search-bar.d.ts b/tns-core-modules/ui/search-bar/search-bar.d.ts
similarity index 100%
rename from ui/search-bar/search-bar.d.ts
rename to tns-core-modules/ui/search-bar/search-bar.d.ts
diff --git a/ui/search-bar/search-bar.ios.ts b/tns-core-modules/ui/search-bar/search-bar.ios.ts
similarity index 100%
rename from ui/search-bar/search-bar.ios.ts
rename to tns-core-modules/ui/search-bar/search-bar.ios.ts
diff --git a/ui/segmented-bar/package.json b/tns-core-modules/ui/segmented-bar/package.json
similarity index 100%
rename from ui/segmented-bar/package.json
rename to tns-core-modules/ui/segmented-bar/package.json
diff --git a/ui/segmented-bar/segmented-bar-common.ts b/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
similarity index 100%
rename from ui/segmented-bar/segmented-bar-common.ts
rename to tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
diff --git a/ui/segmented-bar/segmented-bar.android.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
similarity index 100%
rename from ui/segmented-bar/segmented-bar.android.ts
rename to tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
diff --git a/ui/segmented-bar/segmented-bar.d.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.d.ts
similarity index 100%
rename from ui/segmented-bar/segmented-bar.d.ts
rename to tns-core-modules/ui/segmented-bar/segmented-bar.d.ts
diff --git a/ui/segmented-bar/segmented-bar.ios.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
similarity index 100%
rename from ui/segmented-bar/segmented-bar.ios.ts
rename to tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
diff --git a/ui/slider/package.json b/tns-core-modules/ui/slider/package.json
similarity index 100%
rename from ui/slider/package.json
rename to tns-core-modules/ui/slider/package.json
diff --git a/ui/slider/slider-common.ts b/tns-core-modules/ui/slider/slider-common.ts
similarity index 100%
rename from ui/slider/slider-common.ts
rename to tns-core-modules/ui/slider/slider-common.ts
diff --git a/ui/slider/slider.android.ts b/tns-core-modules/ui/slider/slider.android.ts
similarity index 100%
rename from ui/slider/slider.android.ts
rename to tns-core-modules/ui/slider/slider.android.ts
diff --git a/ui/slider/slider.d.ts b/tns-core-modules/ui/slider/slider.d.ts
similarity index 100%
rename from ui/slider/slider.d.ts
rename to tns-core-modules/ui/slider/slider.d.ts
diff --git a/ui/slider/slider.ios.ts b/tns-core-modules/ui/slider/slider.ios.ts
similarity index 100%
rename from ui/slider/slider.ios.ts
rename to tns-core-modules/ui/slider/slider.ios.ts
diff --git a/ui/styling/background-common.ts b/tns-core-modules/ui/styling/background-common.ts
similarity index 100%
rename from ui/styling/background-common.ts
rename to tns-core-modules/ui/styling/background-common.ts
diff --git a/ui/styling/background.android.d.ts b/tns-core-modules/ui/styling/background.android.d.ts
similarity index 100%
rename from ui/styling/background.android.d.ts
rename to tns-core-modules/ui/styling/background.android.d.ts
diff --git a/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts
similarity index 100%
rename from ui/styling/background.android.ts
rename to tns-core-modules/ui/styling/background.android.ts
diff --git a/ui/styling/background.d.ts b/tns-core-modules/ui/styling/background.d.ts
similarity index 100%
rename from ui/styling/background.d.ts
rename to tns-core-modules/ui/styling/background.d.ts
diff --git a/ui/styling/background.ios.ts b/tns-core-modules/ui/styling/background.ios.ts
similarity index 100%
rename from ui/styling/background.ios.ts
rename to tns-core-modules/ui/styling/background.ios.ts
diff --git a/ui/styling/converters.ts b/tns-core-modules/ui/styling/converters.ts
similarity index 100%
rename from ui/styling/converters.ts
rename to tns-core-modules/ui/styling/converters.ts
diff --git a/ui/styling/css-animation-parser.ts b/tns-core-modules/ui/styling/css-animation-parser.ts
similarity index 100%
rename from ui/styling/css-animation-parser.ts
rename to tns-core-modules/ui/styling/css-animation-parser.ts
diff --git a/ui/styling/css-selector.d.ts b/tns-core-modules/ui/styling/css-selector.d.ts
similarity index 100%
rename from ui/styling/css-selector.d.ts
rename to tns-core-modules/ui/styling/css-selector.d.ts
diff --git a/ui/styling/css-selector.ts b/tns-core-modules/ui/styling/css-selector.ts
similarity index 100%
rename from ui/styling/css-selector.ts
rename to tns-core-modules/ui/styling/css-selector.ts
diff --git a/ui/styling/font-common.ts b/tns-core-modules/ui/styling/font-common.ts
similarity index 100%
rename from ui/styling/font-common.ts
rename to tns-core-modules/ui/styling/font-common.ts
diff --git a/ui/styling/font.android.ts b/tns-core-modules/ui/styling/font.android.ts
similarity index 100%
rename from ui/styling/font.android.ts
rename to tns-core-modules/ui/styling/font.android.ts
diff --git a/ui/styling/font.d.ts b/tns-core-modules/ui/styling/font.d.ts
similarity index 100%
rename from ui/styling/font.d.ts
rename to tns-core-modules/ui/styling/font.d.ts
diff --git a/ui/styling/font.ios.ts b/tns-core-modules/ui/styling/font.ios.ts
similarity index 100%
rename from ui/styling/font.ios.ts
rename to tns-core-modules/ui/styling/font.ios.ts
diff --git a/ui/styling/package.json b/tns-core-modules/ui/styling/package.json
similarity index 100%
rename from ui/styling/package.json
rename to tns-core-modules/ui/styling/package.json
diff --git a/ui/styling/style-property.d.ts b/tns-core-modules/ui/styling/style-property.d.ts
similarity index 100%
rename from ui/styling/style-property.d.ts
rename to tns-core-modules/ui/styling/style-property.d.ts
diff --git a/ui/styling/style-property.ts b/tns-core-modules/ui/styling/style-property.ts
similarity index 100%
rename from ui/styling/style-property.ts
rename to tns-core-modules/ui/styling/style-property.ts
diff --git a/ui/styling/style-scope.d.ts b/tns-core-modules/ui/styling/style-scope.d.ts
similarity index 100%
rename from ui/styling/style-scope.d.ts
rename to tns-core-modules/ui/styling/style-scope.d.ts
diff --git a/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
similarity index 100%
rename from ui/styling/style-scope.ts
rename to tns-core-modules/ui/styling/style-scope.ts
diff --git a/ui/styling/style.d.ts b/tns-core-modules/ui/styling/style.d.ts
similarity index 100%
rename from ui/styling/style.d.ts
rename to tns-core-modules/ui/styling/style.d.ts
diff --git a/ui/styling/style.ts b/tns-core-modules/ui/styling/style.ts
similarity index 100%
rename from ui/styling/style.ts
rename to tns-core-modules/ui/styling/style.ts
diff --git a/ui/styling/styling.d.ts b/tns-core-modules/ui/styling/styling.d.ts
similarity index 100%
rename from ui/styling/styling.d.ts
rename to tns-core-modules/ui/styling/styling.d.ts
diff --git a/ui/styling/styling.ts b/tns-core-modules/ui/styling/styling.ts
similarity index 100%
rename from ui/styling/styling.ts
rename to tns-core-modules/ui/styling/styling.ts
diff --git a/ui/styling/visual-state-constants.d.ts b/tns-core-modules/ui/styling/visual-state-constants.d.ts
similarity index 100%
rename from ui/styling/visual-state-constants.d.ts
rename to tns-core-modules/ui/styling/visual-state-constants.d.ts
diff --git a/ui/styling/visual-state-constants.ts b/tns-core-modules/ui/styling/visual-state-constants.ts
similarity index 100%
rename from ui/styling/visual-state-constants.ts
rename to tns-core-modules/ui/styling/visual-state-constants.ts
diff --git a/ui/styling/visual-state.ts b/tns-core-modules/ui/styling/visual-state.ts
similarity index 100%
rename from ui/styling/visual-state.ts
rename to tns-core-modules/ui/styling/visual-state.ts
diff --git a/ui/switch/package.json b/tns-core-modules/ui/switch/package.json
similarity index 100%
rename from ui/switch/package.json
rename to tns-core-modules/ui/switch/package.json
diff --git a/ui/switch/switch-common.ts b/tns-core-modules/ui/switch/switch-common.ts
similarity index 100%
rename from ui/switch/switch-common.ts
rename to tns-core-modules/ui/switch/switch-common.ts
diff --git a/ui/switch/switch.android.ts b/tns-core-modules/ui/switch/switch.android.ts
similarity index 100%
rename from ui/switch/switch.android.ts
rename to tns-core-modules/ui/switch/switch.android.ts
diff --git a/ui/switch/switch.d.ts b/tns-core-modules/ui/switch/switch.d.ts
similarity index 100%
rename from ui/switch/switch.d.ts
rename to tns-core-modules/ui/switch/switch.d.ts
diff --git a/ui/switch/switch.ios.ts b/tns-core-modules/ui/switch/switch.ios.ts
similarity index 100%
rename from ui/switch/switch.ios.ts
rename to tns-core-modules/ui/switch/switch.ios.ts
diff --git a/ui/tab-view/package.json b/tns-core-modules/ui/tab-view/package.json
similarity index 100%
rename from ui/tab-view/package.json
rename to tns-core-modules/ui/tab-view/package.json
diff --git a/ui/tab-view/tab-view-common.ts b/tns-core-modules/ui/tab-view/tab-view-common.ts
similarity index 100%
rename from ui/tab-view/tab-view-common.ts
rename to tns-core-modules/ui/tab-view/tab-view-common.ts
diff --git a/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
similarity index 100%
rename from ui/tab-view/tab-view.android.ts
rename to tns-core-modules/ui/tab-view/tab-view.android.ts
diff --git a/ui/tab-view/tab-view.d.ts b/tns-core-modules/ui/tab-view/tab-view.d.ts
similarity index 100%
rename from ui/tab-view/tab-view.d.ts
rename to tns-core-modules/ui/tab-view/tab-view.d.ts
diff --git a/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts
similarity index 100%
rename from ui/tab-view/tab-view.ios.ts
rename to tns-core-modules/ui/tab-view/tab-view.ios.ts
diff --git a/ui/text-base/package.json b/tns-core-modules/ui/text-base/package.json
similarity index 100%
rename from ui/text-base/package.json
rename to tns-core-modules/ui/text-base/package.json
diff --git a/ui/text-base/text-base-common.ts b/tns-core-modules/ui/text-base/text-base-common.ts
similarity index 100%
rename from ui/text-base/text-base-common.ts
rename to tns-core-modules/ui/text-base/text-base-common.ts
diff --git a/ui/text-base/text-base-styler.android.ts b/tns-core-modules/ui/text-base/text-base-styler.android.ts
similarity index 100%
rename from ui/text-base/text-base-styler.android.ts
rename to tns-core-modules/ui/text-base/text-base-styler.android.ts
diff --git a/ui/text-base/text-base-styler.d.ts b/tns-core-modules/ui/text-base/text-base-styler.d.ts
similarity index 100%
rename from ui/text-base/text-base-styler.d.ts
rename to tns-core-modules/ui/text-base/text-base-styler.d.ts
diff --git a/ui/text-base/text-base-styler.ios.ts b/tns-core-modules/ui/text-base/text-base-styler.ios.ts
similarity index 100%
rename from ui/text-base/text-base-styler.ios.ts
rename to tns-core-modules/ui/text-base/text-base-styler.ios.ts
diff --git a/ui/text-base/text-base.android.ts b/tns-core-modules/ui/text-base/text-base.android.ts
similarity index 100%
rename from ui/text-base/text-base.android.ts
rename to tns-core-modules/ui/text-base/text-base.android.ts
diff --git a/ui/text-base/text-base.d.ts b/tns-core-modules/ui/text-base/text-base.d.ts
similarity index 100%
rename from ui/text-base/text-base.d.ts
rename to tns-core-modules/ui/text-base/text-base.d.ts
diff --git a/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts
similarity index 100%
rename from ui/text-base/text-base.ios.ts
rename to tns-core-modules/ui/text-base/text-base.ios.ts
diff --git a/ui/text-field/package.json b/tns-core-modules/ui/text-field/package.json
similarity index 100%
rename from ui/text-field/package.json
rename to tns-core-modules/ui/text-field/package.json
diff --git a/ui/text-field/text-field-common.ts b/tns-core-modules/ui/text-field/text-field-common.ts
similarity index 100%
rename from ui/text-field/text-field-common.ts
rename to tns-core-modules/ui/text-field/text-field-common.ts
diff --git a/ui/text-field/text-field.android.ts b/tns-core-modules/ui/text-field/text-field.android.ts
similarity index 100%
rename from ui/text-field/text-field.android.ts
rename to tns-core-modules/ui/text-field/text-field.android.ts
diff --git a/ui/text-field/text-field.d.ts b/tns-core-modules/ui/text-field/text-field.d.ts
similarity index 100%
rename from ui/text-field/text-field.d.ts
rename to tns-core-modules/ui/text-field/text-field.d.ts
diff --git a/ui/text-field/text-field.ios.ts b/tns-core-modules/ui/text-field/text-field.ios.ts
similarity index 100%
rename from ui/text-field/text-field.ios.ts
rename to tns-core-modules/ui/text-field/text-field.ios.ts
diff --git a/ui/text-view/package.json b/tns-core-modules/ui/text-view/package.json
similarity index 100%
rename from ui/text-view/package.json
rename to tns-core-modules/ui/text-view/package.json
diff --git a/ui/text-view/text-view-common.ts b/tns-core-modules/ui/text-view/text-view-common.ts
similarity index 100%
rename from ui/text-view/text-view-common.ts
rename to tns-core-modules/ui/text-view/text-view-common.ts
diff --git a/ui/text-view/text-view.android.ts b/tns-core-modules/ui/text-view/text-view.android.ts
similarity index 100%
rename from ui/text-view/text-view.android.ts
rename to tns-core-modules/ui/text-view/text-view.android.ts
diff --git a/ui/text-view/text-view.d.ts b/tns-core-modules/ui/text-view/text-view.d.ts
similarity index 100%
rename from ui/text-view/text-view.d.ts
rename to tns-core-modules/ui/text-view/text-view.d.ts
diff --git a/ui/text-view/text-view.ios.ts b/tns-core-modules/ui/text-view/text-view.ios.ts
similarity index 100%
rename from ui/text-view/text-view.ios.ts
rename to tns-core-modules/ui/text-view/text-view.ios.ts
diff --git a/ui/time-picker/package.json b/tns-core-modules/ui/time-picker/package.json
similarity index 100%
rename from ui/time-picker/package.json
rename to tns-core-modules/ui/time-picker/package.json
diff --git a/ui/time-picker/time-picker-common.ts b/tns-core-modules/ui/time-picker/time-picker-common.ts
similarity index 100%
rename from ui/time-picker/time-picker-common.ts
rename to tns-core-modules/ui/time-picker/time-picker-common.ts
diff --git a/ui/time-picker/time-picker.android.ts b/tns-core-modules/ui/time-picker/time-picker.android.ts
similarity index 100%
rename from ui/time-picker/time-picker.android.ts
rename to tns-core-modules/ui/time-picker/time-picker.android.ts
diff --git a/ui/time-picker/time-picker.d.ts b/tns-core-modules/ui/time-picker/time-picker.d.ts
similarity index 100%
rename from ui/time-picker/time-picker.d.ts
rename to tns-core-modules/ui/time-picker/time-picker.d.ts
diff --git a/ui/time-picker/time-picker.ios.ts b/tns-core-modules/ui/time-picker/time-picker.ios.ts
similarity index 100%
rename from ui/time-picker/time-picker.ios.ts
rename to tns-core-modules/ui/time-picker/time-picker.ios.ts
diff --git a/ui/transition/fade-transition.android.ts b/tns-core-modules/ui/transition/fade-transition.android.ts
similarity index 100%
rename from ui/transition/fade-transition.android.ts
rename to tns-core-modules/ui/transition/fade-transition.android.ts
diff --git a/ui/transition/fade-transition.d.ts b/tns-core-modules/ui/transition/fade-transition.d.ts
similarity index 100%
rename from ui/transition/fade-transition.d.ts
rename to tns-core-modules/ui/transition/fade-transition.d.ts
diff --git a/ui/transition/fade-transition.ios.ts b/tns-core-modules/ui/transition/fade-transition.ios.ts
similarity index 100%
rename from ui/transition/fade-transition.ios.ts
rename to tns-core-modules/ui/transition/fade-transition.ios.ts
diff --git a/ui/transition/flip-transition.android.ts b/tns-core-modules/ui/transition/flip-transition.android.ts
similarity index 100%
rename from ui/transition/flip-transition.android.ts
rename to tns-core-modules/ui/transition/flip-transition.android.ts
diff --git a/ui/transition/package.json b/tns-core-modules/ui/transition/package.json
similarity index 100%
rename from ui/transition/package.json
rename to tns-core-modules/ui/transition/package.json
diff --git a/ui/transition/slide-transition.android.ts b/tns-core-modules/ui/transition/slide-transition.android.ts
similarity index 100%
rename from ui/transition/slide-transition.android.ts
rename to tns-core-modules/ui/transition/slide-transition.android.ts
diff --git a/ui/transition/slide-transition.d.ts b/tns-core-modules/ui/transition/slide-transition.d.ts
similarity index 100%
rename from ui/transition/slide-transition.d.ts
rename to tns-core-modules/ui/transition/slide-transition.d.ts
diff --git a/ui/transition/slide-transition.ios.ts b/tns-core-modules/ui/transition/slide-transition.ios.ts
similarity index 100%
rename from ui/transition/slide-transition.ios.ts
rename to tns-core-modules/ui/transition/slide-transition.ios.ts
diff --git a/ui/transition/transition.android.ts b/tns-core-modules/ui/transition/transition.android.ts
similarity index 100%
rename from ui/transition/transition.android.ts
rename to tns-core-modules/ui/transition/transition.android.ts
diff --git a/ui/transition/transition.d.ts b/tns-core-modules/ui/transition/transition.d.ts
similarity index 100%
rename from ui/transition/transition.d.ts
rename to tns-core-modules/ui/transition/transition.d.ts
diff --git a/ui/transition/transition.ios.ts b/tns-core-modules/ui/transition/transition.ios.ts
similarity index 100%
rename from ui/transition/transition.ios.ts
rename to tns-core-modules/ui/transition/transition.ios.ts
diff --git a/ui/utils.d.ts b/tns-core-modules/ui/utils.d.ts
similarity index 100%
rename from ui/utils.d.ts
rename to tns-core-modules/ui/utils.d.ts
diff --git a/ui/utils.ios.ts b/tns-core-modules/ui/utils.ios.ts
similarity index 100%
rename from ui/utils.ios.ts
rename to tns-core-modules/ui/utils.ios.ts
diff --git a/ui/web-view/package.json b/tns-core-modules/ui/web-view/package.json
similarity index 100%
rename from ui/web-view/package.json
rename to tns-core-modules/ui/web-view/package.json
diff --git a/ui/web-view/web-view-common.ts b/tns-core-modules/ui/web-view/web-view-common.ts
similarity index 100%
rename from ui/web-view/web-view-common.ts
rename to tns-core-modules/ui/web-view/web-view-common.ts
diff --git a/ui/web-view/web-view.android.ts b/tns-core-modules/ui/web-view/web-view.android.ts
similarity index 100%
rename from ui/web-view/web-view.android.ts
rename to tns-core-modules/ui/web-view/web-view.android.ts
diff --git a/ui/web-view/web-view.d.ts b/tns-core-modules/ui/web-view/web-view.d.ts
similarity index 100%
rename from ui/web-view/web-view.d.ts
rename to tns-core-modules/ui/web-view/web-view.d.ts
diff --git a/ui/web-view/web-view.ios.ts b/tns-core-modules/ui/web-view/web-view.ios.ts
similarity index 100%
rename from ui/web-view/web-view.ios.ts
rename to tns-core-modules/ui/web-view/web-view.ios.ts
diff --git a/utils/debug.d.ts b/tns-core-modules/utils/debug.d.ts
similarity index 100%
rename from utils/debug.d.ts
rename to tns-core-modules/utils/debug.d.ts
diff --git a/utils/debug.ts b/tns-core-modules/utils/debug.ts
similarity index 100%
rename from utils/debug.ts
rename to tns-core-modules/utils/debug.ts
diff --git a/utils/lazy.d.ts b/tns-core-modules/utils/lazy.d.ts
similarity index 100%
rename from utils/lazy.d.ts
rename to tns-core-modules/utils/lazy.d.ts
diff --git a/utils/lazy.ts b/tns-core-modules/utils/lazy.ts
similarity index 100%
rename from utils/lazy.ts
rename to tns-core-modules/utils/lazy.ts
diff --git a/utils/module-merge.ts b/tns-core-modules/utils/module-merge.ts
similarity index 100%
rename from utils/module-merge.ts
rename to tns-core-modules/utils/module-merge.ts
diff --git a/utils/number-utils.ts b/tns-core-modules/utils/number-utils.ts
similarity index 100%
rename from utils/number-utils.ts
rename to tns-core-modules/utils/number-utils.ts
diff --git a/utils/package.json b/tns-core-modules/utils/package.json
similarity index 100%
rename from utils/package.json
rename to tns-core-modules/utils/package.json
diff --git a/utils/types.d.ts b/tns-core-modules/utils/types.d.ts
similarity index 100%
rename from utils/types.d.ts
rename to tns-core-modules/utils/types.d.ts
diff --git a/utils/types.ts b/tns-core-modules/utils/types.ts
similarity index 100%
rename from utils/types.ts
rename to tns-core-modules/utils/types.ts
diff --git a/utils/utils-common.ts b/tns-core-modules/utils/utils-common.ts
similarity index 100%
rename from utils/utils-common.ts
rename to tns-core-modules/utils/utils-common.ts
diff --git a/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
similarity index 100%
rename from utils/utils.android.ts
rename to tns-core-modules/utils/utils.android.ts
diff --git a/utils/utils.d.ts b/tns-core-modules/utils/utils.d.ts
similarity index 100%
rename from utils/utils.d.ts
rename to tns-core-modules/utils/utils.d.ts
diff --git a/utils/utils.ios.ts b/tns-core-modules/utils/utils.ios.ts
similarity index 100%
rename from utils/utils.ios.ts
rename to tns-core-modules/utils/utils.ios.ts
diff --git a/weakmap.d.ts b/tns-core-modules/weakmap.d.ts
similarity index 100%
rename from weakmap.d.ts
rename to tns-core-modules/weakmap.d.ts
diff --git a/xhr/Readme.md b/tns-core-modules/xhr/Readme.md
similarity index 100%
rename from xhr/Readme.md
rename to tns-core-modules/xhr/Readme.md
diff --git a/xhr/package.json b/tns-core-modules/xhr/package.json
similarity index 100%
rename from xhr/package.json
rename to tns-core-modules/xhr/package.json
diff --git a/xhr/xhr.ts b/tns-core-modules/xhr/xhr.ts
similarity index 100%
rename from xhr/xhr.ts
rename to tns-core-modules/xhr/xhr.ts
diff --git a/xml/Readme.md b/tns-core-modules/xml/Readme.md
similarity index 100%
rename from xml/Readme.md
rename to tns-core-modules/xml/Readme.md
diff --git a/xml/package.json b/tns-core-modules/xml/package.json
similarity index 100%
rename from xml/package.json
rename to tns-core-modules/xml/package.json
diff --git a/xml/xml.d.ts b/tns-core-modules/xml/xml.d.ts
similarity index 100%
rename from xml/xml.d.ts
rename to tns-core-modules/xml/xml.d.ts
diff --git a/xml/xml.ts b/tns-core-modules/xml/xml.ts
similarity index 100%
rename from xml/xml.ts
rename to tns-core-modules/xml/xml.ts
diff --git a/tsconfig.json b/tsconfig.json
index e27aa2229..1c1d66c41 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
     "filesGlob": [
         "**/*.ts",
         "!node_modules/**/*.*",
+        "!tests/node_modules/**/*.*",
         "!bin/**/*.*",
         "!build/**/*.*",
         "!Deploy/**/*.*",
@@ -22,15 +23,531 @@
         "!obj/**/*.*"
     ],
     "files": [
-        "android17.d.ts",
-        "application-settings/application-settings-common.ts",
-        "application-settings/application-settings.android.ts",
-        "application-settings/application-settings.d.ts",
-        "application-settings/application-settings.ios.ts",
-        "application/application-common.ts",
-        "application/application.android.ts",
-        "application/application.d.ts",
-        "application/application.ios.ts",
+
+        "tns-core-modules/android17.d.ts",
+        "tns-core-modules/ios.d.ts",
+        "tns-core-modules/declarations.android.d.ts",
+        "tns-core-modules/declarations.d.ts",
+        "tns-core-modules/es-collections.d.ts",
+        "tns-core-modules/es6-promise.d.ts",
+        "tns-core-modules/es6.d.ts",
+        "tns-core-modules/declarations.ios.d.ts",
+
+        "tns-core-modules/inspector_modules.ios.ts",
+
+        "tns-core-modules/application-settings/application-settings-common.ts",
+        "tns-core-modules/application-settings/application-settings.android.ts",
+        "tns-core-modules/application-settings/application-settings.d.ts",
+        "tns-core-modules/application-settings/application-settings.ios.ts",
+        "tns-core-modules/application/application-common.ts",
+        "tns-core-modules/application/application.android.ts",
+        "tns-core-modules/application/application.d.ts",
+        "tns-core-modules/application/application.ios.ts",
+        "tns-core-modules/camera/camera-common.ts",
+        "tns-core-modules/camera/camera.android.ts",
+        "tns-core-modules/camera/camera.d.ts",
+        "tns-core-modules/camera/camera.ios.ts",
+        "tns-core-modules/color/color-common.ts",
+        "tns-core-modules/color/color.android.ts",
+        "tns-core-modules/color/color.d.ts",
+        "tns-core-modules/color/color.ios.ts",
+        "tns-core-modules/color/known-colors.d.ts",
+        "tns-core-modules/color/known-colors.ts",
+        "tns-core-modules/connectivity/connectivity-common.ts",
+        "tns-core-modules/connectivity/connectivity.android.ts",
+        "tns-core-modules/connectivity/connectivity.d.ts",
+        "tns-core-modules/connectivity/connectivity.ios.ts",
+        "tns-core-modules/console/console.d.ts",
+        "tns-core-modules/console/console.ts",
+        "tns-core-modules/css-value/reworkcss-value.d.ts",
+        "tns-core-modules/css/reworkcss.d.ts",
+        "tns-core-modules/data/observable-array/observable-array.d.ts",
+        "tns-core-modules/data/observable-array/observable-array.ts",
+        "tns-core-modules/data/observable/observable.d.ts",
+        "tns-core-modules/data/observable/observable.ts",
+        "tns-core-modules/data/virtual-array/virtual-array.d.ts",
+        "tns-core-modules/data/virtual-array/virtual-array.ts",
+        "tns-core-modules/debugger/InspectorBackendCommands.ios.ts",
+        "tns-core-modules/debugger/debugger.ts",
+        "tns-core-modules/debugger/webinspector.ios.ts",
+        "tns-core-modules/file-system/file-name-resolver.d.ts",
+        "tns-core-modules/file-system/file-name-resolver.ts",
+        "tns-core-modules/file-system/file-system-access.android.ts",
+        "tns-core-modules/file-system/file-system-access.d.ts",
+        "tns-core-modules/file-system/file-system-access.ios.ts",
+        "tns-core-modules/file-system/file-system.d.ts",
+        "tns-core-modules/file-system/file-system.ts",
+        "tns-core-modules/fps-meter/fps-meter.d.ts",
+        "tns-core-modules/fps-meter/fps-meter.ts",
+        "tns-core-modules/fps-meter/fps-native.android.ts",
+        "tns-core-modules/fps-meter/fps-native.d.ts",
+        "tns-core-modules/fps-meter/fps-native.ios.ts",
+        "tns-core-modules/globals/globals.ts",
+        "tns-core-modules/globals/decorators.ts",
+        "tns-core-modules/http/http-request.android.ts",
+        "tns-core-modules/http/http-request.d.ts",
+        "tns-core-modules/http/http-request.ios.ts",
+        "tns-core-modules/http/http.d.ts",
+        "tns-core-modules/http/http.ts",
+        "tns-core-modules/image-source/image-source-common.ts",
+        "tns-core-modules/image-source/image-source.android.ts",
+        "tns-core-modules/image-source/image-source.d.ts",
+        "tns-core-modules/image-source/image-source.ios.ts",
+        "tns-core-modules/js-libs/easysax/easysax.d.ts",
+        "tns-core-modules/js-libs/esprima/esprima.d.ts",
+        "tns-core-modules/js-libs/polymer-expressions/polymer-expressions.d.ts",
+        "tns-core-modules/location/location-common.ts",
+        "tns-core-modules/location/location.android.ts",
+        "tns-core-modules/location/location.d.ts",
+        "tns-core-modules/location/location.ios.ts",
+        "tns-core-modules/module.d.ts",
+        "tns-core-modules/org.nativescript.widgets.d.ts",
+        "tns-core-modules/platform/platform.android.ts",
+        "tns-core-modules/platform/platform.d.ts",
+        "tns-core-modules/platform/platform.ios.ts",
+        "tns-core-modules/text/formatted-string-common.ts",
+        "tns-core-modules/text/formatted-string.android.ts",
+        "tns-core-modules/text/formatted-string.d.ts",
+        "tns-core-modules/text/formatted-string.ios.ts",
+        "tns-core-modules/text/span-common.ts",
+        "tns-core-modules/text/span.android.ts",
+        "tns-core-modules/text/span.d.ts",
+        "tns-core-modules/text/span.ios.ts",
+        "tns-core-modules/text/text.android.ts",
+        "tns-core-modules/text/text.d.ts",
+        "tns-core-modules/text/text.ios.ts",
+        "tns-core-modules/timer/timer.android.ts",
+        "tns-core-modules/timer/timer.d.ts",
+        "tns-core-modules/timer/timer.ios.ts",
+        "tns-core-modules/trace/trace.d.ts",
+        "tns-core-modules/trace/trace.ts",
+        "tns-core-modules/ui/action-bar/action-bar-common.ts",
+        "tns-core-modules/ui/action-bar/action-bar.android.ts",
+        "tns-core-modules/ui/action-bar/action-bar.d.ts",
+        "tns-core-modules/ui/action-bar/action-bar.ios.ts",
+        "tns-core-modules/ui/activity-indicator/activity-indicator-common.ts",
+        "tns-core-modules/ui/activity-indicator/activity-indicator.android.ts",
+        "tns-core-modules/ui/activity-indicator/activity-indicator.d.ts",
+        "tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts",
+        "tns-core-modules/ui/animation/animation-common.ts",
+        "tns-core-modules/ui/animation/animation.android.ts",
+        "tns-core-modules/ui/animation/animation.d.ts",
+        "tns-core-modules/ui/animation/animation.ios.ts",
+        "tns-core-modules/ui/animation/keyframe-animation.d.ts",
+        "tns-core-modules/ui/animation/keyframe-animation.ts",
+        "tns-core-modules/ui/border/border.d.ts",
+        "tns-core-modules/ui/border/border.ts",
+        "tns-core-modules/ui/builder/binding-builder.d.ts",
+        "tns-core-modules/ui/builder/binding-builder.ts",
+        "tns-core-modules/ui/builder/builder.d.ts",
+        "tns-core-modules/ui/builder/builder.ts",
+        "tns-core-modules/ui/builder/component-builder.d.ts",
+        "tns-core-modules/ui/builder/component-builder.ts",
+        "tns-core-modules/ui/builder/special-properties.d.ts",
+        "tns-core-modules/ui/builder/special-properties.ts",
+        "tns-core-modules/ui/button/button-common.ts",
+        "tns-core-modules/ui/button/button.android.ts",
+        "tns-core-modules/ui/button/button.d.ts",
+        "tns-core-modules/ui/button/button.ios.ts",
+        "tns-core-modules/ui/content-view/content-view.d.ts",
+        "tns-core-modules/ui/content-view/content-view.ts",
+        "tns-core-modules/ui/core/bindable.d.ts",
+        "tns-core-modules/ui/core/bindable.ts",
+        "tns-core-modules/ui/core/control-state-change.d.ts",
+        "tns-core-modules/ui/core/control-state-change.ios.ts",
+        "tns-core-modules/ui/core/dependency-observable.d.ts",
+        "tns-core-modules/ui/core/dependency-observable.ts",
+        "tns-core-modules/ui/core/proxy.d.ts",
+        "tns-core-modules/ui/core/proxy.ts",
+        "tns-core-modules/ui/core/view-common.ts",
+        "tns-core-modules/ui/core/view.android.ts",
+        "tns-core-modules/ui/core/view.d.ts",
+        "tns-core-modules/ui/core/view.ios.ts",
+        "tns-core-modules/ui/core/weak-event-listener.d.ts",
+        "tns-core-modules/ui/core/weak-event-listener.ts",
+        "tns-core-modules/ui/date-picker/date-picker-common.ts",
+        "tns-core-modules/ui/date-picker/date-picker.android.ts",
+        "tns-core-modules/ui/date-picker/date-picker.d.ts",
+        "tns-core-modules/ui/date-picker/date-picker.ios.ts",
+        "tns-core-modules/ui/dialogs/dialogs-common.ts",
+        "tns-core-modules/ui/dialogs/dialogs.android.ts",
+        "tns-core-modules/ui/dialogs/dialogs.d.ts",
+        "tns-core-modules/ui/dialogs/dialogs.ios.ts",
+        "tns-core-modules/ui/editable-text-base/editable-text-base-common.ts",
+        "tns-core-modules/ui/editable-text-base/editable-text-base.android.ts",
+        "tns-core-modules/ui/editable-text-base/editable-text-base.d.ts",
+        "tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts",
+        "tns-core-modules/ui/enums/enums.d.ts",
+        "tns-core-modules/ui/enums/enums.ts",
+        "tns-core-modules/ui/frame/frame-common.ts",
+        "tns-core-modules/ui/frame/frame.android.ts",
+        "tns-core-modules/ui/frame/frame.d.ts",
+        "tns-core-modules/ui/frame/frame.ios.ts",
+        "tns-core-modules/ui/gestures/gestures-common.ts",
+        "tns-core-modules/ui/gestures/gestures.android.ts",
+        "tns-core-modules/ui/gestures/gestures.d.ts",
+        "tns-core-modules/ui/gestures/gestures.ios.ts",
+        "tns-core-modules/ui/html-view/html-view-common.ts",
+        "tns-core-modules/ui/html-view/html-view.android.ts",
+        "tns-core-modules/ui/html-view/html-view.d.ts",
+        "tns-core-modules/ui/html-view/html-view.ios.ts",
+        "tns-core-modules/ui/image-cache/image-cache-common.ts",
+        "tns-core-modules/ui/image-cache/image-cache.android.ts",
+        "tns-core-modules/ui/image-cache/image-cache.d.ts",
+        "tns-core-modules/ui/image-cache/image-cache.ios.ts",
+        "tns-core-modules/ui/image/image-common.ts",
+        "tns-core-modules/ui/image/image.android.ts",
+        "tns-core-modules/ui/image/image.d.ts",
+        "tns-core-modules/ui/image/image.ios.ts",
+        "tns-core-modules/ui/label/label-common.ts",
+        "tns-core-modules/ui/label/label.android.ts",
+        "tns-core-modules/ui/label/label.d.ts",
+        "tns-core-modules/ui/label/label.ios.ts",
+        "tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts",
+        "tns-core-modules/ui/layouts/absolute-layout/absolute-layout.android.ts",
+        "tns-core-modules/ui/layouts/absolute-layout/absolute-layout.d.ts",
+        "tns-core-modules/ui/layouts/absolute-layout/absolute-layout.ios.ts",
+        "tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts",
+        "tns-core-modules/ui/layouts/dock-layout/dock-layout.android.ts",
+        "tns-core-modules/ui/layouts/dock-layout/dock-layout.d.ts",
+        "tns-core-modules/ui/layouts/dock-layout/dock-layout.ios.ts",
+        "tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts",
+        "tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts",
+        "tns-core-modules/ui/layouts/grid-layout/grid-layout.d.ts",
+        "tns-core-modules/ui/layouts/grid-layout/grid-layout.ios.ts",
+        "tns-core-modules/ui/layouts/layout-base.d.ts",
+        "tns-core-modules/ui/layouts/layout-base-common.ts",
+        "tns-core-modules/ui/layouts/layout-base.android.ts",
+        "tns-core-modules/ui/layouts/layout-base.ios.ts",
+        "tns-core-modules/ui/layouts/layout.android.ts",
+        "tns-core-modules/ui/layouts/layout.d.ts",
+        "tns-core-modules/ui/layouts/layout.ios.ts",
+        "tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts",
+        "tns-core-modules/ui/layouts/stack-layout/stack-layout.android.ts",
+        "tns-core-modules/ui/layouts/stack-layout/stack-layout.d.ts",
+        "tns-core-modules/ui/layouts/stack-layout/stack-layout.ios.ts",
+        "tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts",
+        "tns-core-modules/ui/layouts/wrap-layout/wrap-layout.android.ts",
+        "tns-core-modules/ui/layouts/wrap-layout/wrap-layout.d.ts",
+        "tns-core-modules/ui/layouts/wrap-layout/wrap-layout.ios.ts",
+        "tns-core-modules/ui/list-picker/list-picker-common.ts",
+        "tns-core-modules/ui/list-picker/list-picker.android.ts",
+        "tns-core-modules/ui/list-picker/list-picker.d.ts",
+        "tns-core-modules/ui/list-picker/list-picker.ios.ts",
+        "tns-core-modules/ui/list-view/list-view-common.ts",
+        "tns-core-modules/ui/list-view/list-view.android.ts",
+        "tns-core-modules/ui/list-view/list-view.d.ts",
+        "tns-core-modules/ui/list-view/list-view.ios.ts",
+        "tns-core-modules/ui/page/page-common.ts",
+        "tns-core-modules/ui/page/page.android.ts",
+        "tns-core-modules/ui/page/page.d.ts",
+        "tns-core-modules/ui/page/page.ios.ts",
+        "tns-core-modules/ui/placeholder/placeholder-common.ts",
+        "tns-core-modules/ui/placeholder/placeholder.android.ts",
+        "tns-core-modules/ui/placeholder/placeholder.d.ts",
+        "tns-core-modules/ui/placeholder/placeholder.ios.ts",
+        "tns-core-modules/ui/progress/progress-common.ts",
+        "tns-core-modules/ui/progress/progress.android.ts",
+        "tns-core-modules/ui/progress/progress.d.ts",
+        "tns-core-modules/ui/progress/progress.ios.ts",
+        "tns-core-modules/ui/proxy-view-container/proxy-view-container.d.ts",
+        "tns-core-modules/ui/proxy-view-container/proxy-view-container.ts",
+        "tns-core-modules/ui/repeater/repeater.d.ts",
+        "tns-core-modules/ui/repeater/repeater.ts",
+        "tns-core-modules/ui/scroll-view/scroll-view-common.ts",
+        "tns-core-modules/ui/scroll-view/scroll-view.android.ts",
+        "tns-core-modules/ui/scroll-view/scroll-view.d.ts",
+        "tns-core-modules/ui/scroll-view/scroll-view.ios.ts",
+        "tns-core-modules/ui/search-bar/search-bar-common.ts",
+        "tns-core-modules/ui/search-bar/search-bar.android.ts",
+        "tns-core-modules/ui/search-bar/search-bar.d.ts",
+        "tns-core-modules/ui/search-bar/search-bar.ios.ts",
+        "tns-core-modules/ui/segmented-bar/segmented-bar-common.ts",
+        "tns-core-modules/ui/segmented-bar/segmented-bar.android.ts",
+        "tns-core-modules/ui/segmented-bar/segmented-bar.d.ts",
+        "tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts",
+        "tns-core-modules/ui/slider/slider-common.ts",
+        "tns-core-modules/ui/slider/slider.android.ts",
+        "tns-core-modules/ui/slider/slider.d.ts",
+        "tns-core-modules/ui/slider/slider.ios.ts",
+        "tns-core-modules/ui/styling/background-common.ts",
+        "tns-core-modules/ui/styling/background.android.d.ts",
+        "tns-core-modules/ui/styling/background.android.ts",
+        "tns-core-modules/ui/styling/background.d.ts",
+        "tns-core-modules/ui/styling/background.ios.ts",
+        "tns-core-modules/ui/styling/converters.ts",
+        "tns-core-modules/ui/styling/css-selector.d.ts",
+        "tns-core-modules/ui/styling/css-selector.ts",
+        "tns-core-modules/ui/styling/font-common.ts",
+        "tns-core-modules/ui/styling/font.android.ts",
+        "tns-core-modules/ui/styling/font.d.ts",
+        "tns-core-modules/ui/styling/font.ios.ts",
+        "tns-core-modules/ui/styling/style-property.d.ts",
+        "tns-core-modules/ui/styling/style-property.ts",
+        "tns-core-modules/ui/styling/style-scope.d.ts",
+        "tns-core-modules/ui/styling/style-scope.ts",
+        "tns-core-modules/ui/styling/style.d.ts",
+        "tns-core-modules/ui/styling/style.ts",
+        "tns-core-modules/ui/styling/styling.d.ts",
+        "tns-core-modules/ui/styling/styling.ts",
+        "tns-core-modules/ui/styling/visual-state-constants.d.ts",
+        "tns-core-modules/ui/styling/visual-state-constants.ts",
+        "tns-core-modules/ui/styling/visual-state.ts",
+        "tns-core-modules/ui/switch/switch-common.ts",
+        "tns-core-modules/ui/switch/switch.android.ts",
+        "tns-core-modules/ui/switch/switch.d.ts",
+        "tns-core-modules/ui/switch/switch.ios.ts",
+        "tns-core-modules/ui/tab-view/tab-view-common.ts",
+        "tns-core-modules/ui/tab-view/tab-view.android.ts",
+        "tns-core-modules/ui/tab-view/tab-view.d.ts",
+        "tns-core-modules/ui/tab-view/tab-view.ios.ts",
+        "tns-core-modules/ui/text-base/text-base-common.ts",
+        "tns-core-modules/ui/text-base/text-base-styler.android.ts",
+        "tns-core-modules/ui/text-base/text-base-styler.d.ts",
+        "tns-core-modules/ui/text-base/text-base-styler.ios.ts",
+        "tns-core-modules/ui/text-base/text-base.android.ts",
+        "tns-core-modules/ui/text-base/text-base.d.ts",
+        "tns-core-modules/ui/text-base/text-base.ios.ts",
+        "tns-core-modules/ui/text-field/text-field-common.ts",
+        "tns-core-modules/ui/text-field/text-field.android.ts",
+        "tns-core-modules/ui/text-field/text-field.d.ts",
+        "tns-core-modules/ui/text-field/text-field.ios.ts",
+        "tns-core-modules/ui/text-view/text-view-common.ts",
+        "tns-core-modules/ui/text-view/text-view.android.ts",
+        "tns-core-modules/ui/text-view/text-view.d.ts",
+        "tns-core-modules/ui/text-view/text-view.ios.ts",
+        "tns-core-modules/ui/time-picker/time-picker-common.ts",
+        "tns-core-modules/ui/time-picker/time-picker.android.ts",
+        "tns-core-modules/ui/time-picker/time-picker.d.ts",
+        "tns-core-modules/ui/time-picker/time-picker.ios.ts",
+        "tns-core-modules/ui/transition/fade-transition.android.ts",
+        "tns-core-modules/ui/transition/fade-transition.ios.ts",
+        "tns-core-modules/ui/transition/flip-transition.android.ts",
+        "tns-core-modules/ui/transition/slide-transition.android.ts",
+        "tns-core-modules/ui/transition/slide-transition.ios.ts",
+        "tns-core-modules/ui/transition/transition.android.ts",
+        "tns-core-modules/ui/transition/transition.d.ts",
+        "tns-core-modules/ui/transition/transition.ios.ts",
+        "tns-core-modules/ui/transition/fade-transition.d.ts",
+        "tns-core-modules/ui/transition/slide-transition.d.ts",
+        "tns-core-modules/ui/utils.d.ts",
+        "tns-core-modules/ui/utils.ios.ts",
+        "tns-core-modules/ui/web-view/web-view-common.ts",
+        "tns-core-modules/ui/web-view/web-view.android.ts",
+        "tns-core-modules/ui/web-view/web-view.d.ts",
+        "tns-core-modules/ui/web-view/web-view.ios.ts",
+        "tns-core-modules/utils/debug.d.ts",
+        "tns-core-modules/utils/debug.ts",
+        "tns-core-modules/utils/lazy.d.ts",
+        "tns-core-modules/utils/lazy.ts",
+        "tns-core-modules/utils/module-merge.ts",
+        "tns-core-modules/utils/number-utils.ts",
+        "tns-core-modules/utils/types.d.ts",
+        "tns-core-modules/utils/types.ts",
+        "tns-core-modules/utils/utils-common.ts",
+        "tns-core-modules/utils/utils.android.ts",
+        "tns-core-modules/utils/utils.d.ts",
+        "tns-core-modules/utils/utils.ios.ts",
+        "tns-core-modules/weakmap.d.ts",
+        "tns-core-modules/xhr/xhr.ts",
+        "tns-core-modules/xml/xml.d.ts",
+        "tns-core-modules/xml/xml.ts",
+
+        "node-tests/definitions/chai.d.ts",
+        "node-tests/definitions/mocha.d.ts",
+        "node-tests/test-angular-xml.ts",
+        "node-tests/test-xml.ts",
+
+        "tests/app/TKUnit.ts",
+        "tests/app/app/app.ts",
+        "tests/app/app/location-example.ts",
+        "tests/app/app/mainPage.ts",
+        "tests/app/app/pageNavigation.ts",
+        "tests/app/app/style_props.ts",
+        "tests/app/app/testPage.ts",
+        "tests/app/app/testRunnerPage.ts",
+        "tests/app/application-settings-tests.ts",
+        "tests/app/application-tests-common.ts",
+        "tests/app/application-tests.android.ts",
+        "tests/app/application-tests.ios.ts",
+        "tests/app/camera-tests.ts",
+        "tests/app/color-tests.ts",
+        "tests/app/connectivity-tests.ts",
+        "tests/app/console-tests.ts",
+        "tests/app/fetch-tests.ts",
+        "tests/app/file-name-resolver-tests/file-name-resolver-tests.ts",
+        "tests/app/file-system-access-tests/file-system-access-tests.ts",
+        "tests/app/file-system-tests.ts",
+        "tests/app/fps-meter-tests.ts",
+        "tests/app/ui/frame/frame-tests.ts",
+        "tests/app/ui/gestures/gestures-tests.ts",
+        "tests/app/http-tests.ts",
+        "tests/app/image-source-tests.ts",
+        "tests/app/ui/layouts/absolute-layout-tests.ts",
+        "tests/app/ui/layouts/common-layout-tests.ts",
+        "tests/app/ui/layouts/dock-layout-tests.ts",
+        "tests/app/ui/layouts/grid-layout-tests.ts",
+        "tests/app/ui/layouts/layout-helper.android.ts",
+        "tests/app/ui/layouts/layout-helper.d.ts",
+        "tests/app/ui/layouts/layout-helper.ios.ts",
+        "tests/app/ui/layouts/stack-layout-tests.ts",
+        "tests/app/ui/layouts/wrap-layout-tests.ts",
+        "tests/app/location-tests.ts",
+        "tests/app/navigation/custom-transition.android.ts",
+        "tests/app/navigation/custom-transition.ios.ts",
+        "tests/app/navigation/navigation-tests.ts",
+        "tests/app/navigation/transition-tests.ts",
+        "tests/app/data/observable-array-tests.ts",
+        "tests/app/data/observable-tests.ts",
+        "tests/app/pages/app.ts",
+        "tests/app/pages/background-test.ts",
+        "tests/app/pages/file-load-test.ts",
+        "tests/app/pages/fonts-test.ts",
+        "tests/app/pages/navigation/pageA-new-activity.ts",
+        "tests/app/pages/navigation/pageA.ts",
+        "tests/app/pages/navigation/pageB-new-activity.ts",
+        "tests/app/pages/navigation/pageB.ts",
+        "tests/app/pages/navigation/pageC-new-activity.ts",
+        "tests/app/pages/navigation/pageC.ts",
+        "tests/app/pages/page10.ts",
+        "tests/app/pages/page11.ts",
+        "tests/app/pages/page12.ts",
+        "tests/app/pages/page13.ts",
+        "tests/app/pages/page15.ts",
+        "tests/app/pages/page16.ts",
+        "tests/app/pages/page17.ts",
+        "tests/app/pages/page18.ts",
+        "tests/app/pages/page19.ts",
+        "tests/app/pages/page20.ts",
+        "tests/app/pages/page5.ts",
+        "tests/app/pages/page6.ts",
+        "tests/app/pages/page7.ts",
+        "tests/app/pages/page8.ts",
+        "tests/app/pages/page9.ts",
+        "tests/app/pages/performance-test/start.ts",
+        "tests/app/pages/performance-test/test-big.ts",
+        "tests/app/pages/performance-test/test-small.ts",
+        "tests/app/pages/property-bindings.ts",
+        "tests/app/pages/sandbox-project.ts",
+        "tests/app/pages/tab-view.ts",
+        "tests/app/platform-tests.ts",
+        "tests/app/styling/app.ts",
+        "tests/app/styling/mainPage.ts",
+        "tests/app/testRunner.ts",
+        "tests/app/text/formatted-string-tests.ts",
+        "tests/app/timer-tests.ts",
+        "tests/app/trace-tests.ts",
+        "tests/app/ui-test.ts",
+        "tests/app/ui/action-bar/ActionBar_NumberAsText.ts",
+        "tests/app/ui/action-bar/action-bar-tests-common.ts",
+        "tests/app/ui/action-bar/action-bar-tests.android.ts",
+        "tests/app/ui/action-bar/action-bar-tests.ios.ts",
+        "tests/app/ui/activity-indicator/activity-indicator-tests.ts",
+        "tests/app/ui/animation/animation-tests.ts",
+        "tests/app/ui/animation/css-animation-tests.ts",        
+        "tests/app/ui/bindable-tests.ts",
+        "tests/app/ui/binding-expressions-tests.ts",
+        "tests/app/ui/bindingContext_testPage.ts",
+        "tests/app/ui/bindingContext_testPage1.ts",
+        "tests/app/ui/bindingContext_testPage2.ts",
+        "tests/app/ui/border/border-tests.ts",
+        "tests/app/ui/button/button-tests-native.android.ts",
+        "tests/app/ui/button/button-tests-native.d.ts",
+        "tests/app/ui/button/button-tests-native.ios.ts",
+        "tests/app/ui/button/button-tests.ts",
+        "tests/app/ui/date-picker/date-picker-tests-native.android.ts",
+        "tests/app/ui/date-picker/date-picker-tests-native.d.ts",
+        "tests/app/ui/date-picker/date-picker-tests-native.ios.ts",
+        "tests/app/ui/date-picker/date-picker-tests.ts",
+        "tests/app/ui/dependency-observable-tests.ts",
+        "tests/app/ui/dialogs/dialog-tests.ts",
+        "tests/app/ui/helper.ts",
+        "tests/app/ui/html-view/html-view-tests.ts",
+        "tests/app/ui/image-cache/image-cache-tests.ts",
+        "tests/app/ui/image/image-tests.ts",
+        "tests/app/ui/label/label-tests-native.android.ts",
+        "tests/app/ui/label/label-tests-native.d.ts",
+        "tests/app/ui/label/label-tests-native.ios.ts",
+        "tests/app/ui/label/label-tests.ts",
+        "tests/app/ui/list-picker/list-picker-tests-native.android.ts",
+        "tests/app/ui/list-picker/list-picker-tests-native.d.ts",
+        "tests/app/ui/list-picker/list-picker-tests-native.ios.ts",
+        "tests/app/ui/list-picker/list-picker-tests.ts",
+        "tests/app/ui/list-view/list-view-tests.ts",
+        "tests/app/ui/page/modal-page.ts",
+        "tests/app/ui/page/page-tests-common.ts",
+        "tests/app/ui/page/page-tests.android.ts",
+        "tests/app/ui/page/page-tests.ios.ts",
+        "tests/app/ui/page/page21.ts",
+        "tests/app/ui/page/test-page-module-css.ts",
+        "tests/app/ui/page/test-page-module.ts",
+        "tests/app/ui/placeholder/placeholder-tests.ts",
+        "tests/app/ui/progress/progress-tests.ts",
+        "tests/app/ui/proxy-view-container/proxy-view-container-tests.ts",
+        "tests/app/ui/repeater/repeater-tests.ts",
+        "tests/app/ui/repeater/repeaterItems-bindingToGestures.ts",
+        "tests/app/ui/scroll-view/scroll-view-tests.ts",
+        "tests/app/ui/search-bar/search-bar-tests-native.android.ts",
+        "tests/app/ui/search-bar/search-bar-tests-native.d.ts",
+        "tests/app/ui/search-bar/search-bar-tests-native.ios.ts",
+        "tests/app/ui/search-bar/search-bar-tests.ts",
+        "tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts",
+        "tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts",
+        "tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts",
+        "tests/app/ui/segmented-bar/segmented-bar-tests.ts",
+        "tests/app/ui/slider/slider-tests.ts",
+        "tests/app/ui/styling/style-properties-tests.ts",
+        "tests/app/ui/styling/style-tests.ts",
+        "tests/app/ui/styling/value-source-tests.ts",
+        "tests/app/ui/styling/visual-state-tests.ts",
+        "tests/app/ui/switch/switch-tests.ts",
+        "tests/app/ui/tab-view/tab-view-navigation-tests.ts",
+        "tests/app/ui/tab-view/tab-view-tests-native.android.ts",
+        "tests/app/ui/tab-view/tab-view-tests-native.d.ts",
+        "tests/app/ui/tab-view/tab-view-tests-native.ios.ts",
+        "tests/app/ui/tab-view/tab-view-tests.ts",
+        "tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts",
+        "tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts",
+        "tests/app/ui/text-field/text-field-tests-native.android.ts",
+        "tests/app/ui/text-field/text-field-tests-native.d.ts",
+        "tests/app/ui/text-field/text-field-tests-native.ios.ts",
+        "tests/app/ui/text-field/text-field-tests.ts",
+        "tests/app/ui/text-view/text-view-tests-native.android.ts",
+        "tests/app/ui/text-view/text-view-tests-native.d.ts",
+        "tests/app/ui/text-view/text-view-tests-native.ios.ts",
+        "tests/app/ui/text-view/text-view-tests.ts",
+        "tests/app/ui/time-picker/time-picker-tests-native.android.ts",
+        "tests/app/ui/time-picker/time-picker-tests-native.d.ts",
+        "tests/app/ui/time-picker/time-picker-tests-native.ios.ts",
+        "tests/app/ui/time-picker/time-picker-tests.ts",
+        "tests/app/ui/view/view-tests-common.ts",
+        "tests/app/ui/view/view-tests.android.ts",
+        "tests/app/ui/view/view-tests.d.ts",
+        "tests/app/ui/view/view-tests.ios.ts",
+        "tests/app/ui/web-view/web-view-tests.ts",
+        "tests/app/data/virtual-array-tests.ts",
+        "tests/app/weak-event-listener-tests.ts",
+        "tests/app/xhr-tests.ts",
+        "tests/app/xml-declaration/app.ts",
+        "tests/app/xml-declaration/custom-code-file.ts",
+        "tests/app/xml-declaration/inherited-base-page.ts",
+        "tests/app/xml-declaration/inherited-page.ts",
+        "tests/app/xml-declaration/mainPage.ts",
+        "tests/app/xml-declaration/mymodule/MyControl.ts",
+        "tests/app/xml-declaration/mymodulewithxml/MyControl.ts",
+        "tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts",
+        "tests/app/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts",
+        "tests/app/xml-declaration/template-builder-tests/event-in-template.ts",
+        "tests/app/xml-declaration/template-builder-tests/template-view.ts",
+        "tests/app/xml-declaration/xml-declaration-tests.ts",
+        "tests/app/xml-parser-tests/xml-parser-tests.ts",
+
         "apps/absolute-layout-demo/app.ts",
         "apps/absolute-layout-demo/mainPage.ts",
         "apps/action-bar-demo/app.ts",
@@ -149,195 +666,6 @@
         "apps/template-settings/view-model.ts",
         "apps/template-tab-navigation/app.ts",
         "apps/template-tab-navigation/main-page.ts",
-        "apps/tests/TKUnit.ts",
-        "apps/tests/app/app.ts",
-        "apps/tests/app/location-example.ts",
-        "apps/tests/app/mainPage.ts",
-        "apps/tests/app/pageNavigation.ts",
-        "apps/tests/app/style_props.ts",
-        "apps/tests/app/testPage.ts",
-        "apps/tests/app/testRunnerPage.ts",
-        "apps/tests/application-settings-tests.ts",
-        "apps/tests/application-tests-common.ts",
-        "apps/tests/application-tests.android.ts",
-        "apps/tests/application-tests.ios.ts",
-        "apps/tests/camera-tests.ts",
-        "apps/tests/color-tests.ts",
-        "apps/tests/connectivity-tests.ts",
-        "apps/tests/console-tests.ts",
-        "apps/tests/fetch-tests.ts",
-        "apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts",
-        "apps/tests/file-system-access-tests/file-system-access-tests.ts",
-        "apps/tests/file-system-tests.ts",
-        "apps/tests/fps-meter-tests.ts",
-        "apps/tests/ui/frame/frame-tests.ts",
-        "apps/tests/ui/gestures/gestures-tests.ts",
-        "apps/tests/http-tests.ts",
-        "apps/tests/image-source-tests.ts",
-        "apps/tests/ui/layouts/absolute-layout-tests.ts",
-        "apps/tests/ui/layouts/common-layout-tests.ts",
-        "apps/tests/ui/layouts/dock-layout-tests.ts",
-        "apps/tests/ui/layouts/grid-layout-tests.ts",
-        "apps/tests/ui/layouts/layout-helper.android.ts",
-        "apps/tests/ui/layouts/layout-helper.d.ts",
-        "apps/tests/ui/layouts/layout-helper.ios.ts",
-        "apps/tests/ui/layouts/stack-layout-tests.ts",
-        "apps/tests/ui/layouts/wrap-layout-tests.ts",
-        "apps/tests/location-tests.ts",
-        "apps/tests/navigation/custom-transition.android.ts",
-        "apps/tests/navigation/custom-transition.ios.ts",
-        "apps/tests/navigation/navigation-tests.ts",
-        "apps/tests/navigation/transition-tests.ts",
-        "apps/tests/data/observable-array-tests.ts",
-        "apps/tests/data/observable-tests.ts",
-        "apps/tests/pages/app.ts",
-        "apps/tests/pages/background-test.ts",
-        "apps/tests/pages/file-load-test.ts",
-        "apps/tests/pages/fonts-test.ts",
-        "apps/tests/pages/navigation/pageA-new-activity.ts",
-        "apps/tests/pages/navigation/pageA.ts",
-        "apps/tests/pages/navigation/pageB-new-activity.ts",
-        "apps/tests/pages/navigation/pageB.ts",
-        "apps/tests/pages/navigation/pageC-new-activity.ts",
-        "apps/tests/pages/navigation/pageC.ts",
-        "apps/tests/pages/page10.ts",
-        "apps/tests/pages/page11.ts",
-        "apps/tests/pages/page12.ts",
-        "apps/tests/pages/page13.ts",
-        "apps/tests/pages/page15.ts",
-        "apps/tests/pages/page16.ts",
-        "apps/tests/pages/page17.ts",
-        "apps/tests/pages/page18.ts",
-        "apps/tests/pages/page19.ts",
-        "apps/tests/pages/page20.ts",
-        "apps/tests/pages/page5.ts",
-        "apps/tests/pages/page6.ts",
-        "apps/tests/pages/page7.ts",
-        "apps/tests/pages/page8.ts",
-        "apps/tests/pages/page9.ts",
-        "apps/tests/pages/performance-test/start.ts",
-        "apps/tests/pages/performance-test/test-big.ts",
-        "apps/tests/pages/performance-test/test-small.ts",
-        "apps/tests/pages/property-bindings.ts",
-        "apps/tests/pages/sandbox-project.ts",
-        "apps/tests/pages/tab-view.ts",
-        "apps/tests/platform-tests.ts",
-        "apps/tests/styling/app.ts",
-        "apps/tests/styling/mainPage.ts",
-        "apps/tests/testRunner.ts",
-        "apps/tests/text/formatted-string-tests.ts",
-        "apps/tests/timer-tests.ts",
-        "apps/tests/trace-tests.ts",
-        "apps/tests/ui-test.ts",
-        "apps/tests/ui/action-bar/ActionBar_NumberAsText.ts",
-        "apps/tests/ui/action-bar/action-bar-tests-common.ts",
-        "apps/tests/ui/action-bar/action-bar-tests.android.ts",
-        "apps/tests/ui/action-bar/action-bar-tests.ios.ts",
-        "apps/tests/ui/activity-indicator/activity-indicator-tests.ts",
-        "apps/tests/ui/animation/animation-tests.ts",
-        "apps/tests/ui/animation/css-animation-tests.ts",        
-        "apps/tests/ui/bindable-tests.ts",
-        "apps/tests/ui/binding-expressions-tests.ts",
-        "apps/tests/ui/bindingContext_testPage.ts",
-        "apps/tests/ui/bindingContext_testPage1.ts",
-        "apps/tests/ui/bindingContext_testPage2.ts",
-        "apps/tests/ui/border/border-tests.ts",
-        "apps/tests/ui/button/button-tests-native.android.ts",
-        "apps/tests/ui/button/button-tests-native.d.ts",
-        "apps/tests/ui/button/button-tests-native.ios.ts",
-        "apps/tests/ui/button/button-tests.ts",
-        "apps/tests/ui/date-picker/date-picker-tests-native.android.ts",
-        "apps/tests/ui/date-picker/date-picker-tests-native.d.ts",
-        "apps/tests/ui/date-picker/date-picker-tests-native.ios.ts",
-        "apps/tests/ui/date-picker/date-picker-tests.ts",
-        "apps/tests/ui/dependency-observable-tests.ts",
-        "apps/tests/ui/dialogs/dialog-tests.ts",
-        "apps/tests/ui/helper.ts",
-        "apps/tests/ui/html-view/html-view-tests.ts",
-        "apps/tests/ui/image-cache/image-cache-tests.ts",
-        "apps/tests/ui/image/image-tests.ts",
-        "apps/tests/ui/label/label-tests-native.android.ts",
-        "apps/tests/ui/label/label-tests-native.d.ts",
-        "apps/tests/ui/label/label-tests-native.ios.ts",
-        "apps/tests/ui/label/label-tests.ts",
-        "apps/tests/ui/list-picker/list-picker-tests-native.android.ts",
-        "apps/tests/ui/list-picker/list-picker-tests-native.d.ts",
-        "apps/tests/ui/list-picker/list-picker-tests-native.ios.ts",
-        "apps/tests/ui/list-picker/list-picker-tests.ts",
-        "apps/tests/ui/list-view/list-view-tests.ts",
-        "apps/tests/ui/page/modal-page.ts",
-        "apps/tests/ui/page/page-tests-common.ts",
-        "apps/tests/ui/page/page-tests.android.ts",
-        "apps/tests/ui/page/page-tests.ios.ts",
-        "apps/tests/ui/page/page21.ts",
-        "apps/tests/ui/page/test-page-module-css.ts",
-        "apps/tests/ui/page/test-page-module.ts",
-        "apps/tests/ui/placeholder/placeholder-tests.ts",
-        "apps/tests/ui/progress/progress-tests.ts",
-        "apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts",
-        "apps/tests/ui/repeater/repeater-tests.ts",
-        "apps/tests/ui/repeater/repeaterItems-bindingToGestures.ts",
-        "apps/tests/ui/scroll-view/scroll-view-tests.ts",
-        "apps/tests/ui/search-bar/search-bar-tests-native.android.ts",
-        "apps/tests/ui/search-bar/search-bar-tests-native.d.ts",
-        "apps/tests/ui/search-bar/search-bar-tests-native.ios.ts",
-        "apps/tests/ui/search-bar/search-bar-tests.ts",
-        "apps/tests/ui/segmented-bar/segmented-bar-tests-native.android.ts",
-        "apps/tests/ui/segmented-bar/segmented-bar-tests-native.d.ts",
-        "apps/tests/ui/segmented-bar/segmented-bar-tests-native.ios.ts",
-        "apps/tests/ui/segmented-bar/segmented-bar-tests.ts",
-        "apps/tests/ui/slider/slider-tests.ts",
-        "apps/tests/ui/styling/style-properties-tests.ts",
-        "apps/tests/ui/styling/style-tests.ts",
-        "apps/tests/ui/styling/value-source-tests.ts",
-        "apps/tests/ui/styling/visual-state-tests.ts",
-        "apps/tests/ui/switch/switch-tests.ts",
-        "apps/tests/ui/tab-view/tab-view-navigation-tests.ts",
-        "apps/tests/ui/tab-view/tab-view-tests-native.android.ts",
-        "apps/tests/ui/tab-view/tab-view-tests-native.d.ts",
-        "apps/tests/ui/tab-view/tab-view-tests-native.ios.ts",
-        "apps/tests/ui/tab-view/tab-view-tests.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts",
-        "apps/tests/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts",
-        "apps/tests/ui/text-field/text-field-tests-native.android.ts",
-        "apps/tests/ui/text-field/text-field-tests-native.d.ts",
-        "apps/tests/ui/text-field/text-field-tests-native.ios.ts",
-        "apps/tests/ui/text-field/text-field-tests.ts",
-        "apps/tests/ui/text-view/text-view-tests-native.android.ts",
-        "apps/tests/ui/text-view/text-view-tests-native.d.ts",
-        "apps/tests/ui/text-view/text-view-tests-native.ios.ts",
-        "apps/tests/ui/text-view/text-view-tests.ts",
-        "apps/tests/ui/time-picker/time-picker-tests-native.android.ts",
-        "apps/tests/ui/time-picker/time-picker-tests-native.d.ts",
-        "apps/tests/ui/time-picker/time-picker-tests-native.ios.ts",
-        "apps/tests/ui/time-picker/time-picker-tests.ts",
-        "apps/tests/ui/view/view-tests-common.ts",
-        "apps/tests/ui/view/view-tests.android.ts",
-        "apps/tests/ui/view/view-tests.d.ts",
-        "apps/tests/ui/view/view-tests.ios.ts",
-        "apps/tests/ui/web-view/web-view-tests.ts",
-        "apps/tests/data/virtual-array-tests.ts",
-        "apps/tests/weak-event-listener-tests.ts",
-        "apps/tests/xhr-tests.ts",
-        "apps/tests/xml-declaration/app.ts",
-        "apps/tests/xml-declaration/custom-code-file.ts",
-        "apps/tests/xml-declaration/inherited-base-page.ts",
-        "apps/tests/xml-declaration/inherited-page.ts",
-        "apps/tests/xml-declaration/mainPage.ts",
-        "apps/tests/xml-declaration/mymodule/MyControl.ts",
-        "apps/tests/xml-declaration/mymodulewithxml/MyControl.ts",
-        "apps/tests/xml-declaration/mymodulewithxml/TabViewParentChain.ts",
-        "apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts",
-        "apps/tests/xml-declaration/template-builder-tests/event-in-template.ts",
-        "apps/tests/xml-declaration/template-builder-tests/template-view.ts",
-        "apps/tests/xml-declaration/xml-declaration-tests.ts",
-        "apps/tests/xml-parser-tests/xml-parser-tests.ts",
         "apps/transforms/app.ts",
         "apps/transforms/main-page.ts",
         "apps/transforms/model.ts",
@@ -399,328 +727,7 @@
         "apps/wrap-layout-demo/app.ts",
         "apps/wrap-layout-demo/mainPage.ts",
         "apps/xml-demo/app.ts",
-        "apps/xml-demo/mainPage.ts",
-        "camera/camera-common.ts",
-        "camera/camera.android.ts",
-        "camera/camera.d.ts",
-        "camera/camera.ios.ts",
-        "color/color-common.ts",
-        "color/color.android.ts",
-        "color/color.d.ts",
-        "color/color.ios.ts",
-        "color/known-colors.d.ts",
-        "color/known-colors.ts",
-        "connectivity/connectivity-common.ts",
-        "connectivity/connectivity.android.ts",
-        "connectivity/connectivity.d.ts",
-        "connectivity/connectivity.ios.ts",
-        "console/console.d.ts",
-        "console/console.ts",
-        "css-value/reworkcss-value.d.ts",
-        "css/reworkcss.d.ts",
-        "data/observable-array/observable-array.d.ts",
-        "data/observable-array/observable-array.ts",
-        "data/observable/observable.d.ts",
-        "data/observable/observable.ts",
-        "data/virtual-array/virtual-array.d.ts",
-        "data/virtual-array/virtual-array.ts",
-        "debugger/InspectorBackendCommands.ios.ts",
-        "debugger/debugger.ts",
-        "debugger/webinspector.ios.ts",
-        "inspector_modules.ios.ts",
-        "declarations.android.d.ts",
-        "declarations.d.ts",
-        "declarations.ios.d.ts",
-        "es-collections.d.ts",
-        "es6-promise.d.ts",
-        "es6.d.ts",
-        "file-system/file-name-resolver.d.ts",
-        "file-system/file-name-resolver.ts",
-        "file-system/file-system-access.android.ts",
-        "file-system/file-system-access.d.ts",
-        "file-system/file-system-access.ios.ts",
-        "file-system/file-system.d.ts",
-        "file-system/file-system.ts",
-        "fps-meter/fps-meter.d.ts",
-        "fps-meter/fps-meter.ts",
-        "fps-meter/fps-native.android.ts",
-        "fps-meter/fps-native.d.ts",
-        "fps-meter/fps-native.ios.ts",
-        "globals/globals.ts",
-        "globals/decorators.ts",
-        "http/http-request.android.ts",
-        "http/http-request.d.ts",
-        "http/http-request.ios.ts",
-        "http/http.d.ts",
-        "http/http.ts",
-        "image-source/image-source-common.ts",
-        "image-source/image-source.android.ts",
-        "image-source/image-source.d.ts",
-        "image-source/image-source.ios.ts",
-        "ios.d.ts",
-        "js-libs/easysax/easysax.d.ts",
-        "js-libs/esprima/esprima.d.ts",
-        "js-libs/polymer-expressions/polymer-expressions.d.ts",
-        "location/location-common.ts",
-        "location/location.android.ts",
-        "location/location.d.ts",
-        "location/location.ios.ts",
-        "module.d.ts",
-        "node-tests/definitions/chai.d.ts",
-        "node-tests/definitions/mocha.d.ts",
-        "node-tests/test-angular-xml.ts",
-        "node-tests/test-xml.ts",
-        "org.nativescript.widgets.d.ts",
-        "platform/platform.android.ts",
-        "platform/platform.d.ts",
-        "platform/platform.ios.ts",
-        "text/formatted-string-common.ts",
-        "text/formatted-string.android.ts",
-        "text/formatted-string.d.ts",
-        "text/formatted-string.ios.ts",
-        "text/span-common.ts",
-        "text/span.android.ts",
-        "text/span.d.ts",
-        "text/span.ios.ts",
-        "text/text.android.ts",
-        "text/text.d.ts",
-        "text/text.ios.ts",
-        "timer/timer.android.ts",
-        "timer/timer.d.ts",
-        "timer/timer.ios.ts",
-        "trace/trace.d.ts",
-        "trace/trace.ts",
-        "ui/action-bar/action-bar-common.ts",
-        "ui/action-bar/action-bar.android.ts",
-        "ui/action-bar/action-bar.d.ts",
-        "ui/action-bar/action-bar.ios.ts",
-        "ui/activity-indicator/activity-indicator-common.ts",
-        "ui/activity-indicator/activity-indicator.android.ts",
-        "ui/activity-indicator/activity-indicator.d.ts",
-        "ui/activity-indicator/activity-indicator.ios.ts",
-        "ui/animation/animation-common.ts",
-        "ui/animation/animation.android.ts",
-        "ui/animation/animation.d.ts",
-        "ui/animation/animation.ios.ts",
-        "ui/animation/keyframe-animation.d.ts",
-        "ui/animation/keyframe-animation.ts",
-        "ui/border/border.d.ts",
-        "ui/border/border.ts",
-        "ui/builder/binding-builder.d.ts",
-        "ui/builder/binding-builder.ts",
-        "ui/builder/builder.d.ts",
-        "ui/builder/builder.ts",
-        "ui/builder/component-builder.d.ts",
-        "ui/builder/component-builder.ts",
-        "ui/builder/special-properties.d.ts",
-        "ui/builder/special-properties.ts",
-        "ui/button/button-common.ts",
-        "ui/button/button.android.ts",
-        "ui/button/button.d.ts",
-        "ui/button/button.ios.ts",
-        "ui/content-view/content-view.d.ts",
-        "ui/content-view/content-view.ts",
-        "ui/core/bindable.d.ts",
-        "ui/core/bindable.ts",
-        "ui/core/control-state-change.d.ts",
-        "ui/core/control-state-change.ios.ts",
-        "ui/core/dependency-observable.d.ts",
-        "ui/core/dependency-observable.ts",
-        "ui/core/proxy.d.ts",
-        "ui/core/proxy.ts",
-        "ui/core/view-common.ts",
-        "ui/core/view.android.ts",
-        "ui/core/view.d.ts",
-        "ui/core/view.ios.ts",
-        "ui/core/weak-event-listener.d.ts",
-        "ui/core/weak-event-listener.ts",
-        "ui/date-picker/date-picker-common.ts",
-        "ui/date-picker/date-picker.android.ts",
-        "ui/date-picker/date-picker.d.ts",
-        "ui/date-picker/date-picker.ios.ts",
-        "ui/dialogs/dialogs-common.ts",
-        "ui/dialogs/dialogs.android.ts",
-        "ui/dialogs/dialogs.d.ts",
-        "ui/dialogs/dialogs.ios.ts",
-        "ui/editable-text-base/editable-text-base-common.ts",
-        "ui/editable-text-base/editable-text-base.android.ts",
-        "ui/editable-text-base/editable-text-base.d.ts",
-        "ui/editable-text-base/editable-text-base.ios.ts",
-        "ui/enums/enums.d.ts",
-        "ui/enums/enums.ts",
-        "ui/frame/frame-common.ts",
-        "ui/frame/frame.android.ts",
-        "ui/frame/frame.d.ts",
-        "ui/frame/frame.ios.ts",
-        "ui/gestures/gestures-common.ts",
-        "ui/gestures/gestures.android.ts",
-        "ui/gestures/gestures.d.ts",
-        "ui/gestures/gestures.ios.ts",
-        "ui/html-view/html-view-common.ts",
-        "ui/html-view/html-view.android.ts",
-        "ui/html-view/html-view.d.ts",
-        "ui/html-view/html-view.ios.ts",
-        "ui/image-cache/image-cache-common.ts",
-        "ui/image-cache/image-cache.android.ts",
-        "ui/image-cache/image-cache.d.ts",
-        "ui/image-cache/image-cache.ios.ts",
-        "ui/image/image-common.ts",
-        "ui/image/image.android.ts",
-        "ui/image/image.d.ts",
-        "ui/image/image.ios.ts",
-        "ui/label/label-common.ts",
-        "ui/label/label.android.ts",
-        "ui/label/label.d.ts",
-        "ui/label/label.ios.ts",
-        "ui/layouts/absolute-layout/absolute-layout-common.ts",
-        "ui/layouts/absolute-layout/absolute-layout.android.ts",
-        "ui/layouts/absolute-layout/absolute-layout.d.ts",
-        "ui/layouts/absolute-layout/absolute-layout.ios.ts",
-        "ui/layouts/dock-layout/dock-layout-common.ts",
-        "ui/layouts/dock-layout/dock-layout.android.ts",
-        "ui/layouts/dock-layout/dock-layout.d.ts",
-        "ui/layouts/dock-layout/dock-layout.ios.ts",
-        "ui/layouts/grid-layout/grid-layout-common.ts",
-        "ui/layouts/grid-layout/grid-layout.android.ts",
-        "ui/layouts/grid-layout/grid-layout.d.ts",
-        "ui/layouts/grid-layout/grid-layout.ios.ts",
-        "ui/layouts/layout-base.d.ts",
-        "ui/layouts/layout-base-common.ts",
-        "ui/layouts/layout-base.android.ts",
-        "ui/layouts/layout-base.ios.ts",
-        "ui/layouts/layout.android.ts",
-        "ui/layouts/layout.d.ts",
-        "ui/layouts/layout.ios.ts",
-        "ui/layouts/stack-layout/stack-layout-common.ts",
-        "ui/layouts/stack-layout/stack-layout.android.ts",
-        "ui/layouts/stack-layout/stack-layout.d.ts",
-        "ui/layouts/stack-layout/stack-layout.ios.ts",
-        "ui/layouts/wrap-layout/wrap-layout-common.ts",
-        "ui/layouts/wrap-layout/wrap-layout.android.ts",
-        "ui/layouts/wrap-layout/wrap-layout.d.ts",
-        "ui/layouts/wrap-layout/wrap-layout.ios.ts",
-        "ui/list-picker/list-picker-common.ts",
-        "ui/list-picker/list-picker.android.ts",
-        "ui/list-picker/list-picker.d.ts",
-        "ui/list-picker/list-picker.ios.ts",
-        "ui/list-view/list-view-common.ts",
-        "ui/list-view/list-view.android.ts",
-        "ui/list-view/list-view.d.ts",
-        "ui/list-view/list-view.ios.ts",
-        "ui/page/page-common.ts",
-        "ui/page/page.android.ts",
-        "ui/page/page.d.ts",
-        "ui/page/page.ios.ts",
-        "ui/placeholder/placeholder-common.ts",
-        "ui/placeholder/placeholder.android.ts",
-        "ui/placeholder/placeholder.d.ts",
-        "ui/placeholder/placeholder.ios.ts",
-        "ui/progress/progress-common.ts",
-        "ui/progress/progress.android.ts",
-        "ui/progress/progress.d.ts",
-        "ui/progress/progress.ios.ts",
-        "ui/proxy-view-container/proxy-view-container.d.ts",
-        "ui/proxy-view-container/proxy-view-container.ts",
-        "ui/repeater/repeater.d.ts",
-        "ui/repeater/repeater.ts",
-        "ui/scroll-view/scroll-view-common.ts",
-        "ui/scroll-view/scroll-view.android.ts",
-        "ui/scroll-view/scroll-view.d.ts",
-        "ui/scroll-view/scroll-view.ios.ts",
-        "ui/search-bar/search-bar-common.ts",
-        "ui/search-bar/search-bar.android.ts",
-        "ui/search-bar/search-bar.d.ts",
-        "ui/search-bar/search-bar.ios.ts",
-        "ui/segmented-bar/segmented-bar-common.ts",
-        "ui/segmented-bar/segmented-bar.android.ts",
-        "ui/segmented-bar/segmented-bar.d.ts",
-        "ui/segmented-bar/segmented-bar.ios.ts",
-        "ui/slider/slider-common.ts",
-        "ui/slider/slider.android.ts",
-        "ui/slider/slider.d.ts",
-        "ui/slider/slider.ios.ts",
-        "ui/styling/background-common.ts",
-        "ui/styling/background.android.d.ts",
-        "ui/styling/background.android.ts",
-        "ui/styling/background.d.ts",
-        "ui/styling/background.ios.ts",
-        "ui/styling/converters.ts",
-        "ui/styling/css-selector.d.ts",
-        "ui/styling/css-selector.ts",
-        "ui/styling/font-common.ts",
-        "ui/styling/font.android.ts",
-        "ui/styling/font.d.ts",
-        "ui/styling/font.ios.ts",
-        "ui/styling/style-property.d.ts",
-        "ui/styling/style-property.ts",
-        "ui/styling/style-scope.d.ts",
-        "ui/styling/style-scope.ts",
-        "ui/styling/style.d.ts",
-        "ui/styling/style.ts",
-        "ui/styling/styling.d.ts",
-        "ui/styling/styling.ts",
-        "ui/styling/visual-state-constants.d.ts",
-        "ui/styling/visual-state-constants.ts",
-        "ui/styling/visual-state.ts",
-        "ui/switch/switch-common.ts",
-        "ui/switch/switch.android.ts",
-        "ui/switch/switch.d.ts",
-        "ui/switch/switch.ios.ts",
-        "ui/tab-view/tab-view-common.ts",
-        "ui/tab-view/tab-view.android.ts",
-        "ui/tab-view/tab-view.d.ts",
-        "ui/tab-view/tab-view.ios.ts",
-        "ui/text-base/text-base-common.ts",
-        "ui/text-base/text-base-styler.android.ts",
-        "ui/text-base/text-base-styler.d.ts",
-        "ui/text-base/text-base-styler.ios.ts",
-        "ui/text-base/text-base.android.ts",
-        "ui/text-base/text-base.d.ts",
-        "ui/text-base/text-base.ios.ts",
-        "ui/text-field/text-field-common.ts",
-        "ui/text-field/text-field.android.ts",
-        "ui/text-field/text-field.d.ts",
-        "ui/text-field/text-field.ios.ts",
-        "ui/text-view/text-view-common.ts",
-        "ui/text-view/text-view.android.ts",
-        "ui/text-view/text-view.d.ts",
-        "ui/text-view/text-view.ios.ts",
-        "ui/time-picker/time-picker-common.ts",
-        "ui/time-picker/time-picker.android.ts",
-        "ui/time-picker/time-picker.d.ts",
-        "ui/time-picker/time-picker.ios.ts",
-        "ui/transition/fade-transition.android.ts",
-        "ui/transition/fade-transition.ios.ts",
-        "ui/transition/flip-transition.android.ts",
-        "ui/transition/slide-transition.android.ts",
-        "ui/transition/slide-transition.ios.ts",
-        "ui/transition/transition.android.ts",
-        "ui/transition/transition.d.ts",
-        "ui/transition/transition.ios.ts",
-        "ui/transition/fade-transition.d.ts",
-        "ui/transition/slide-transition.d.ts",
-        "ui/utils.d.ts",
-        "ui/utils.ios.ts",
-        "ui/web-view/web-view-common.ts",
-        "ui/web-view/web-view.android.ts",
-        "ui/web-view/web-view.d.ts",
-        "ui/web-view/web-view.ios.ts",
-        "utils/debug.d.ts",
-        "utils/debug.ts",
-        "utils/lazy.d.ts",
-        "utils/lazy.ts",
-        "utils/module-merge.ts",
-        "utils/number-utils.ts",
-        "utils/types.d.ts",
-        "utils/types.ts",
-        "utils/utils-common.ts",
-        "utils/utils.android.ts",
-        "utils/utils.d.ts",
-        "utils/utils.ios.ts",
-        "weakmap.d.ts",
-        "xhr/xhr.ts",
-        "xml/xml.d.ts",
-        "xml/xml.ts"
+        "apps/xml-demo/mainPage.ts"
     ],
     "atom": {
         "rewriteTsconfig": true