diff --git a/package-lock.json b/package-lock.json
index 10e4ec5..ff4ad0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,6 +64,25 @@
         "ansi-256-colors": "^1.1.0"
       }
     },
+    "@pushrocks/early": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@pushrocks/early/-/early-3.0.3.tgz",
+      "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5"
+      }
+    },
+    "@pushrocks/smartdelay": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.2.tgz",
+      "integrity": "sha512-4xf6tMKwZcxBynKgXrM4SQKgeASfRvx43LUmR5DkStp26ZHAsarCXUdKJS6y8QIPygEOTOCP8we97JAcCzBuMg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5"
+      }
+    },
     "@pushrocks/smartfile": {
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.6.tgz",
@@ -79,28 +98,6 @@
         "glob": "^7.1.2",
         "js-yaml": "^3.10.0",
         "vinyl-file": "^3.0.0"
-      },
-      "dependencies": {
-        "@types/fs-extra": {
-          "version": "5.0.4",
-          "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz",
-          "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
-          "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
       }
     },
     "@pushrocks/smartlog": {
@@ -127,8 +124,7 @@
     "@pushrocks/smartpromise": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
-      "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
-      "dev": true
+      "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
     },
     "@pushrocks/smartrequest": {
       "version": "1.1.14",
@@ -152,6 +148,19 @@
         "which": "^1.3.1"
       }
     },
+    "@pushrocks/tapbundle": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.5.tgz",
+      "integrity": "sha512-7K1y4pyJ5O8XRmnW/ADryEoniGKOW0Un6VZpxMcYTndS5AjwKhjRkAAaSQf4g/a8Ei+uk/q8csI9Twjb9KISLQ==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/early": "^3.0.3",
+        "@pushrocks/smartdelay": "^2.0.2",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "leakage": "^0.4.0",
+        "smartchai": "^2.0.1"
+      }
+    },
     "@types/chai": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.4.tgz",
@@ -192,9 +201,9 @@
       }
     },
     "@types/fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz",
+      "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -260,16 +269,6 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "beautycolor": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/beautycolor/-/beautycolor-1.0.11.tgz",
-      "integrity": "sha512-Uxl/39+2uqixPzsrV+0NOHf0sJlWmsKnRTV0oz8+bfwnHPA/E+SZuh3Upn3OXobv0W7LZg5BVoLj1nkMj7m5jA==",
-      "dev": true,
-      "requires": {
-        "ansi-256-colors": "^1.1.0",
-        "typings-global": "^1.0.14"
-      }
-    },
     "bindings": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
@@ -328,9 +327,9 @@
       "dev": true
     },
     "clone": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
     "clone-buffer": {
@@ -386,15 +385,6 @@
         "type-detect": "^4.0.0"
       }
     },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -407,39 +397,6 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
-    "early": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/early/-/early-2.1.1.tgz",
-      "integrity": "sha1-hB4jJU6l3FTYr67ugvWrZcAO4jw=",
-      "dev": true,
-      "requires": {
-        "beautycolor": "^1.0.7",
-        "smartq": "^1.1.1",
-        "typings-global": "^1.0.16"
-      }
-    },
-    "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
@@ -453,9 +410,9 @@
       "dev": true
     },
     "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
     "figures": {
@@ -476,11 +433,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-    },
     "form-data": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
@@ -493,9 +445,9 @@
       }
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+      "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -509,11 +461,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
@@ -540,23 +487,6 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "home": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/home/-/home-1.0.1.tgz",
-      "integrity": "sha1-lqQjzrSbmDeP9e886uBZpVf53TU=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.1"
-      }
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -573,29 +503,6 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
-    "is-callable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -711,20 +618,6 @@
       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
       "dev": true
     },
-    "object-keys": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -734,12 +627,6 @@
         "wrappy": "1"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -797,12 +684,6 @@
       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
       "dev": true
     },
-    "require-reload": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/require-reload/-/require-reload-0.2.2.tgz",
-      "integrity": "sha1-KadZGEbK+RtuijzamRaD+V+NfUI=",
-      "dev": true
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -823,61 +704,6 @@
         "chai-string": "^1.4.0"
       }
     },
-    "smartdelay": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/smartdelay/-/smartdelay-1.0.4.tgz",
-      "integrity": "sha512-ab+d8ADiMMPKwrQNhoJYjmOR20VIIIxjknoEF9/PfMryic7tmvTmFrDMdcnMRohGNw/pN+4/I5dSUBdsDya7uw==",
-      "dev": true,
-      "requires": {
-        "smartq": "^1.1.1",
-        "typings-global": "^1.0.16"
-      }
-    },
-    "smartfile": {
-      "version": "4.2.28",
-      "resolved": "https://registry.npmjs.org/smartfile/-/smartfile-4.2.28.tgz",
-      "integrity": "sha512-zUeAOLYftz8xLfKTs9U1NOuNPTA9jlvTQNr7lDIv84kXnr1AEpDb2Xwy1MdK1w733sBil/RkxtezrkvgRVAnNg==",
-      "dev": true,
-      "requires": {
-        "@types/fs-extra": "5.0.0",
-        "@types/vinyl": "^2.0.2",
-        "fs-extra": "^5.0.0",
-        "glob": "^7.1.2",
-        "js-yaml": "^3.10.0",
-        "require-reload": "0.2.2",
-        "smartpath": "^3.2.8",
-        "smartq": "^1.1.6",
-        "smartrequest": "^1.0.8",
-        "vinyl-file": "^3.0.0"
-      }
-    },
-    "smartpath": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz",
-      "integrity": "sha1-SDS9OouuIpW6rK26I8h6UBlS+UA=",
-      "dev": true,
-      "requires": {
-        "home": "^1.0.1",
-        "typings-global": "^1.0.14"
-      }
-    },
-    "smartq": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.8.tgz",
-      "integrity": "sha512-FURlYW/C3bLeZjJcBVyw7bxCyQoCXiXbLCZcDUKznhXHaLu35c8m33/a2H8CA0rtb82lvzN8dRLnBZAcNMzNHQ==",
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "smartrequest": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/smartrequest/-/smartrequest-1.0.8.tgz",
-      "integrity": "sha512-pzYmVoRbZeDftToeikPlC6+0ehGp1GiwgiYftYPKxvR7DyR4SIa7wPBImom/5XgaMBJC4haExX7RwrtfrCfmcw==",
-      "dev": true,
-      "requires": {
-        "smartq": "^1.1.1"
-      }
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -937,19 +763,6 @@
         "strip-bom": "^2.0.0"
       }
     },
-    "tapbundle": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tapbundle/-/tapbundle-2.0.2.tgz",
-      "integrity": "sha512-y3ulfK4GKoVkuqF2QsrwVMWLXHqXeoDEzsw/Q9ZTJumNINbx4bcWPAdg2IcTHYgJHeSdF03HiB9EbHoUTRjD9Q==",
-      "dev": true,
-      "requires": {
-        "early": "^2.1.1",
-        "leakage": "^0.4.0",
-        "smartchai": "^2.0.1",
-        "smartdelay": "^1.0.4",
-        "smartq": "^1.1.8"
-      }
-    },
     "ts-node": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
@@ -978,16 +791,10 @@
       "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
       "dev": true
     },
-    "typings-global": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz",
-      "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A==",
-      "dev": true
-    },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true
     },
     "util-deprecate": {
@@ -996,19 +803,10 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
     "vinyl": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
-      "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
       "dev": true,
       "requires": {
         "clone": "^2.1.1",
diff --git a/package.json b/package.json
index 43a0ebc..9b13b77 100644
--- a/package.json
+++ b/package.json
@@ -16,11 +16,11 @@
     "@gitzone/tsbuild": "^2.0.22",
     "@gitzone/tsrun": "^1.1.12",
     "@gitzone/tstest": "^1.0.15",
-    "@types/node": "^10.7.1",
-    "smartfile": "^4.2.28",
-    "tapbundle": "^2.0.2"
+    "@pushrocks/smartfile": "^6.0.6",
+    "@pushrocks/tapbundle": "^3.0.5",
+    "@types/node": "^10.7.1"
   },
   "dependencies": {
-    "smartq": "^1.1.8"
+    "@pushrocks/smartpromise": "^2.0.5"
   }
 }
diff --git a/test/test.ts b/test/test.ts
index 1acb74c..0afd7b3 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -1,9 +1,9 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from 'tapbundle';
+import { expect, tap } from '@pushrocks/tapbundle';
 import * as smartcsv from '../ts/index';
 
 // tslint:disable-next-line:no-implicit-dependencies
-import * as smartfile from 'smartfile';
+import * as smartfile from '@pushrocks/smartfile';
 
 let fileString: string;
 let testCsv: smartcsv.Csv;
diff --git a/ts/smartcsv.plugins.ts b/ts/smartcsv.plugins.ts
index d7d8826..aef3264 100644
--- a/ts/smartcsv.plugins.ts
+++ b/ts/smartcsv.plugins.ts
@@ -1,3 +1,3 @@
-import * as smartq from 'smartq';
+import * as smartq from '@pushrocks/smartpromise';
 
 export { smartq };