diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..1595be7
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,2 @@
+node_modules/
+.nogit/
diff --git a/package-lock.json b/package-lock.json
index 77c489f..3ee79d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "tstest",
+  "name": "@pushrocks/tstest",
   "version": "1.0.2",
   "lockfileVersion": 1,
   "requires": true,
@@ -14,6 +14,19 @@
         "nan": "^2.9.2"
       }
     },
+    "@gitzone/tsbuild": {
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.0.21.tgz",
+      "integrity": "sha512-MAKfqnhf+42twSzXziRoBCu+sW61+2Rvc5qXxpEb594Fpnsj28cZ1VIEckSmiAkoBSiCnoU+2/qea2ycwWMBTg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartfile": "^6.0.3",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpath": "^4.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "typescript": "^2.9.2"
+      }
+    },
     "@gitzone/tsrun": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.9.tgz",
@@ -70,6 +83,12 @@
       "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz",
       "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA=="
     },
+    "@pushrocks/smartpath": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz",
+      "integrity": "sha512-MaI0+uLQPCr2V3WGnbdgb0pWa9xkWyrP4qYcbsHIjeismGLbn9s3jmP/HIXU8LkgzRgaVb+BJxmZJHOwl32DyA==",
+      "dev": true
+    },
     "@pushrocks/smartpromise": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
diff --git a/package.json b/package.json
index 0d2b731..4116597 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "tstest",
+  "name": "@pushrocks/tstest",
   "version": "1.0.2",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
@@ -7,15 +7,19 @@
   "typings": "dist/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
+  "bin": {
+    "tstest": "./cli.js"
+  },
   "scripts": {
     "test": "(npm run prepareTest && npm run tstest && npm run cleanUp)",
     "prepareTest": "git clone git@gitlab.com:sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
     "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
     "format": "(gitzone format)",
-    "build": "echo \"Not needed for now\""
+    "build": "(tsbuild)"
   },
   "devDependencies": {
+    "@gitzone/tsbuild": "^2.0.21",
     "@pushrocks/tapbundle": "^3.0.1"
   },
   "dependencies": {