diff --git a/gruntfile.js b/gruntfile.js
index 6403080fb..d82386379 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -5,550 +5,590 @@ module.exports = function(grunt) {
     if (grunt.cli.tasks.indexOf("testsapp") >= 0 || grunt.cli.tasks.indexOf("buildTestsApp")>= 0) {
         var tsTester = require("./build/run-testsapp.grunt.js");
         tsTester.run(grunt);
-    } else {
-
-
-        var fs=require("fs");
-        var pathModule=require("path");
-
-        var filterTypeScriptFiles = function(content, srcPath) {
-            var matchRule = /^.*@private/ig;
-            if (matchRule.test(content))
-            {
-                return false;
-            }
-            var processed = content;
-            processed = processed.replace(/\/\/[\/\s]*@private((.|\s)*?)\/\/[\/\s]*@endprivate/gm, "");
-            return processed;
-        };
-
-        var updatePackageDef = function(content, update)
-        {
-            var contentAsObject = JSON.parse(content);
-            update(contentAsObject);
-            return JSON.stringify(contentAsObject, null, "\t");
-        };
-
-        var updateModulesPackageDef = function(content, srcPath) {
-            return updatePackageDef(content, function(contentAsObject) {
-                contentAsObject.version = localCfg.packageVersion;
-                if (localCfg.commitSHA) {
-                    contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
-                }
-            });
-        };
-
-        var updateAppPackageDef = function(content, srcPath) {
-            var currentAppName = grunt.task.current.data.appName;
-            return updatePackageDef(content, function(contentAsObject) {
-                contentAsObject.version = localCfg.packageVersion;
-                contentAsObject.author = "Telerik <support@telerik.com>";
-                var specificKeywords = ["telerik", "mobile", "nativescript", "{N}", "tns", "appbuilder"];
-                if (currentAppName.indexOf("template-") === 0) {
-                    var templateName = currentAppName.substring("template-".length);
-                    contentAsObject.name = "tns-" + currentAppName;
-                    contentAsObject.description = "Nativescript " + templateName + " project template";
-                    specificKeywords.push("template");
-                }
-                else {
-                    contentAsObject.name = "tns-samples-" + currentAppName;
-                    contentAsObject.description = "Nativescript " + currentAppName + " sample application";
-                    specificKeywords.push("sample");
-                }
-                contentAsObject.license = "BSD";
-                addKeywords(contentAsObject, specificKeywords);
-
-                if (!contentAsObject.repository) {
-                    contentAsObject.repository = {};
-                }
-                if (!contentAsObject.repository.url) {
-                    contentAsObject.repository.url = localCfg.mainPackageContent.repository.url;
-                }
-                if (localCfg.commitSHA) {
-                    contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
-                }
-            });
-        };
-
-        var addKeywords = function(packageObject, newKeywords) {
-            if (!packageObject.keywords) {
-                packageObject.keywords = newKeywords;
-                return;
-            }
-
-            if (typeof(packageObject.keywords) == "string") {
-                packageObject.keywords = packageObject.keywords.split(" ");
-            }
-            packageObject.keywords = packageObject.keywords.concat(newKeywords);
-        };
-
-        var getCommitSha = function() {
-            if (process.env.GIT_COMMIT) {
-                return process.env.GIT_COMMIT;
-            }
-            return "";
-        };
-
-        var assignGitSHA = function(err, stdout, stderr, cb) {
-            if (!localCfg.commitSHA) {
-                localCfg.commitSHA = stdout.replace("\n", "");
-            }
-            cb();
-        };
-
-        var getPackageVersion = function() {
-            var buildVersion = process.env.PACKAGE_VERSION;
-            if (!buildVersion) {
-                return localCfg.mainPackageContent.version;
-            }
-            return localCfg.mainPackageContent.version + "-" + buildVersion;
-        };
-
-        var processAppFile = function(content, srcPath) {
-            return content;
-        };
-
-        var getSubDirs = function(dir) {
-            var allObjects = fs.readdirSync(dir);
-            var allDirs = [];
-            for (var i=0; i<allObjects.length; i++)
-            {
-                var currentObjName = allObjects[i];
-                var currentObjPath = pathModule.join(dir, currentObjName);
-                var stats = fs.statSync(currentObjPath);
-                if (stats.isDirectory())
-                {
-                    allDirs.push({name: currentObjName, path: currentObjPath});
-                }
-            }
-            return allDirs;
-        };
-
-        var localCfg = {
-            srcDir: ".",
-            srcAppsDir: "./apps",
-            packageJsonFilePath: "./package.json",
-            outDir: "./bin/dist",
-            outModulesDir: tsconfig.compilerOptions.outDir,
-            outAppsDir: "./bin/dist/apps",
-            outTsAppsDir: "./bin/dist/ts-apps",
-        };
-
-        var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
-        nodeTestEnv.NODE_PATH = localCfg.outModulesDir;
-
-        localCfg.nodeTestsDir = pathModule.join(localCfg.outModulesDir, 'node-tests');
-
-
-        localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
-        localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
-        localCfg.commitSHA = getCommitSha();
-        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"
-        ]);
-
-        var tsOptions = tsconfig.compilerOptions;
-        tsOptions.fast = 'never';
-        tsOptions.removeComments = !grunt.option('leavecomments') || '';
-        tsOptions.compiler = "node_modules/typescript/bin/tsc";
-
-        grunt.initConfig({
-            localCfg : localCfg,
-            pkg: grunt.file.readJSON('package.json'),
-            clean: {
-                build: {
-                    src: [localCfg.outDir]
-                },
-                typeScriptLeftovers: {
-                    expand: true,
-                    src: [
-                        ".baseDir.*",
-                        "_references.js",
-                        "**/*.map"
-                    ],
-                    cwd: localCfg.outModulesDir
-                },
-                nodeTests: {
-                    src: localCfg.nodeTestsDir,
-                },
-                readyAppFiles: {
-                    src: [localCfg.outModulesDir + "/apps/**"]
-                }
-            },
-            copy: {
-                jsLibs: {
-                    expand: true,
-                    src: [
-                        "js-libs/**/*.js",
-                        "fetch/**/*.js",
-                        "css/**/*.js",
-                        "css-value/**/*.js",
-                    ],
-                    dest: localCfg.outModulesDir,
-                    cwd: localCfg.srcDir
-                },
-                license: {
-                    expand: true,
-                    src: [
-                        "./LICENSE",
-                    ],
-                    dest: "<%= localCfg.outModulesDir %>/",
-                    cwd: localCfg.srcDir
-                },
-                appLicense: {
-                    expand: true,
-                    src: ["./LICENSE"],
-                    cwd: localCfg.srcAppsDir,
-                    dest: "__dummy__"
-                },
-                definitionFiles: {
-                    src: [
-                        localCfg.srcDir + "/**/*.d.ts",
-                        //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
-                        "!" + localCfg.srcDir + "/apps/**",
-                        "!" + localCfg.srcDir + "/node-tests/**",
-                        "!" + localCfg.srcDir + "/org.nativescript.widgets.d.ts",
-                        "!" + localCfg.srcDir + "/android17.d.ts",
-                        "!" + localCfg.srcDir + "/**/*.android.d.ts",
-                        "!" + localCfg.srcDir + "/ios.d.ts",
-                        "!" + localCfg.srcDir + "/**/*.ios.d.ts",
-                    ].concat(localCfg.defaultExcludes),
-                    dest: localCfg.outModulesDir + "/",
-                    expand: true,
-                    options: {
-                        process: filterTypeScriptFiles
-                    }
-                },
-                modulesPackageDef: {
-                    expand: true,
-                    src: localCfg.packageJsonFilePath,
-                    dest: localCfg.outModulesDir + "/",
-                    options: {
-                        process: updateModulesPackageDef
-                    }
-                },
-                appPackageDef: {
-                    expand: true,
-                    flatten: true,
-                    src: "__app_package_json",
-                    dest:  "__dummy__",
-                    options: {
-                        process: updateAppPackageDef
-                    }
-                },
-                childPackageFiles: {
-                    expand: true,
-                    src: [
-                        localCfg.srcDir + "/**/package.json",
-                        "!./package.json",
-                        "!./Deploy/**/*.*",
-                        "!./bin/**/*.*",
-                        "!./Tests/**/*.*",
-                        "!" + localCfg.outDir + "/**/*.*"
-                    ],
-                    dest: localCfg.outModulesDir + "/"
-                },
-                rawAppsFiles: {
-                    expand: true,
-                    src: [
-                        "**/*.*",
-                        "**/*",
-                        "!**/*.map",
-                            "!**/*.ts"
-                    ],
-                    dest: localCfg.outAppsDir,
-                    cwd: localCfg.srcAppsDir,
-                    dot: true
-                },
-                readyAppFiles: {
-                    expand: true,
-                    src: ["./**/*.*"],
-                    dest: localCfg.outAppsDir + "/",
-                    cwd: localCfg.outModulesDir + "/apps/",
-                    options: {
-                        process: processAppFile
-                    }
-                },
-                readyTsAppFiles: {
-                    expand: true,
-                    src: ["./**/*.*", "!./**/*.map"],
-                    dest: localCfg.outTsAppsDir + "/",
-                    cwd: localCfg.srcAppsDir
-                },
-                readyPackages: {
-                    expand: true,
-                    src: ["./**/*.tgz"],
-                    dest: localCfg.outDir + "/",
-                    cwd: localCfg.outDir,
-                    flatten: true
-                }
-            },
-            ts: {
-                build: {
-                    tsconfig: 'tsconfig.json',
-                    outDir: localCfg.outModulesDir,
-                    options: tsOptions
-                },
-                buildNodeTests: {
-                    src: [
-                            'js-libs/easysax/**/*.ts',
-                            'xml/**/*.ts',
-                            'node-tests/**/*.ts',
-                            'es-collections.d.ts',
-                        ],
-                    outDir: localCfg.outModulesDir,
-                    options: tsOptions
-                },
-                buildDts: {
-                    src: [
-                        '**/*.d.ts',
-                        '!org.nativescript.widgets.d.ts',
-                        '!**/*.android.d.ts',
-                        '!node_modules/**/*',
-                        '!bin/**/*',
-                        '!apps/**/*',
-                        '!android17.d.ts',
-                        '!ios.d.ts',
-                    ],
-                    outDir: localCfg.outModulesDir,
-                    options: tsOptions
-                },
-                testCombinedDts: {
-                    src: [
-                        pathModule.join(localCfg.outModulesDir, 'tns-core-modules.d.ts'),
-                    ],
-                    outDir: localCfg.outModulesDir,
-                    options: tsOptions
-                }
-            },
-            tslint: {
-                build: {
-                    files: {
-                        src: localCfg.typeScriptSrcForTsLint
-                    },
-                    options: {
-                    configuration: grunt.file.readJSON("./build/tslint.json")
-                    }
-                }
-            },
-            exec: {
-                packModules: {
-                    cmd: "npm pack",
-                    cwd: localCfg.outModulesDir + "/"
-                },
-                packApp: {
-                    cmd: "npm pack",
-                    cwd: "__dummy__"
-                },
-                mochaNode: {
-                    cmd: "grunt simplemocha:node"
-                }
-            },
-            multidest: {
-                copyLicenseFiles: {
-                    tasks: ["copy:appLicense"],
-                    dest: function() {
-                        var apps = getSubDirs(localCfg.srcAppsDir);
-                        var targetDirs = [];
-                        apps.forEach(function(item){
-                            targetDirs.push(pathModule.join(localCfg.outAppsDir, item.name));
-                            targetDirs.push(pathModule.join(localCfg.outTsAppsDir, item.name));
-                        });
-                        return targetDirs;
-                    }()
-                }
-            },
-            shell: {
-                getGitSHA: {
-                    command: "git rev-parse HEAD",
-                    options: {
-                        callback: assignGitSHA
-                    }
-                },
-            },
-            simplemocha: {
-                node: {
-                    src: localCfg.nodeTestsDir + '/**/*.js'
-                }
-            },
-            env: {
-                nodeTests: {
-                    NODE_PATH: localCfg.outModulesDir,
-                }
-            },
-            bom: {
-                allTargetFiles: {
-                    src: [
-                        pathModule.join(localCfg.outDir, "**/*.ts"),
-                        pathModule.join(localCfg.outDir, "**/*.js"),
-                        pathModule.join(localCfg.outDir, "**/*.css"),
-                        pathModule.join(localCfg.outDir, "**/*.xml")
-                        ]
-                }
-            }
-        });
-
-        grunt.loadNpmTasks("grunt-ts");
-        grunt.loadNpmTasks("grunt-contrib-clean");
-        grunt.loadNpmTasks("grunt-contrib-copy");
-        grunt.loadNpmTasks("grunt-exec");
-        grunt.loadNpmTasks("grunt-tslint");
-        grunt.loadNpmTasks("grunt-multi-dest");
-        grunt.loadNpmTasks("grunt-shell");
-        grunt.loadNpmTasks("grunt-env");
-        grunt.loadNpmTasks("grunt-simple-mocha");
-        grunt.loadNpmTasks('grunt-bom-removal');
-
-        var cloneTasks = function(originalTasks, taskNameSuffix) {
-            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;
-
-                originalTask.specializeCfg(taskCfg, taskNameSuffix);
-
-                clonedTasks.push({name: taskName, cfg: taskCfg});
-            }
-            return clonedTasks;
-        };
-
-        var enqueueTasks = function(tasks) {
-            for (var i=0; i<tasks.length; i++) {
-                var task = tasks[i];
-                grunt.config(task.name, task.cfg);
-                grunt.task.run(task.name.join(":"));
-            }
-        };
-
-        grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
-            var allapps = getSubDirs(localCfg.srcAppsDir);
-            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 = currentApp.name + (pkgAppNameSuffix || "");
-                    }
-                },
-                {
-                    name: ["exec", "packApp"],
-                    specializeCfg: function(cfg, currentAppName) {
-                        cfg.cwd = pathModule.join(outAppsDir, currentAppName);
-                    }
-                }
-            ];
-
-            for (var j=0; j<allapps.length; j++) {
-                var currentApp = allapps[j];
-                var clonedTasks = cloneTasks(tasks, currentApp.name);
-
-                enqueueTasks(clonedTasks);
-            }
-        });
-
-        grunt.registerTask("tests", [
-                "default"
-        ]);
-
-        grunt.registerTask("collect-apps-raw-files", [
-                "copy:rawAppsFiles",
-                "multidest:copyLicenseFiles"
-        ]);
-
-        grunt.registerTask("collect-modules-raw-files", [
-                "copy:jsLibs",
-                "copy:license"
-        ]);
-
-        grunt.registerTask("compile-dts", ["ts:buildDts"]);
-
-        grunt.registerTask("compile-ts", [
-                "compile-dts",
-                "ts:build",
-                "clean:typeScriptLeftovers",
-                "copy:childPackageFiles"
-        ]);
-        grunt.registerTask("distribute-apps-files", [
-                "copy:readyAppFiles",
-                "clean:readyAppFiles"
-        ]);
-        grunt.registerTask("distribute-ts-apps-files", [
-                "copy:readyTsAppFiles"
-        ]);
-        grunt.registerTask("generate-tns-core-modules-dts", function() {
-            var dtsFiles = grunt.file.expand({cwd: localCfg.outModulesDir}, [
-                '**/*.d.ts',
-                '!tns-core-modules.d.ts'
-            ].concat(localCfg.defaultExcludes));
-            dtsFiles.sort();
-
-            var dtsLines = dtsFiles.map(function(dtsFile) {
-                return '/// <reference path="' + dtsFile + '" />';
-            });
-            var combinedDtsPath = pathModule.join(localCfg.outModulesDir, 'tns-core-modules.d.ts');
-            grunt.file.write(combinedDtsPath, dtsLines.join('\n'));
-        });
-        grunt.registerTask("pack-modules", [
-                "copy:modulesPackageDef",
-                "copy:definitionFiles",
-                "copy:jsLibs",
-                "generate-tns-core-modules-dts",
-                "ts:testCombinedDts",
-                "exec:packModules"
-        ]);
-        grunt.registerTask("pack-apps", [
-                "processEachApp:" + localCfg.outAppsDir
-        ]);
-        grunt.registerTask("pack-ts-apps", [
-                "processEachApp:" + localCfg.outTsAppsDir + ":-ts"
-        ]);
-        grunt.registerTask("get-ready-packages", [
-                "copy:readyPackages"
-        ]);
-
-        grunt.registerTask("default", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
-                    "just-build",
-
-                    "pack-apps",
-                    "pack-ts-apps",
-                    "get-ready-packages"
-        ]));
-
-        grunt.registerTask("just-build", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
-                    "clean:build",
-                    "shell:getGitSHA",
-
-                    "collect-apps-raw-files",
-                    "collect-modules-raw-files",
-
-                    "compile-ts",
-                    "distribute-apps-files",
-                    "distribute-ts-apps-files",
-
-                    "bom:allTargetFiles",
-
-                    "pack-modules"
-        ]));
-
-        grunt.registerTask("node-tests", [
-                "clean:nodeTests",
-                "ts:buildNodeTests",
-                "copy:childPackageFiles",
-                "copy:jsLibs",
-                "env:nodeTests",
-                "exec:mochaNode", //spawn a new process to use the new NODE_PATH
-        ]);
-
+        return;
     }
 
+    var fs=require("fs");
+    var pathModule=require("path");
+
+    var filterTypeScriptFiles = function(content, srcPath) {
+        var matchRule = /^.*@private/ig;
+        if (matchRule.test(content))
+        {
+            return false;
+        }
+        var processed = content;
+        processed = processed.replace(/\/\/[\/\s]*@private((.|\s)*?)\/\/[\/\s]*@endprivate/gm, "");
+        return processed;
+    };
+
+    var updatePackageDef = function(content, update)
+    {
+        var contentAsObject = JSON.parse(content);
+        update(contentAsObject);
+        return JSON.stringify(contentAsObject, null, "\t");
+    };
+
+    var updateModulesPackageDef = function(content, srcPath) {
+        return updatePackageDef(content, function(contentAsObject) {
+            contentAsObject.version = localCfg.packageVersion;
+            if (localCfg.commitSHA) {
+                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+            }
+        });
+    };
+
+    var updateAppPackageDef = function(content, srcPath) {
+        var currentAppName = grunt.task.current.data.appName;
+        return updatePackageDef(content, function(contentAsObject) {
+            contentAsObject.version = localCfg.packageVersion;
+            contentAsObject.author = "Telerik <support@telerik.com>";
+            var specificKeywords = ["telerik", "mobile", "nativescript", "{N}", "tns", "appbuilder"];
+            if (currentAppName.indexOf("template-") === 0) {
+                var templateName = currentAppName.substring("template-".length);
+                contentAsObject.name = "tns-" + currentAppName;
+                contentAsObject.description = "Nativescript " + templateName + " project template";
+                specificKeywords.push("template");
+            }
+            else {
+                contentAsObject.name = "tns-samples-" + currentAppName;
+                contentAsObject.description = "Nativescript " + currentAppName + " sample application";
+                specificKeywords.push("sample");
+            }
+            contentAsObject.license = "BSD";
+            addKeywords(contentAsObject, specificKeywords);
+
+            if (!contentAsObject.repository) {
+                contentAsObject.repository = {};
+            }
+            if (!contentAsObject.repository.url) {
+                contentAsObject.repository.url = localCfg.mainPackageContent.repository.url;
+            }
+            if (localCfg.commitSHA) {
+                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+            }
+        });
+    };
+
+    var addKeywords = function(packageObject, newKeywords) {
+        if (!packageObject.keywords) {
+            packageObject.keywords = newKeywords;
+            return;
+        }
+
+        if (typeof(packageObject.keywords) == "string") {
+            packageObject.keywords = packageObject.keywords.split(" ");
+        }
+        packageObject.keywords = packageObject.keywords.concat(newKeywords);
+    };
+
+    var getCommitSha = function() {
+        if (process.env.GIT_COMMIT) {
+            return process.env.GIT_COMMIT;
+        }
+        return "";
+    };
+
+    var assignGitSHA = function(err, stdout, stderr, cb) {
+        if (!localCfg.commitSHA) {
+            localCfg.commitSHA = stdout.replace("\n", "");
+        }
+        cb();
+    };
+
+    var getPackageVersion = function() {
+        var buildVersion = process.env.PACKAGE_VERSION;
+        if (!buildVersion) {
+            return localCfg.mainPackageContent.version;
+        }
+        return localCfg.mainPackageContent.version + "-" + buildVersion;
+    };
+
+    var processAppFile = function(content, srcPath) {
+        return content;
+    };
+
+    var getSubDirs = function(dir) {
+        var allObjects = fs.readdirSync(dir);
+        var allDirs = [];
+        for (var i=0; i<allObjects.length; i++)
+        {
+            var currentObjName = allObjects[i];
+            var currentObjPath = pathModule.join(dir, currentObjName);
+            var stats = fs.statSync(currentObjPath);
+            if (stats.isDirectory())
+            {
+                allDirs.push({name: currentObjName, path: currentObjPath});
+            }
+        }
+        return allDirs;
+    };
+
+    var localCfg = {
+        srcDir: ".",
+        srcAppsDir: "./apps",
+        packageJsonFilePath: "./package.json",
+        outDir: "./bin/dist",
+        outModulesDir: tsconfig.compilerOptions.outDir,
+        outAppsDir: "./bin/dist/apps",
+        outTsAppsDir: "./bin/dist/ts-apps",
+    };
+
+    var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
+    nodeTestEnv.NODE_PATH = localCfg.outModulesDir;
+
+    localCfg.nodeTestsDir = pathModule.join(localCfg.outModulesDir, 'node-tests');
+
+
+    localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
+    localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
+    localCfg.commitSHA = getCommitSha();
+    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"
+    ]);
+
+    var tsOptions = tsconfig.compilerOptions;
+    tsOptions.fast = 'never';
+    tsOptions.removeComments = !grunt.option('leavecomments') || '';
+    tsOptions.compiler = "node_modules/typescript/bin/tsc";
+
+    grunt.initConfig({
+        localCfg : localCfg,
+        pkg: grunt.file.readJSON('package.json'),
+        clean: {
+            build: {
+                src: [localCfg.outDir]
+            },
+            typeScriptLeftovers: {
+                expand: true,
+                src: [
+                    ".baseDir.*",
+                    "_references.js",
+                    "**/*.map"
+                ],
+                cwd: localCfg.outModulesDir
+            },
+            nodeTests: {
+                src: localCfg.nodeTestsDir,
+            },
+            builtModules: {
+                src: localCfg.outModulesDir
+            },
+            externalModules: {
+                expand: true,
+                src: '<%= grunt.option("path") %>/node_modules/tns-core-modules/**/*',
+                options: {
+                    force: true
+                },
+            },
+            readyAppFiles: {
+                src: [localCfg.outModulesDir + "/apps/**"]
+            }
+        },
+        copy: {
+            jsLibs: {
+                expand: true,
+                src: [
+                    "js-libs/**/*.js",
+                    "fetch/**/*.js",
+                    "css/**/*.js",
+                    "css-value/**/*.js",
+                ],
+                dest: localCfg.outModulesDir,
+                cwd: localCfg.srcDir
+            },
+            license: {
+                expand: true,
+                src: [
+                    "./LICENSE",
+                ],
+                dest: "<%= localCfg.outModulesDir %>/",
+                cwd: localCfg.srcDir
+            },
+            appLicense: {
+                expand: true,
+                src: ["./LICENSE"],
+                cwd: localCfg.srcAppsDir,
+                dest: "__dummy__"
+            },
+            definitionFiles: {
+                src: [
+                    localCfg.srcDir + "/**/*.d.ts",
+                    //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
+                    "!" + localCfg.srcDir + "/apps/**",
+                    "!" + localCfg.srcDir + "/node-tests/**",
+                    "!" + localCfg.srcDir + "/org.nativescript.widgets.d.ts",
+                    "!" + localCfg.srcDir + "/android17.d.ts",
+                    "!" + localCfg.srcDir + "/**/*.android.d.ts",
+                    "!" + localCfg.srcDir + "/ios.d.ts",
+                    "!" + localCfg.srcDir + "/**/*.ios.d.ts",
+                ].concat(localCfg.defaultExcludes),
+                dest: localCfg.outModulesDir + "/",
+                expand: true,
+                options: {
+                    process: filterTypeScriptFiles
+                }
+            },
+            modulesPackageDef: {
+                expand: true,
+                src: localCfg.packageJsonFilePath,
+                dest: localCfg.outModulesDir + "/",
+                options: {
+                    process: updateModulesPackageDef
+                }
+            },
+            appPackageDef: {
+                expand: true,
+                flatten: true,
+                src: "__app_package_json",
+                dest:  "__dummy__",
+                options: {
+                    process: updateAppPackageDef
+                }
+            },
+            childPackageFiles: {
+                expand: true,
+                src: [
+                    localCfg.srcDir + "/**/package.json",
+                    "!./package.json",
+                    "!./Deploy/**/*.*",
+                    "!./bin/**/*.*",
+                    "!./Tests/**/*.*",
+                    "!" + localCfg.outDir + "/**/*.*"
+                ],
+                dest: localCfg.outModulesDir + "/"
+            },
+            rawAppsFiles: {
+                expand: true,
+                src: [
+                    "**/*.*",
+                    "**/*",
+                    "!**/*.map",
+                        "!**/*.ts"
+                ],
+                dest: localCfg.outAppsDir,
+                cwd: localCfg.srcAppsDir,
+                dot: true
+            },
+            readyAppFiles: {
+                expand: true,
+                src: ["./**/*.*"],
+                dest: localCfg.outAppsDir + "/",
+                cwd: localCfg.outModulesDir + "/apps/",
+                options: {
+                    process: processAppFile
+                }
+            },
+            readyTsAppFiles: {
+                expand: true,
+                src: ["./**/*.*", "!./**/*.map"],
+                dest: localCfg.outTsAppsDir + "/",
+                cwd: localCfg.srcAppsDir
+            },
+            readyPackages: {
+                expand: true,
+                src: ["./**/*.tgz"],
+                dest: localCfg.outDir + "/",
+                cwd: localCfg.outDir,
+                flatten: true
+            },
+            builtModules: {
+                expand: true,
+                src: [
+                    '**/*',
+                    '!*.md',
+                    '!apps/**/*',
+                    '!node_modules/**/*',
+                    '!node-tests/**/*',
+                ],
+                cwd: localCfg.outModulesDir,
+                dest: "<%= grunt.option('path') %>/node_modules/tns-core-modules/",
+            }
+        },
+        ts: {
+            build: {
+                tsconfig: 'tsconfig.json',
+                outDir: localCfg.outModulesDir,
+                options: tsOptions
+            },
+            buildNodeTests: {
+                src: [
+                        'js-libs/easysax/**/*.ts',
+                        'xml/**/*.ts',
+                        'node-tests/**/*.ts',
+                        'es-collections.d.ts',
+                    ],
+                outDir: localCfg.outModulesDir,
+                options: tsOptions
+            },
+            buildDts: {
+                src: [
+                    '**/*.d.ts',
+                    '!org.nativescript.widgets.d.ts',
+                    '!**/*.android.d.ts',
+                    '!node_modules/**/*',
+                    '!bin/**/*',
+                    '!apps/**/*',
+                    '!android17.d.ts',
+                    '!ios.d.ts',
+                ],
+                outDir: localCfg.outModulesDir,
+                options: tsOptions
+            },
+            testCombinedDts: {
+                src: [
+                    pathModule.join(localCfg.outModulesDir, 'tns-core-modules.d.ts'),
+                ],
+                outDir: localCfg.outModulesDir,
+                options: tsOptions
+            }
+        },
+        tslint: {
+            build: {
+                files: {
+                    src: localCfg.typeScriptSrcForTsLint
+                },
+                options: {
+                configuration: grunt.file.readJSON("./build/tslint.json")
+                }
+            }
+        },
+        exec: {
+            packModules: {
+                cmd: "npm pack",
+                cwd: localCfg.outModulesDir + "/"
+            },
+            packApp: {
+                cmd: "npm pack",
+                cwd: "__dummy__"
+            },
+            mochaNode: {
+                cmd: "grunt simplemocha:node"
+            }
+        },
+        multidest: {
+            copyLicenseFiles: {
+                tasks: ["copy:appLicense"],
+                dest: function() {
+                    var apps = getSubDirs(localCfg.srcAppsDir);
+                    var targetDirs = [];
+                    apps.forEach(function(item){
+                        targetDirs.push(pathModule.join(localCfg.outAppsDir, item.name));
+                        targetDirs.push(pathModule.join(localCfg.outTsAppsDir, item.name));
+                    });
+                    return targetDirs;
+                }()
+            }
+        },
+        shell: {
+            getGitSHA: {
+                command: "git rev-parse HEAD",
+                options: {
+                    callback: assignGitSHA
+                }
+            },
+        },
+        simplemocha: {
+            node: {
+                src: localCfg.nodeTestsDir + '/**/*.js'
+            }
+        },
+        env: {
+            nodeTests: {
+                NODE_PATH: localCfg.outModulesDir,
+            }
+        },
+        bom: {
+            allTargetFiles: {
+                src: [
+                    pathModule.join(localCfg.outDir, "**/*.ts"),
+                    pathModule.join(localCfg.outDir, "**/*.js"),
+                    pathModule.join(localCfg.outDir, "**/*.css"),
+                    pathModule.join(localCfg.outDir, "**/*.xml")
+                    ]
+            }
+        }
+    });
+
+    grunt.loadNpmTasks("grunt-ts");
+    grunt.loadNpmTasks("grunt-contrib-clean");
+    grunt.loadNpmTasks("grunt-contrib-copy");
+    grunt.loadNpmTasks("grunt-exec");
+    grunt.loadNpmTasks("grunt-tslint");
+    grunt.loadNpmTasks("grunt-multi-dest");
+    grunt.loadNpmTasks("grunt-shell");
+    grunt.loadNpmTasks("grunt-env");
+    grunt.loadNpmTasks("grunt-simple-mocha");
+    grunt.loadNpmTasks('grunt-bom-removal');
+
+    var cloneTasks = function(originalTasks, taskNameSuffix) {
+        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;
+
+            originalTask.specializeCfg(taskCfg, taskNameSuffix);
+
+            clonedTasks.push({name: taskName, cfg: taskCfg});
+        }
+        return clonedTasks;
+    };
+
+    var enqueueTasks = function(tasks) {
+        for (var i=0; i<tasks.length; i++) {
+            var task = tasks[i];
+            grunt.config(task.name, task.cfg);
+            grunt.task.run(task.name.join(":"));
+        }
+    };
+
+    grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
+        var allapps = getSubDirs(localCfg.srcAppsDir);
+        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 = currentApp.name + (pkgAppNameSuffix || "");
+                }
+            },
+            {
+                name: ["exec", "packApp"],
+                specializeCfg: function(cfg, currentAppName) {
+                    cfg.cwd = pathModule.join(outAppsDir, currentAppName);
+                }
+            }
+        ];
+
+        for (var j=0; j<allapps.length; j++) {
+            var currentApp = allapps[j];
+            var clonedTasks = cloneTasks(tasks, currentApp.name);
+
+            enqueueTasks(clonedTasks);
+        }
+    });
+
+    grunt.registerTask("tests", [
+        "default"
+    ]);
+
+    grunt.registerTask("collect-apps-raw-files", [
+        "copy:rawAppsFiles",
+        "multidest:copyLicenseFiles"
+    ]);
+
+    grunt.registerTask("collect-modules-raw-files", [
+        "copy:jsLibs",
+        "copy:license"
+    ]);
+
+    grunt.registerTask("compile-dts", ["ts:buildDts"]);
+
+    grunt.registerTask("compile-ts", [
+        "compile-dts",
+        "ts:build",
+        "clean:typeScriptLeftovers",
+        "copy:childPackageFiles"
+    ]);
+    grunt.registerTask("check-external-app", function() {
+        var appPath = grunt.option('path');
+        if (!appPath) {
+            grunt.fail.fatal("External app option required. Pass the --path option.");
+        }
+        if (!grunt.file.exists(appPath)) {
+            grunt.fail.fatal("External application path does not exist: " + appPath);
+        }
+    });
+    grunt.registerTask("update-external-app", [
+        "check-external-app",
+        "clean:builtModules",
+        "compile-modules",
+        "clean:externalModules",
+        "copy:builtModules"
+    ]);
+    grunt.registerTask("distribute-apps-files", [
+            "copy:readyAppFiles",
+            "clean:readyAppFiles"
+    ]);
+    grunt.registerTask("distribute-ts-apps-files", [
+            "copy:readyTsAppFiles"
+    ]);
+    grunt.registerTask("generate-tns-core-modules-dts", function() {
+        var dtsFiles = grunt.file.expand({cwd: localCfg.outModulesDir}, [
+            '**/*.d.ts',
+            '!tns-core-modules.d.ts'
+        ].concat(localCfg.defaultExcludes));
+        dtsFiles.sort();
+
+        var dtsLines = dtsFiles.map(function(dtsFile) {
+            return '/// <reference path="' + dtsFile + '" />';
+        });
+        var combinedDtsPath = pathModule.join(localCfg.outModulesDir, 'tns-core-modules.d.ts');
+        grunt.file.write(combinedDtsPath, dtsLines.join('\n'));
+    });
+    //aliasing pack-modules for backwards compatibility
+    grunt.registerTask("pack-modules", [
+        "compile-modules",
+        "exec:packModules"
+    ]);
+    grunt.registerTask("pack-apps", [
+        "processEachApp:" + localCfg.outAppsDir
+    ]);
+    grunt.registerTask("pack-ts-apps", [
+        "processEachApp:" + localCfg.outTsAppsDir + ":-ts"
+    ]);
+    grunt.registerTask("get-ready-packages", [
+        "copy:readyPackages"
+    ]);
+
+    grunt.registerTask("default", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
+        "build-all",
+
+        "pack-apps",
+        "pack-ts-apps",
+        "get-ready-packages"
+    ]));
+
+    grunt.registerTask("compile-modules", [
+        "clean:build",
+        "shell:getGitSHA",
+        "compile-ts",
+        "bom:allTargetFiles",
+        "collect-modules-raw-files",
+        "copy:modulesPackageDef",
+        "copy:definitionFiles",
+        "copy:jsLibs",
+        "generate-tns-core-modules-dts",
+        "ts:testCombinedDts",
+    ]);
+
+    //alias just-build for backwards compatibility
+    grunt.registerTask("just-build", ["build-all"]);
+
+    grunt.registerTask("build-all", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
+        "pack-modules",
+
+        "collect-apps-raw-files",
+        "distribute-apps-files",
+        "distribute-ts-apps-files",
+    ]));
+
+    grunt.registerTask("node-tests", [
+        "clean:nodeTests",
+        "ts:buildNodeTests",
+        "copy:childPackageFiles",
+        "copy:jsLibs",
+        "env:nodeTests",
+        "exec:mochaNode", //spawn a new process to use the new NODE_PATH
+    ]);
 };
diff --git a/package.json b/package.json
index 79b296715..de79d000a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
   "files": [
     "**/*.*",
     "**/*",
-    "!node-tests/"
+    "!.baseDir.*",
+    "!node-tests/",
+    "!apps/"
   ],
   "license": "Apache-2.0",
   "devDependencies": {