diff --git a/BuildPackage.cmd b/BuildPackage.cmd
new file mode 100644
index 0000000000..a430c7be00
--- /dev/null
+++ b/BuildPackage.cmd
@@ -0,0 +1,10 @@
+call "c:\Program Files (x86)\nodejs\nodevars.bat"
+call npm.cmd install -g grunt-cli
+
+set NATIVESCRIPT_SKIP_POSTINSTALL_TASKS=1
+call npm.cmd install
+set NATIVESCRIPT_SKIP_POSTINSTALL_TASKS=
+
+call grunt.cmd pack --no-color
+
+call npm.cmd cache rm nativescript
diff --git a/Gruntfile.js b/Gruntfile.js
index da8a5d1de0..e8d50f4a56 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,6 @@ module.exports = function(grunt) {
 	grunt.initConfig({
 		copyPackageTo: "\\\\telerik.com\\Resources\\BlackDragon\\Builds\\nativescript-cli",
 
-		deploymentEnvironment: process.env["DeploymentEnvironment"] || "local",
 		jobName: process.env["JOB_NAME"] || "local",
 		buildNumber: process.env["BUILD_NUMBER"] || "non-ci",
 		dateString: now.substr(0, now.indexOf("T")),
@@ -84,11 +83,11 @@ module.exports = function(grunt) {
 		copy: {
 			package_to_drop_folder: {
 				src: "*.tgz",
-				dest: "<%= copyPackageTo %>/<%= jobName %>/<%= deploymentEnvironment %>/<%= dateString %> #<%= buildNumber %>/"
+				dest: "<%= copyPackageTo %>/<%= jobName %>/<%= dateString %> #<%= buildNumber %>/"
 			},
 			package_to_qa_drop_folder: {
 				src: "*.tgz",
-				dest: "<%= copyPackageTo %>/<%= jobName %>/<%= deploymentEnvironment %>/nativescript.tgz"
+				dest: "<%= copyPackageTo %>/<%= jobName %>/nativescript.tgz"
 			}
 		},
 
@@ -121,10 +120,8 @@ module.exports = function(grunt) {
 	grunt.registerTask("pack", [
 		"clean",
 		"ts:release_build",
-		"shell:prepare_resources",
 
-		"shell:apply_deployment_environment",
-		"shell:ci_unit_tests",
+		//"shell:ci_unit_tests",
 
 		"set_package_version",
 		"shell:build_package",
diff --git a/package.json b/package.json
index 1d5163808d..7723e21b9b 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,11 @@
 {
-	"name": "nativescript-cli",
+	"name": "nativescript",
+	"preferGlobal": true,
 	"version": "0.1.0",
 	"author": "Telerik <support@telerik.com>",
 	"description": "Command-line interface for building NativeScript projects",
 	"bin": {
+		"tns": "./bin/nativescript.js",
 		"nativescript": "./bin/nativescript.js"
 	},
 	"main": "./lib/nativescript-cli.js",
@@ -16,11 +18,9 @@
 	},
 	"keywords": [
 		"nativescript",
-		"appbuilder",
 		"telerik",
 		"mobile"
   	],
-	"license": "Apache2.0",
 	"dependencies": {
 		"fibers": "https://github.com/icenium/node-fibers/tarball/master",
 		"log4js": "0.6.9",