diff --git a/.gitignore b/.gitignore
index 06e6038..155567d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 *.tsbuildinfo
+coverage
diff --git a/.npmignore b/.npmignore
index 9da7aa4..5409b9d 100644
--- a/.npmignore
+++ b/.npmignore
@@ -4,3 +4,4 @@ tsconfig.json
 src
 test
 jest.config.js
+coverage
diff --git a/jest.config.js b/jest.config.js
index 91a2d2c..2358d68 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,4 +1,5 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  collectCoverage: true
 };
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index bbefec9..8e96582 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "fabric-wallet-migration",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -36,15 +36,6 @@
                 "source-map": "^0.5.0"
             },
             "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                },
                 "source-map": {
                     "version": "0.5.7",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -232,17 +223,6 @@
                 "debug": "^4.1.0",
                 "globals": "^11.1.0",
                 "lodash": "^4.17.13"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
             }
         },
         "@babel/types": {
@@ -290,14 +270,6 @@
                 "find-up": "^4.1.0",
                 "js-yaml": "^3.13.1",
                 "resolve-from": "^5.0.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                }
             }
         },
         "@istanbuljs/schema": {
@@ -352,32 +324,6 @@
                 "rimraf": "^3.0.0",
                 "slash": "^3.0.0",
                 "strip-ansi": "^6.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                }
             }
         },
         "@jest/environment": {
@@ -564,6 +510,7 @@
             "version": "5.0.40",
             "resolved": "https://registry.npmjs.org/@types/bytebuffer/-/bytebuffer-5.0.40.tgz",
             "integrity": "sha512-h48dyzZrPMz25K6Q4+NCwWaxwXany2FhQg/ErOcdZS1ZpsaDnDMZg8JYLMTGz7uvXKrcKGJUZJlZObyfgdaN9g==",
+            "dev": true,
             "requires": {
                 "@types/long": "*",
                 "@types/node": "*"
@@ -575,6 +522,23 @@
             "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
             "dev": true
         },
+        "@types/events": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+            "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+            "dev": true
+        },
+        "@types/glob": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+            "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+            "dev": true,
+            "requires": {
+                "@types/events": "*",
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
         "@types/istanbul-lib-coverage": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
@@ -613,12 +577,30 @@
         "@types/long": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
-            "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
+            "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==",
+            "dev": true
+        },
+        "@types/minimatch": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+            "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+            "dev": true
         },
         "@types/node": {
-            "version": "13.7.6",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.6.tgz",
-            "integrity": "sha512-eyK7MWD0R1HqVTp+PtwRgFeIsemzuj4gBFSQxfPHY5iMjS7474e5wq+VFgTcdpyHeNxyKSaetYAjdMLJlKoWqA=="
+            "version": "13.7.7",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
+            "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
+            "dev": true
+        },
+        "@types/rimraf": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.3.tgz",
+            "integrity": "sha512-dZfyfL/u9l/oi984hEXdmAjX3JHry7TLWw43u1HQ8HhPv6KtfxnrZ3T/bleJ0GEvnk9t5sM7eePkgMqz3yBcGg==",
+            "dev": true,
+            "requires": {
+                "@types/glob": "*",
+                "@types/node": "*"
+            }
         },
         "@types/stack-utils": {
             "version": "1.0.1",
@@ -626,6 +608,12 @@
             "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
             "dev": true
         },
+        "@types/uuid": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.0.tgz",
+            "integrity": "sha512-RiX1I0lK9WFLFqy2xOxke396f0wKIzk5sAll0tL4J4XDYJXURI7JOs96XQb3nP+2gEpQ/LutBb66jgiT5oQshQ==",
+            "dev": true
+        },
         "@types/yargs": {
             "version": "15.0.4",
             "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
@@ -681,6 +669,7 @@
             "version": "6.12.0",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
             "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+            "dev": true,
             "requires": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
@@ -698,9 +687,10 @@
             }
         },
         "ansi-regex": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+            "dev": true
         },
         "ansi-styles": {
             "version": "4.2.1",
@@ -726,6 +716,7 @@
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
             "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
             "requires": {
                 "sprintf-js": "~1.0.2"
             }
@@ -764,6 +755,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
             "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+            "dev": true,
             "requires": {
                 "colour": "~0.7.1",
                 "optjs": "~3.2.2"
@@ -773,6 +765,7 @@
             "version": "0.2.4",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
             "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+            "dev": true,
             "requires": {
                 "safer-buffer": "~2.1.0"
             }
@@ -780,7 +773,8 @@
         "assert-plus": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-            "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+            "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+            "dev": true
         },
         "assign-symbols": {
             "version": "1.0.0",
@@ -797,12 +791,14 @@
         "async": {
             "version": "1.5.2",
             "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-            "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+            "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+            "dev": true
         },
         "asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+            "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+            "dev": true
         },
         "atob": {
             "version": "2.1.2",
@@ -813,12 +809,14 @@
         "aws-sign2": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-            "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+            "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+            "dev": true
         },
         "aws4": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-            "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
+            "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+            "dev": true
         },
         "babel-jest": {
             "version": "25.1.0",
@@ -871,7 +869,8 @@
         "balanced-match": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+            "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+            "dev": true
         },
         "base": {
             "version": "0.11.2",
@@ -932,6 +931,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
             "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+            "dev": true,
             "requires": {
                 "tweetnacl": "^0.14.3"
             }
@@ -940,6 +940,7 @@
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
             "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+            "dev": true,
             "requires": {
                 "readable-stream": "^2.3.5",
                 "safe-buffer": "^5.1.1"
@@ -948,12 +949,14 @@
         "bn.js": {
             "version": "4.11.8",
             "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-            "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+            "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+            "dev": true
         },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
             "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -971,7 +974,8 @@
         "brorand": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-            "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+            "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+            "dev": true
         },
         "browser-process-hrtime": {
             "version": "0.1.3",
@@ -982,7 +986,8 @@
         "browser-request": {
             "version": "0.3.3",
             "resolved": "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz",
-            "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc="
+            "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=",
+            "dev": true
         },
         "browser-resolve": {
             "version": "1.11.3",
@@ -1023,6 +1028,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
             "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+            "dev": true,
             "requires": {
                 "buffer-alloc-unsafe": "^1.1.0",
                 "buffer-fill": "^1.0.0"
@@ -1031,12 +1037,14 @@
         "buffer-alloc-unsafe": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-            "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+            "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+            "dev": true
         },
         "buffer-fill": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-            "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+            "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+            "dev": true
         },
         "buffer-from": {
             "version": "1.1.1",
@@ -1048,6 +1056,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
             "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+            "dev": true,
             "requires": {
                 "long": "~3"
             }
@@ -1072,7 +1081,8 @@
         "callsite": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-            "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
+            "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+            "dev": true
         },
         "callsites": {
             "version": "3.1.0",
@@ -1081,9 +1091,10 @@
             "dev": true
         },
         "camelcase": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-            "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "dev": true
         },
         "capture-exit": {
             "version": "2.0.0",
@@ -1097,7 +1108,8 @@
         "caseless": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+            "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+            "dev": true
         },
         "chalk": {
             "version": "3.0.0",
@@ -1139,19 +1151,21 @@
             }
         },
         "cliui": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-            "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+            "dev": true,
             "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wrap-ansi": "^2.0.0"
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^6.2.0"
             }
         },
         "cloudant-follow": {
             "version": "0.17.0",
             "resolved": "https://registry.npmjs.org/cloudant-follow/-/cloudant-follow-0.17.0.tgz",
             "integrity": "sha512-JQ1xvKAHh8rsnSVBjATLCjz/vQw1sWBGadxr2H69yFMwD7hShUGDwwEefdypaxroUJ/w6t1cSwilp/hRUxEW8w==",
+            "dev": true,
             "requires": {
                 "browser-request": "~0.3.0",
                 "debug": "^3.0.0",
@@ -1162,6 +1176,7 @@
                     "version": "3.2.6",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
                     "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+                    "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
@@ -1177,7 +1192,8 @@
         "code-point-at": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+            "dev": true
         },
         "collect-v8-coverage": {
             "version": "1.0.0",
@@ -1213,17 +1229,20 @@
         "colors": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-            "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
+            "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+            "dev": true
         },
         "colour": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-            "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
+            "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+            "dev": true
         },
         "combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
             "requires": {
                 "delayed-stream": "~1.0.0"
             }
@@ -1237,7 +1256,8 @@
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true
         },
         "convert-source-map": {
             "version": "1.7.0",
@@ -1246,14 +1266,6 @@
             "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.1"
-            },
-            "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                }
             }
         },
         "copy-descriptor": {
@@ -1265,7 +1277,8 @@
         "core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "dev": true
         },
         "cross-spawn": {
             "version": "6.0.5",
@@ -1306,12 +1319,14 @@
         "cycle": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
-            "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI="
+            "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+            "dev": true
         },
         "dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
             "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0"
             }
@@ -1328,24 +1343,19 @@
             }
         },
         "debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+            "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+            "dev": true,
             "requires": {
-                "ms": "2.0.0"
-            },
-            "dependencies": {
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-                }
+                "ms": "^2.1.1"
             }
         },
         "decamelize": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+            "dev": true
         },
         "decode-uri-component": {
             "version": "0.2.0",
@@ -1412,7 +1422,8 @@
         "delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+            "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+            "dev": true
         },
         "detect-newline": {
             "version": "3.1.0",
@@ -1439,6 +1450,7 @@
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
             "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+            "dev": true,
             "requires": {
                 "jsbn": "~0.1.0",
                 "safer-buffer": "^2.1.0"
@@ -1448,6 +1460,7 @@
             "version": "6.5.2",
             "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
             "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+            "dev": true,
             "requires": {
                 "bn.js": "^4.4.0",
                 "brorand": "^1.0.1",
@@ -1468,6 +1481,7 @@
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
             "requires": {
                 "once": "^1.4.0"
             }
@@ -1475,7 +1489,8 @@
         "errs": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/errs/-/errs-0.3.2.tgz",
-            "integrity": "sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk="
+            "integrity": "sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk=",
+            "dev": true
         },
         "es-abstract": {
             "version": "1.17.4",
@@ -1529,7 +1544,8 @@
         "esprima": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true
         },
         "estraverse": {
             "version": "4.3.0",
@@ -1585,6 +1601,15 @@
                 "to-regex": "^3.0.1"
             },
             "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -1602,6 +1627,12 @@
                     "requires": {
                         "is-extendable": "^0.1.0"
                     }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
                 }
             }
         },
@@ -1622,7 +1653,8 @@
         "extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+            "dev": true
         },
         "extend-shallow": {
             "version": "3.0.2",
@@ -1713,17 +1745,20 @@
         "extsprintf": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+            "dev": true
         },
         "eyes": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
-            "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A="
+            "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+            "dev": true
         },
         "fabric-ca-client": {
             "version": "1.4.7",
             "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-1.4.7.tgz",
             "integrity": "sha512-lGEGpZ+X6NXbvBhTHHDrcqxt9fikypUs0nK7Sq4ZNIo4S/7VdzhUHXgGycUUlD4iWfoAOQHdULVjnx1P570FTA==",
+            "dev": true,
             "requires": {
                 "grpc": "1.23.3",
                 "jsrsasign": "^7.2.2",
@@ -1735,6 +1770,7 @@
             "version": "1.4.7",
             "resolved": "https://registry.npmjs.org/fabric-client/-/fabric-client-1.4.7.tgz",
             "integrity": "sha512-29+W71fTdb6BsmejneUssE2mEZsWJCOrx72mPS5HJvqL6Z98FO7RqfRttn5IPj0LVV43NHd/s72Yv3++6AC9+w==",
+            "dev": true,
             "requires": {
                 "@types/bytebuffer": "^5.0.34",
                 "bn.js": "^4.11.3",
@@ -1760,21 +1796,11 @@
                 "winston": "^2.2.0"
             },
             "dependencies": {
-                "fabric-ca-client": {
-                    "version": "1.4.7",
-                    "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-1.4.7.tgz",
-                    "integrity": "sha512-lGEGpZ+X6NXbvBhTHHDrcqxt9fikypUs0nK7Sq4ZNIo4S/7VdzhUHXgGycUUlD4iWfoAOQHdULVjnx1P570FTA==",
-                    "requires": {
-                        "grpc": "1.23.3",
-                        "jsrsasign": "^7.2.2",
-                        "url": "^0.11.0",
-                        "util": "^0.10.3"
-                    }
-                },
                 "long": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-                    "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+                    "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+                    "dev": true
                 }
             }
         },
@@ -1782,6 +1808,7 @@
             "version": "1.4.7",
             "resolved": "https://registry.npmjs.org/fabric-network/-/fabric-network-1.4.7.tgz",
             "integrity": "sha512-Afl9z1vHVjgQNoGbwY3f9/qdONZFdMP2Khbs4n8Xzajqo506IhvOVEsJLizNKthRFZC416Lv3VJX5QKmgqQEnA==",
+            "dev": true,
             "requires": {
                 "fabric-ca-client": "^1.4.7",
                 "fabric-client": "^1.4.7",
@@ -1789,62 +1816,28 @@
                 "rimraf": "^2.6.2"
             },
             "dependencies": {
-                "fabric-ca-client": {
-                    "version": "1.4.7",
-                    "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-1.4.7.tgz",
-                    "integrity": "sha512-lGEGpZ+X6NXbvBhTHHDrcqxt9fikypUs0nK7Sq4ZNIo4S/7VdzhUHXgGycUUlD4iWfoAOQHdULVjnx1P570FTA==",
-                    "requires": {
-                        "grpc": "1.23.3",
-                        "jsrsasign": "^7.2.2",
-                        "url": "^0.11.0",
-                        "util": "^0.10.3"
-                    }
-                },
-                "fabric-client": {
-                    "version": "1.4.7",
-                    "resolved": "https://registry.npmjs.org/fabric-client/-/fabric-client-1.4.7.tgz",
-                    "integrity": "sha512-29+W71fTdb6BsmejneUssE2mEZsWJCOrx72mPS5HJvqL6Z98FO7RqfRttn5IPj0LVV43NHd/s72Yv3++6AC9+w==",
+                "rimraf": {
+                    "version": "2.7.1",
+                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+                    "dev": true,
                     "requires": {
-                        "@types/bytebuffer": "^5.0.34",
-                        "bn.js": "^4.11.3",
-                        "callsite": "^1.0.0",
-                        "elliptic": "^6.5.2",
-                        "fabric-ca-client": "^1.4.7",
-                        "fs-extra": "^8.1.0",
-                        "grpc": "1.23.3",
-                        "ignore-walk": "^3.0.0",
-                        "js-sha3": "^0.7.0",
-                        "js-yaml": "^3.9.0",
-                        "jsrsasign": "^7.2.2",
-                        "klaw": "^2.0.0",
-                        "long": "^4.0.0",
-                        "nano": "^6.4.4",
-                        "nconf": "^0.10.0",
-                        "pkcs11js": "^1.0.6",
-                        "promise-settle": "^0.3.0",
-                        "protobufjs": "5.0.3",
-                        "sjcl": "1.0.7",
-                        "tar-stream": "1.6.1",
-                        "url": "^0.11.0",
-                        "winston": "^2.2.0"
+                        "glob": "^7.1.3"
                     }
-                },
-                "long": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-                    "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
                 }
             }
         },
         "fast-deep-equal": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-            "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+            "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+            "dev": true
         },
         "fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true
         },
         "fast-levenshtein": {
             "version": "2.0.6",
@@ -1889,12 +1882,14 @@
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+            "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+            "dev": true
         },
         "form-data": {
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
             "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+            "dev": true,
             "requires": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.6",
@@ -1913,12 +1908,14 @@
         "fs-constants": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+            "dev": true
         },
         "fs-extra": {
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
             "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+            "dev": true,
             "requires": {
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^4.0.0",
@@ -1928,7 +1925,8 @@
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true
         },
         "fsevents": {
             "version": "2.1.2",
@@ -1974,6 +1972,7 @@
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
             "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0"
             }
@@ -1982,6 +1981,7 @@
             "version": "7.1.6",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
             "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+            "dev": true,
             "requires": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -2000,7 +2000,8 @@
         "graceful-fs": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-            "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+            "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+            "dev": true
         },
         "growly": {
             "version": "1.3.0",
@@ -2013,6 +2014,7 @@
             "version": "1.23.3",
             "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.23.3.tgz",
             "integrity": "sha512-7vdzxPw9s5UYch4aUn4hyM5tMaouaxUUkwkgJlwbR4AXMxiYZJOv19N2ps2eKiuUbJovo5fnGF9hg/X91gWYjw==",
+            "dev": true,
             "requires": {
                 "@types/bytebuffer": "^5.0.40",
                 "lodash.camelcase": "^4.3.0",
@@ -2024,19 +2026,23 @@
             "dependencies": {
                 "abbrev": {
                     "version": "1.1.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "ansi-regex": {
                     "version": "2.1.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "aproba": {
                     "version": "1.2.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "are-we-there-yet": {
                     "version": "1.1.5",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "delegates": "^1.0.0",
                         "readable-stream": "^2.0.6"
@@ -2044,11 +2050,13 @@
                 },
                 "balanced-match": {
                     "version": "1.0.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -2056,57 +2064,69 @@
                 },
                 "chownr": {
                     "version": "1.1.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "code-point-at": {
                     "version": "1.1.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "debug": {
                     "version": "3.2.6",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "ms": "^2.1.1"
                     }
                 },
                 "deep-extend": {
                     "version": "0.6.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "delegates": {
                     "version": "1.0.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "detect-libc": {
                     "version": "1.0.3",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "fs-minipass": {
                     "version": "1.2.6",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "minipass": "^2.2.1"
                     }
                 },
                 "fs.realpath": {
                     "version": "1.0.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "gauge": {
                     "version": "2.7.4",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "aproba": "^1.0.3",
                         "console-control-strings": "^1.0.0",
@@ -2121,6 +2141,7 @@
                 "glob": {
                     "version": "7.1.4",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "fs.realpath": "^1.0.0",
                         "inflight": "^1.0.4",
@@ -2132,11 +2153,13 @@
                 },
                 "has-unicode": {
                     "version": "2.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "iconv-lite": {
                     "version": "0.4.24",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "safer-buffer": ">= 2.1.2 < 3"
                     }
@@ -2144,6 +2167,7 @@
                 "ignore-walk": {
                     "version": "3.0.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "minimatch": "^3.0.4"
                     }
@@ -2151,6 +2175,7 @@
                 "inflight": {
                     "version": "1.0.6",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "once": "^1.3.0",
                         "wrappy": "1"
@@ -2158,37 +2183,44 @@
                 },
                 "inherits": {
                     "version": "2.0.4",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "ini": {
                     "version": "1.3.5",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "is-fullwidth-code-point": {
                     "version": "1.0.0",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
                 },
                 "isarray": {
                     "version": "1.0.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "minimatch": {
                     "version": "3.0.4",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
                 },
                 "minimist": {
                     "version": "1.2.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -2197,6 +2229,7 @@
                 "minizlib": {
                     "version": "1.2.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "minipass": "^2.2.1"
                     }
@@ -2204,23 +2237,27 @@
                 "mkdirp": {
                     "version": "0.5.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "minimist": "0.0.8"
                     },
                     "dependencies": {
                         "minimist": {
                             "version": "0.0.8",
-                            "bundled": true
+                            "bundled": true,
+                            "dev": true
                         }
                     }
                 },
                 "ms": {
                     "version": "2.1.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "needle": {
                     "version": "2.4.0",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "debug": "^3.2.6",
                         "iconv-lite": "^0.4.4",
@@ -2230,6 +2267,7 @@
                 "node-pre-gyp": {
                     "version": "0.13.0",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "detect-libc": "^1.0.2",
                         "mkdirp": "^0.5.1",
@@ -2246,6 +2284,7 @@
                 "nopt": {
                     "version": "4.0.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "abbrev": "1",
                         "osenv": "^0.1.4"
@@ -2253,11 +2292,13 @@
                 },
                 "npm-bundled": {
                     "version": "1.0.6",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "npm-packlist": {
                     "version": "1.4.4",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "ignore-walk": "^3.0.1",
                         "npm-bundled": "^1.0.1"
@@ -2266,6 +2307,7 @@
                 "npmlog": {
                     "version": "4.1.2",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "are-we-there-yet": "~1.1.2",
                         "console-control-strings": "~1.1.0",
@@ -2275,30 +2317,36 @@
                 },
                 "number-is-nan": {
                     "version": "1.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "once": {
                     "version": "1.4.0",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "wrappy": "1"
                     }
                 },
                 "os-homedir": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "os-tmpdir": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "osenv": {
                     "version": "0.1.5",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "os-homedir": "^1.0.0",
                         "os-tmpdir": "^1.0.0"
@@ -2306,15 +2354,18 @@
                 },
                 "path-is-absolute": {
                     "version": "1.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "process-nextick-args": {
                     "version": "2.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "rc": {
                     "version": "1.2.8",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "deep-extend": "^0.6.0",
                         "ini": "~1.3.0",
@@ -2325,6 +2376,7 @@
                 "readable-stream": {
                     "version": "2.3.6",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "core-util-is": "~1.0.0",
                         "inherits": "~2.0.3",
@@ -2338,37 +2390,45 @@
                 "rimraf": {
                     "version": "2.7.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "glob": "^7.1.3"
                     }
                 },
                 "safe-buffer": {
                     "version": "5.1.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "sax": {
                     "version": "1.2.4",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "semver": {
                     "version": "5.7.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "set-blocking": {
                     "version": "2.0.0",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "signal-exit": {
                     "version": "3.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "string-width": {
                     "version": "1.0.2",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -2378,6 +2438,7 @@
                 "string_decoder": {
                     "version": "1.1.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "safe-buffer": "~5.1.0"
                     }
@@ -2385,17 +2446,20 @@
                 "strip-ansi": {
                     "version": "3.0.1",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
                 },
                 "strip-json-comments": {
                     "version": "2.0.1",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "tar": {
                     "version": "4.4.10",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "chownr": "^1.1.1",
                         "fs-minipass": "^1.2.5",
@@ -2408,34 +2472,40 @@
                 },
                 "util-deprecate": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "wide-align": {
                     "version": "1.1.3",
                     "bundled": true,
+                    "dev": true,
                     "requires": {
                         "string-width": "^1.0.2 || 2"
                     }
                 },
                 "wrappy": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 },
                 "yallist": {
                     "version": "3.0.3",
-                    "bundled": true
+                    "bundled": true,
+                    "dev": true
                 }
             }
         },
         "har-schema": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-            "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+            "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+            "dev": true
         },
         "har-validator": {
             "version": "5.1.3",
             "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
             "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+            "dev": true,
             "requires": {
                 "ajv": "^6.5.5",
                 "har-schema": "^2.0.0"
@@ -2518,6 +2588,7 @@
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
             "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+            "dev": true,
             "requires": {
                 "inherits": "^2.0.3",
                 "minimalistic-assert": "^1.0.1"
@@ -2527,6 +2598,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
             "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+            "dev": true,
             "requires": {
                 "hash.js": "^1.0.3",
                 "minimalistic-assert": "^1.0.0",
@@ -2552,6 +2624,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
             "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0",
                 "jsprim": "^1.2.2",
@@ -2577,6 +2650,7 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
             "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+            "dev": true,
             "requires": {
                 "minimatch": "^3.0.4"
             }
@@ -2601,6 +2675,7 @@
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "dev": true,
             "requires": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -2609,17 +2684,20 @@
         "inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
         },
         "ini": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+            "dev": true
         },
         "invert-kv": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-            "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+            "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+            "dev": true
         },
         "ip-regex": {
             "version": "2.1.0",
@@ -2720,12 +2798,10 @@
             "dev": true
         },
         "is-fullwidth-code-point": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-            "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-            "requires": {
-                "number-is-nan": "^1.0.0"
-            }
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true
         },
         "is-generator-fn": {
             "version": "2.1.0",
@@ -2775,7 +2851,8 @@
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+            "dev": true
         },
         "is-windows": {
             "version": "1.0.2",
@@ -2793,7 +2870,8 @@
         "isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+            "dev": true
         },
         "isexe": {
             "version": "2.0.0",
@@ -2810,7 +2888,8 @@
         "isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+            "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+            "dev": true
         },
         "istanbul-lib-coverage": {
             "version": "3.0.0",
@@ -2861,17 +2940,6 @@
                 "debug": "^4.1.1",
                 "istanbul-lib-coverage": "^3.0.0",
                 "source-map": "^0.6.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-                    "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
             }
         },
         "istanbul-reports": {
@@ -2895,29 +2963,6 @@
                 "jest-cli": "^25.1.0"
             },
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.0",
-                        "wrap-ansi": "^6.2.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                    "dev": true
-                },
                 "jest-cli": {
                     "version": "25.1.0",
                     "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.1.0.tgz",
@@ -2938,62 +2983,6 @@
                         "realpath-native": "^1.1.0",
                         "yargs": "^15.0.0"
                     }
-                },
-                "string-width": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-                    "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "15.1.0",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-                    "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^6.0.0",
-                        "decamelize": "^1.2.0",
-                        "find-up": "^4.1.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^4.2.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^16.1.0"
-                    }
                 }
             }
         },
@@ -3376,87 +3365,6 @@
                 "slash": "^3.0.0",
                 "strip-bom": "^4.0.0",
                 "yargs": "^15.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.0",
-                        "wrap-ansi": "^6.2.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-                    "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "4.2.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-                    "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^8.0.0",
-                        "is-fullwidth-code-point": "^3.0.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-                    "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.0"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "15.1.0",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-                    "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^6.0.0",
-                        "decamelize": "^1.2.0",
-                        "find-up": "^4.1.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^4.2.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^16.1.0"
-                    }
-                }
             }
         },
         "jest-serializer": {
@@ -3518,14 +3426,6 @@
                 "jest-get-type": "^25.1.0",
                 "leven": "^3.1.0",
                 "pretty-format": "^25.1.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                }
             }
         },
         "jest-watcher": {
@@ -3555,7 +3455,8 @@
         "js-sha3": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.7.0.tgz",
-            "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA=="
+            "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA==",
+            "dev": true
         },
         "js-tokens": {
             "version": "4.0.0",
@@ -3567,6 +3468,7 @@
             "version": "3.13.1",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
             "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+            "dev": true,
             "requires": {
                 "argparse": "^1.0.7",
                 "esprima": "^4.0.0"
@@ -3575,7 +3477,8 @@
         "jsbn": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-            "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+            "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+            "dev": true
         },
         "jsdom": {
             "version": "15.2.1",
@@ -3609,25 +3512,6 @@
                 "whatwg-url": "^7.0.0",
                 "ws": "^7.0.0",
                 "xml-name-validator": "^3.0.0"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-                    "dev": true
-                },
-                "tough-cookie": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-                    "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-                    "dev": true,
-                    "requires": {
-                        "ip-regex": "^2.1.0",
-                        "psl": "^1.1.28",
-                        "punycode": "^2.1.1"
-                    }
-                }
             }
         },
         "jsesc": {
@@ -3639,17 +3523,20 @@
         "json-schema": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+            "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+            "dev": true
         },
         "json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true
         },
         "json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+            "dev": true
         },
         "json5": {
             "version": "2.1.1",
@@ -3672,6 +3559,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
             "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+            "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.6"
             }
@@ -3680,6 +3568,7 @@
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
             "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+            "dev": true,
             "requires": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
@@ -3690,7 +3579,8 @@
         "jsrsasign": {
             "version": "7.2.2",
             "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-7.2.2.tgz",
-            "integrity": "sha1-rlIwy1V0RRu5eanMaXQoxg9ZjSA="
+            "integrity": "sha1-rlIwy1V0RRu5eanMaXQoxg9ZjSA=",
+            "dev": true
         },
         "kind-of": {
             "version": "6.0.3",
@@ -3702,6 +3592,7 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz",
             "integrity": "sha1-QrdolHARacyRD9DRnOZ3tfs3ivE=",
+            "dev": true,
             "requires": {
                 "graceful-fs": "^4.1.9"
             }
@@ -3716,6 +3607,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
             "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+            "dev": true,
             "requires": {
                 "invert-kv": "^1.0.0"
             }
@@ -3754,17 +3646,20 @@
         "lodash.camelcase": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-            "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+            "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+            "dev": true
         },
         "lodash.clone": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-            "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
+            "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
+            "dev": true
         },
         "lodash.isempty": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-            "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4="
+            "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=",
+            "dev": true
         },
         "lodash.memoize": {
             "version": "4.1.2",
@@ -3790,7 +3685,8 @@
         "long": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-            "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
+            "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+            "dev": true
         },
         "make-dir": {
             "version": "3.0.2",
@@ -3858,12 +3754,14 @@
         "mime-db": {
             "version": "1.43.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-            "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
+            "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
+            "dev": true
         },
         "mime-types": {
             "version": "2.1.26",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
             "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
+            "dev": true,
             "requires": {
                 "mime-db": "1.43.0"
             }
@@ -3877,17 +3775,20 @@
         "minimalistic-assert": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true
         },
         "minimalistic-crypto-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-            "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+            "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+            "dev": true
         },
         "minimatch": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
             "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "dev": true,
             "requires": {
                 "brace-expansion": "^1.1.7"
             }
@@ -3931,23 +3832,43 @@
         "ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
         },
         "nan": {
             "version": "2.14.0",
             "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-            "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+            "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+            "dev": true
         },
         "nano": {
             "version": "6.4.4",
             "resolved": "https://registry.npmjs.org/nano/-/nano-6.4.4.tgz",
             "integrity": "sha512-7sldMrZI1ZH8QE29PnzohxLfR67WNVzMKLa7EMl3x9Hr+0G+YpOUCq50qZ9G66APrjcb0Of2BTOZLNBCutZGag==",
+            "dev": true,
             "requires": {
                 "cloudant-follow": "~0.17.0",
                 "debug": "^2.2.0",
                 "errs": "^0.3.2",
                 "lodash.isempty": "^4.4.0",
                 "request": "^2.85.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
+                }
             }
         },
         "nanomatch": {
@@ -3979,11 +3900,97 @@
             "version": "0.10.0",
             "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz",
             "integrity": "sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==",
+            "dev": true,
             "requires": {
                 "async": "^1.4.0",
                 "ini": "^1.3.0",
                 "secure-keys": "^1.0.0",
                 "yargs": "^3.19.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "camelcase": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+                    "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+                    "dev": true
+                },
+                "cliui": {
+                    "version": "3.2.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+                    "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^1.0.1",
+                        "strip-ansi": "^3.0.1",
+                        "wrap-ansi": "^2.0.0"
+                    }
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                    "dev": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                    "dev": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                },
+                "wrap-ansi": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+                    "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^1.0.1",
+                        "strip-ansi": "^3.0.1"
+                    }
+                },
+                "y18n": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+                    "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+                    "dev": true
+                },
+                "yargs": {
+                    "version": "3.32.0",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+                    "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^2.0.1",
+                        "cliui": "^3.0.3",
+                        "decamelize": "^1.1.1",
+                        "os-locale": "^1.4.0",
+                        "string-width": "^1.0.1",
+                        "window-size": "^0.1.4",
+                        "y18n": "^3.2.0"
+                    }
+                }
             }
         },
         "nice-try": {
@@ -4045,7 +4052,8 @@
         "number-is-nan": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+            "dev": true
         },
         "nwsapi": {
             "version": "2.2.0",
@@ -4056,7 +4064,8 @@
         "oauth-sign": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+            "dev": true
         },
         "object-copy": {
             "version": "0.1.0",
@@ -4145,6 +4154,7 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
             "requires": {
                 "wrappy": "1"
             }
@@ -4175,12 +4185,14 @@
         "optjs": {
             "version": "3.2.2",
             "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
-            "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4="
+            "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
+            "dev": true
         },
         "os-locale": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
             "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+            "dev": true,
             "requires": {
                 "lcid": "^1.0.0"
             }
@@ -4242,7 +4254,8 @@
         "path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true
         },
         "path-key": {
             "version": "2.0.1",
@@ -4259,7 +4272,8 @@
         "performance-now": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+            "dev": true
         },
         "picomatch": {
             "version": "2.2.1",
@@ -4280,6 +4294,7 @@
             "version": "1.0.19",
             "resolved": "https://registry.npmjs.org/pkcs11js/-/pkcs11js-1.0.19.tgz",
             "integrity": "sha512-BThNeWreqDXbMAZOTtG8PodY4WAS0HNHsXtsVbDBX4L4C58AvxIIXjjZrsBadXUagbjTllmZwsZHkebVUTpwcA==",
+            "dev": true,
             "optional": true,
             "requires": {
                 "nan": "^2.14.0"
@@ -4322,25 +4337,19 @@
                 "ansi-regex": "^5.0.0",
                 "ansi-styles": "^4.0.0",
                 "react-is": "^16.12.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-                    "dev": true
-                }
             }
         },
         "process-nextick-args": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
         },
         "promise-settle": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/promise-settle/-/promise-settle-0.3.0.tgz",
-            "integrity": "sha1-tO/VcqHrdM95T4KM00naQKCOTpY="
+            "integrity": "sha1-tO/VcqHrdM95T4KM00naQKCOTpY=",
+            "dev": true
         },
         "prompts": {
             "version": "2.3.1",
@@ -4356,17 +4365,104 @@
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz",
             "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==",
+            "dev": true,
             "requires": {
                 "ascli": "~1",
                 "bytebuffer": "~5",
                 "glob": "^7.0.5",
                 "yargs": "^3.10.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                    "dev": true
+                },
+                "camelcase": {
+                    "version": "2.1.1",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+                    "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+                    "dev": true
+                },
+                "cliui": {
+                    "version": "3.2.0",
+                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+                    "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^1.0.1",
+                        "strip-ansi": "^3.0.1",
+                        "wrap-ansi": "^2.0.0"
+                    }
+                },
+                "is-fullwidth-code-point": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+                    "dev": true,
+                    "requires": {
+                        "number-is-nan": "^1.0.0"
+                    }
+                },
+                "string-width": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                    "dev": true,
+                    "requires": {
+                        "code-point-at": "^1.0.0",
+                        "is-fullwidth-code-point": "^1.0.0",
+                        "strip-ansi": "^3.0.0"
+                    }
+                },
+                "strip-ansi": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^2.0.0"
+                    }
+                },
+                "wrap-ansi": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+                    "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+                    "dev": true,
+                    "requires": {
+                        "string-width": "^1.0.1",
+                        "strip-ansi": "^3.0.1"
+                    }
+                },
+                "y18n": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+                    "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+                    "dev": true
+                },
+                "yargs": {
+                    "version": "3.32.0",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+                    "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^2.0.1",
+                        "cliui": "^3.0.3",
+                        "decamelize": "^1.1.1",
+                        "os-locale": "^1.4.0",
+                        "string-width": "^1.0.1",
+                        "window-size": "^0.1.4",
+                        "y18n": "^3.2.0"
+                    }
+                }
             }
         },
         "psl": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-            "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="
+            "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+            "dev": true
         },
         "pump": {
             "version": "3.0.0",
@@ -4379,19 +4475,22 @@
             }
         },
         "punycode": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-            "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+            "dev": true
         },
         "qs": {
             "version": "6.5.2",
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+            "dev": true
         },
         "querystring": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+            "dev": true
         },
         "react-is": {
             "version": "16.13.0",
@@ -4403,6 +4502,7 @@
             "version": "2.3.7",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
             "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+            "dev": true,
             "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -4411,13 +4511,6 @@
                 "safe-buffer": "~5.1.1",
                 "string_decoder": "~1.1.1",
                 "util-deprecate": "~1.0.1"
-            },
-            "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                }
             }
         },
         "realpath-native": {
@@ -4461,6 +4554,7 @@
             "version": "2.88.2",
             "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
             "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+            "dev": true,
             "requires": {
                 "aws-sign2": "~0.7.0",
                 "aws4": "^1.8.0",
@@ -4482,6 +4576,24 @@
                 "tough-cookie": "~2.5.0",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^3.3.2"
+            },
+            "dependencies": {
+                "tough-cookie": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+                    "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+                    "dev": true,
+                    "requires": {
+                        "psl": "^1.1.28",
+                        "punycode": "^2.1.1"
+                    }
+                },
+                "uuid": {
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+                    "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+                    "dev": true
+                }
             }
         },
         "request-promise-core": {
@@ -4502,6 +4614,18 @@
                 "request-promise-core": "1.1.3",
                 "stealthy-require": "^1.1.1",
                 "tough-cookie": "^2.3.3"
+            },
+            "dependencies": {
+                "tough-cookie": {
+                    "version": "2.5.0",
+                    "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+                    "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+                    "dev": true,
+                    "requires": {
+                        "psl": "^1.1.28",
+                        "punycode": "^2.1.1"
+                    }
+                }
             }
         },
         "require-directory": {
@@ -4553,9 +4677,10 @@
             "dev": true
         },
         "rimraf": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
             "requires": {
                 "glob": "^7.1.3"
             }
@@ -4567,9 +4692,10 @@
             "dev": true
         },
         "safe-buffer": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-            "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
         },
         "safe-regex": {
             "version": "1.1.0",
@@ -4583,7 +4709,8 @@
         "safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
         },
         "sane": {
             "version": "4.1.0",
@@ -4744,7 +4871,8 @@
         "secure-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz",
-            "integrity": "sha1-8MgtmKOxOah3aogIBQuCRDEIf8o="
+            "integrity": "sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=",
+            "dev": true
         },
         "semver": {
             "version": "5.7.1",
@@ -4818,7 +4946,8 @@
         "sjcl": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.7.tgz",
-            "integrity": "sha1-MrNlpQ3Ju6JriLo8nfjqNCF9n0U="
+            "integrity": "sha1-MrNlpQ3Ju6JriLo8nfjqNCF9n0U=",
+            "dev": true
         },
         "slash": {
             "version": "3.0.0",
@@ -4842,6 +4971,15 @@
                 "use": "^3.1.0"
             },
             "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
                 "define-property": {
                     "version": "0.2.5",
                     "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -4860,6 +4998,12 @@
                         "is-extendable": "^0.1.0"
                     }
                 },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "dev": true
+                },
                 "source-map": {
                     "version": "0.5.7",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -4986,12 +5130,14 @@
         "sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+            "dev": true
         },
         "sshpk": {
             "version": "1.16.1",
             "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
             "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+            "dev": true,
             "requires": {
                 "asn1": "~0.2.3",
                 "assert-plus": "^1.0.0",
@@ -5007,7 +5153,8 @@
         "stack-trace": {
             "version": "0.0.10",
             "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
+            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+            "dev": true
         },
         "stack-utils": {
             "version": "1.0.2",
@@ -5070,13 +5217,14 @@
             }
         },
         "string-width": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-            "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+            "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+            "dev": true,
             "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.0"
             }
         },
         "string.prototype.trimleft": {
@@ -5103,23 +5251,18 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
             "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.0"
-            },
-            "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                }
             }
         },
         "strip-ansi": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "dev": true,
             "requires": {
-                "ansi-regex": "^2.0.0"
+                "ansi-regex": "^5.0.0"
             }
         },
         "strip-bom": {
@@ -5169,6 +5312,7 @@
             "version": "1.6.1",
             "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz",
             "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==",
+            "dev": true,
             "requires": {
                 "bl": "^1.0.0",
                 "buffer-alloc": "^1.1.0",
@@ -5215,7 +5359,8 @@
         "to-buffer": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-            "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
+            "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+            "dev": true
         },
         "to-fast-properties": {
             "version": "2.0.0",
@@ -5265,19 +5410,14 @@
             }
         },
         "tough-cookie": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+            "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+            "dev": true,
             "requires": {
+                "ip-regex": "^2.1.0",
                 "psl": "^1.1.28",
                 "punycode": "^2.1.1"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-                }
             }
         },
         "tr46": {
@@ -5287,14 +5427,6 @@
             "dev": true,
             "requires": {
                 "punycode": "^2.1.0"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-                    "dev": true
-                }
             }
         },
         "ts-jest": {
@@ -5319,6 +5451,7 @@
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
             "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+            "dev": true,
             "requires": {
                 "safe-buffer": "^5.0.1"
             }
@@ -5326,7 +5459,8 @@
         "tweetnacl": {
             "version": "0.14.5",
             "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-            "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+            "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+            "dev": true
         },
         "type-check": {
             "version": "0.3.2",
@@ -5359,9 +5493,9 @@
             }
         },
         "typescript": {
-            "version": "3.8.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz",
-            "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
+            "version": "3.8.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+            "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
             "dev": true
         },
         "union-value": {
@@ -5379,7 +5513,8 @@
         "universalify": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+            "dev": true
         },
         "unset-value": {
             "version": "1.0.0",
@@ -5425,15 +5560,9 @@
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
             "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+            "dev": true,
             "requires": {
                 "punycode": "^2.1.0"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-                    "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-                }
             }
         },
         "urix": {
@@ -5446,9 +5575,18 @@
             "version": "0.11.0",
             "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
             "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+            "dev": true,
             "requires": {
                 "punycode": "1.3.2",
                 "querystring": "0.2.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "1.3.2",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+                    "dev": true
+                }
             }
         },
         "use": {
@@ -5461,6 +5599,7 @@
             "version": "0.10.4",
             "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
             "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+            "dev": true,
             "requires": {
                 "inherits": "2.0.3"
             },
@@ -5468,14 +5607,16 @@
                 "inherits": {
                     "version": "2.0.3",
                     "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                    "dev": true
                 }
             }
         },
         "util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+            "dev": true
         },
         "util.promisify": {
             "version": "1.0.1",
@@ -5490,9 +5631,9 @@
             }
         },
         "uuid": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.1.tgz",
+            "integrity": "sha512-yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="
         },
         "v8-to-istanbul": {
             "version": "4.1.2",
@@ -5517,6 +5658,7 @@
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
             "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+            "dev": true,
             "requires": {
                 "assert-plus": "^1.0.0",
                 "core-util-is": "1.0.2",
@@ -5602,12 +5744,14 @@
         "window-size": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-            "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
+            "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+            "dev": true
         },
         "winston": {
             "version": "2.4.4",
             "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz",
             "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==",
+            "dev": true,
             "requires": {
                 "async": "~1.0.0",
                 "colors": "1.0.x",
@@ -5620,7 +5764,8 @@
                 "async": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-                    "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
+                    "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+                    "dev": true
                 }
             }
         },
@@ -5631,18 +5776,21 @@
             "dev": true
         },
         "wrap-ansi": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-            "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+            "dev": true,
             "requires": {
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1"
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
             }
         },
         "wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true
         },
         "write-file-atomic": {
             "version": "3.0.3",
@@ -5677,25 +5825,32 @@
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true
         },
         "y18n": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-            "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+            "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+            "dev": true
         },
         "yargs": {
-            "version": "3.32.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-            "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+            "version": "15.1.0",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
+            "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+            "dev": true,
             "requires": {
-                "camelcase": "^2.0.1",
-                "cliui": "^3.0.3",
-                "decamelize": "^1.1.1",
-                "os-locale": "^1.4.0",
-                "string-width": "^1.0.1",
-                "window-size": "^0.1.4",
-                "y18n": "^3.2.0"
+                "cliui": "^6.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^4.1.0",
+                "get-caller-file": "^2.0.1",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^2.0.0",
+                "set-blocking": "^2.0.0",
+                "string-width": "^4.2.0",
+                "which-module": "^2.0.0",
+                "y18n": "^4.0.0",
+                "yargs-parser": "^16.1.0"
             }
         },
         "yargs-parser": {
@@ -5706,14 +5861,6 @@
             "requires": {
                 "camelcase": "^5.0.0",
                 "decamelize": "^1.2.0"
-            },
-            "dependencies": {
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                }
             }
         }
     }
diff --git a/package.json b/package.json
index f3da986..18ce356 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
     "name": "fabric-wallet-migration",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Migration from Hyperledger Fabric 1.4 to 2.0 wallets",
     "main": "index.js",
     "types": "index.d.ts",
     "scripts": {
         "clean": "rm -rf dist",
         "compile": "tsc --project .",
+        "prepack": "npm run clean && npm run compile && npm test",
         "test": "jest test"
     },
     "repository": {
@@ -24,13 +25,15 @@
     "homepage": "https://github.com/bestbeforetoday/fabric-wallet-migration#readme",
     "devDependencies": {
         "@types/jest": "^25.1.3",
+        "@types/rimraf": "^2.0.3",
+        "@types/uuid": "^7.0.0",
+        "fabric-network": "^1.4.7",
         "jest": "^25.1.0",
+        "rimraf": "^3.0.2",
         "ts-jest": "^25.2.1",
         "typescript": "^3.8.2"
     },
     "dependencies": {
-        "fabric-ca-client": "1.4.7",
-        "fabric-client": "1.4.7",
-        "fabric-network": "1.4.7"
+        "uuid": "^7.0.1"
     }
 }
diff --git a/src/FileSystemWalletStoreV1.ts b/src/FileSystemWalletStoreV1.ts
new file mode 100644
index 0000000..4293fec
--- /dev/null
+++ b/src/FileSystemWalletStoreV1.ts
@@ -0,0 +1,122 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { User } from "./User";
+import { IdentityConverter } from "./IdentityConverter";
+import { IdentityData } from "./IdentityData";
+
+import path = require("path");
+import fs = require("fs");
+import util = require("util");
+import _rimraf = require("rimraf");
+const rimraf = util.promisify(_rimraf);
+
+const encoding = "utf8";
+const privateKeyExtension = "-priv";
+
+export class FileSystemWalletStoreV1 {
+    private readonly directory: string;
+    private readonly converter = new IdentityConverter();
+
+    constructor(directory: string) {
+        this.directory = directory;
+    }
+
+	async get(label: string): Promise<Buffer | undefined> {
+        try {
+            const user = await this.getUser(label);
+            const privateKey = await this.getPrivateKey(user);
+            const storeData = this.converter.userToStoreData(user, privateKey);
+            const json = JSON.stringify(storeData);
+            return Buffer.from(json, encoding);
+        } catch (error) {
+            return undefined;
+        }
+    }
+
+	async list(): Promise<string[]> {
+        const dirEntries = await fs.promises.readdir(this.directory, { withFileTypes: true });
+        const labels = dirEntries
+            .filter((dirEntry) => dirEntry.isDirectory())
+            .map((dirEntry) => dirEntry.name);
+
+        const results: string[] = [];
+        for (const label of labels) {
+            try {
+                await this.getUser(label);
+                results.push(label);
+            } catch (error) {
+                // Not a valid user
+            }
+        }
+
+        return results;
+    }
+
+	async put(label: string, data: Buffer): Promise<void> {
+        const json = data.toString(encoding);
+        const storeData = JSON.parse(json) as IdentityData;
+        const { user, privateKey } = this.converter.storeDataToUser(storeData, label);
+
+        await this.createIdentityDir(label);
+        await this.writeUser(user, label);
+        if (privateKey) {
+            await this.writePrivateKey(user, privateKey);
+        }
+    }
+
+	async remove(label: string): Promise<void> {
+        const identityDir = this.getIdentityDir(label);
+        await rimraf(identityDir);
+    }
+
+    private async getUser(label: string): Promise<User> {
+        const userPath = this.getUserPath(label);
+        const userData = await fs.promises.readFile(userPath);
+        return JSON.parse(userData.toString(encoding));
+    }
+
+    private getUserPath(label: string) {
+        const identityDir = this.getIdentityDir(label);
+        return path.join(identityDir, label);
+    }
+
+    private getIdentityDir(label: string) {
+        return path.join(this.directory, label);
+    }
+
+    private async getPrivateKey(user: User) {
+        const keyPath = this.getPrivateKeyPath(user);
+        try {
+            const keyData = await fs.promises.readFile(keyPath);
+            return keyData.toString(encoding).trim();
+        } catch (error) {
+            // No private key
+            return undefined;
+        }
+    }
+
+    private getPrivateKeyPath(user: User) {
+        const identityDir = this.getIdentityDir(user.name);
+        const file = user.enrollment.signingIdentity + privateKeyExtension;
+        return path.join(identityDir, file);
+    }
+
+    private async createIdentityDir(label: string) {
+        const identityDir = this.getIdentityDir(label);
+        await fs.promises.mkdir(identityDir);
+    }
+
+    private async writeUser(user: User, label: string) {
+        const userJson = JSON.stringify(user);
+        const userData = Buffer.from(userJson);
+        const userPath = this.getUserPath(label);
+        await fs.promises.writeFile(userPath, userData);
+    }
+
+    private async writePrivateKey(user: User, privateKey: string) {
+        const privateKeyPath = this.getPrivateKeyPath(user);
+        await fs.promises.writeFile(privateKeyPath, privateKey);
+    }
+}
\ No newline at end of file
diff --git a/src/IdentityConverter.ts b/src/IdentityConverter.ts
index a9df101..9ae8017 100644
--- a/src/IdentityConverter.ts
+++ b/src/IdentityConverter.ts
@@ -2,12 +2,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Identity } from "fabric-network";
+import { User } from "./User";
 import { IdentityData } from "./IdentityData";
 
-export interface IdentityConverter {
-    readonly identityType: string;
-    readonly storeDataType: string;
-    identityToStoreData(identity: Identity): IdentityData;
-    storeDataToIdentity(storeData: IdentityData): Identity;
-}
\ No newline at end of file
+import uuid = require("uuid");
+
+const hsmType = "HSM-X.509";
+const x509Type = "X.509";
+
+export class IdentityConverter implements IdentityConverter {
+    userToStoreData(user: User, privateKey?: string): IdentityData {
+        return {
+            type: privateKey ? x509Type : hsmType,
+            version: 1,
+            mspId: user.mspid,
+            credentials: {
+                certificate: user.enrollment.identity.certificate,
+                privateKey
+            }
+        };
+    }
+    
+    storeDataToUser(storeData: IdentityData, label: string) {
+        if (storeData.type !== x509Type) {
+            throw new Error("Invalid identity type: " + storeData.type);
+        }
+
+        const user: User = {
+            name: label,
+            mspid: storeData.mspId,
+            enrollment: {
+                identity: {
+                    certificate: storeData.credentials.certificate,
+                },
+                signingIdentity: uuid.v4().replace("-", "")
+            }
+        };
+        const privateKey = storeData.credentials.privateKey;
+
+        return { user, privateKey };
+    }
+}
diff --git a/src/IdentityData.d.ts b/src/IdentityData.d.ts
new file mode 100644
index 0000000..6ccea31
--- /dev/null
+++ b/src/IdentityData.d.ts
@@ -0,0 +1,13 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface IdentityData {
+	type: "X.509" | "HSM-X.509";
+	version: 1;
+	credentials: {
+		certificate: string;
+		privateKey?: string;
+	};
+	mspId: string;
+}
diff --git a/src/IdentityData.ts b/src/IdentityData.ts
deleted file mode 100644
index cffa87e..0000000
--- a/src/IdentityData.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export interface IdentityData {
-	readonly type: string;
-	readonly version: number;
-}
-
-export interface X509IdentityData extends IdentityData {
-	type: 'X.509';
-	version: 1;
-	credentials: {
-		certificate: string;
-		privateKey: string;
-	};
-	mspId: string;
-}
-
-export interface HsmX509IdentityData extends IdentityData {
-	type: 'HSM-X.509';
-	version: 1;
-	credentials: {
-		certificate: string;
-	};
-	mspId: string;
-}
diff --git a/src/User.d.ts b/src/User.d.ts
new file mode 100644
index 0000000..da50ee9
--- /dev/null
+++ b/src/User.d.ts
@@ -0,0 +1,16 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface User {
+	name: string;
+	mspid: string;
+	enrollment: Enrollment;
+}
+
+export interface Enrollment {
+	identity: {
+		certificate: string;
+	};
+	signingIdentity: string;
+}
diff --git a/src/WalletStoreAdapter.ts b/src/WalletStoreAdapter.ts
deleted file mode 100644
index 200717a..0000000
--- a/src/WalletStoreAdapter.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Wallet } from "fabric-network";
-import { X509IdentityConverter } from "./X509IdentityConverter";
-import { IdentityData } from "./IdentityData";
-
-export class WalletStoreAdapter {
-    private readonly wallet: Wallet;
-    private readonly converter = new X509IdentityConverter();
-
-    constructor(wallet: Wallet) {
-        this.wallet = wallet;
-    }
-
-	async get(label: string): Promise<Buffer | undefined> {
-        const identity = await this.wallet.export(label);
-        if (!identity) {
-            return undefined;
-        }
-        
-        const storeData = this.converter.identityToStoreData(identity);
-        const json = JSON.stringify(storeData);
-        return Buffer.from(json, "utf8");
-    }
-
-	async list(): Promise<string[]> {
-        const infos = await this.wallet.list();
-        return infos.map((info) => info.label);
-    }
-
-	async put(label: string, data: Buffer): Promise<void> {
-        const json = data.toString("utf8");
-        const storeData = JSON.parse(json) as IdentityData;
-        const identity = this.converter.storeDataToIdentity(storeData);
-        await this.wallet.import(label, identity);
-    }
-
-	async remove(label: string): Promise<void> {
-        await this.wallet.delete(label);
-    }
-}
\ No newline at end of file
diff --git a/src/WalletStores.ts b/src/WalletStores.ts
index ecfa5a8..c5b968f 100644
--- a/src/WalletStores.ts
+++ b/src/WalletStores.ts
@@ -2,10 +2,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { FileSystemWallet } from "fabric-network";
-import { WalletStoreAdapter } from "./WalletStoreAdapter";
+import { FileSystemWalletStoreV1 } from "./FileSystemWalletStoreV1";
 
 export function newFileSystemWalletStore(directory: string) {
-    const wallet = new FileSystemWallet(directory);
-    return new WalletStoreAdapter(wallet);
+    return new FileSystemWalletStoreV1(directory);
 }
diff --git a/src/X509IdentityConverter.ts b/src/X509IdentityConverter.ts
deleted file mode 100644
index 30c9dfc..0000000
--- a/src/X509IdentityConverter.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Identity } from "fabric-network";
-import { IdentityConverter } from "./IdentityConverter";
-import { IdentityData, X509IdentityData } from "./IdentityData";
-
-export class X509IdentityConverter implements IdentityConverter {
-    readonly identityType = "X509";
-    readonly storeDataType = "X.509";
-
-    identityToStoreData(identity: Identity): X509IdentityData {
-        if (identity.type !== this.identityType) {
-            throw new Error("Invalid identity type: " + identity.type);
-        }
-
-        const x509Identity: any = identity;
-
-        return {
-            type: this.storeDataType,
-            version: 1,
-            mspId: x509Identity.mspId,
-            credentials: {
-                certificate: x509Identity.certificate,
-                privateKey: x509Identity.privateKey
-            }
-        };
-    }
-    
-    storeDataToIdentity(storeData: IdentityData): Identity {
-        if (storeData.type !== this.storeDataType) {
-            throw new Error("Invalid identity type: " + storeData.type);
-        }
-
-        const x509StoreData = storeData as X509IdentityData;
-
-        return {
-            type: this.identityType,
-            mspId: x509StoreData.mspId,
-            certificate: x509StoreData.credentials.certificate,
-            privateKey: x509StoreData.credentials.privateKey
-        } as Identity;
-    }
-}
diff --git a/test/FileSystemWalletStoreV1.spec.ts b/test/FileSystemWalletStoreV1.spec.ts
new file mode 100644
index 0000000..7b9d7b1
--- /dev/null
+++ b/test/FileSystemWalletStoreV1.spec.ts
@@ -0,0 +1,201 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { X509WalletMixin, Identity, Wallet, FileSystemWallet } from "fabric-network";
+
+import { FileSystemWalletStoreV1 } from "../src/FileSystemWalletStoreV1";
+import { IdentityData } from "../src/IdentityData";
+
+import fs = require("fs");
+import util = require("util");
+import path = require("path");
+import os = require("os");
+import _rimraf = require("rimraf");
+const rimraf = util.promisify(_rimraf);
+
+const certificateFile = "certificate.pem";
+const privateKeyFile = "privateKey.pem";
+
+function bufferToObject(buffer: Buffer): IdentityData {
+    const jsonObj = buffer.toString("utf8");
+    return JSON.parse(jsonObj);
+}
+
+function objectToBuffer(jsonObj: any) {
+    const json = JSON.stringify(jsonObj);
+    return Buffer.from(json, "utf8");
+}
+
+async function readFile(fileName: string) {
+    const readFileAsync = util.promisify(fs.readFile);
+    const filePath = path.resolve(__dirname, fileName);
+    const buffer = await readFileAsync(filePath);
+    return buffer.toString("utf8");
+}
+
+function stripNewlines(text: string) {
+    return text.replace(/[\r\n]/g, "");
+}
+
+async function createTempDir() {
+    const prefix = path.join(os.tmpdir(), "wallet-");
+    return await fs.promises.mkdtemp(prefix);
+}
+
+describe("FileSystemWalletStoreV1", () => {
+    let identity: Identity;
+    let x509Data: IdentityData;
+    let hsmData: IdentityData;
+    let wallet: Wallet;
+    let store: FileSystemWalletStoreV1;
+    let tempDir: string;
+
+    beforeEach(async () => {
+        tempDir = await createTempDir();
+        wallet = new FileSystemWallet(tempDir);
+
+        const mspId = "mspId";
+        const certificate = stripNewlines(await readFile(certificateFile)).trim();
+        const privateKey = stripNewlines(await readFile(privateKeyFile)).trim();
+
+        x509Data = {
+            type: "X.509",
+            version: 1,
+            mspId,
+            credentials: {
+                certificate,
+                privateKey
+            }
+        };
+
+        hsmData = {
+            type: "HSM-X.509",
+            version: 1,
+            mspId,
+            credentials: {
+                certificate
+            }
+        };
+
+        identity = X509WalletMixin.createIdentity(mspId, certificate, privateKey);
+
+        store = new FileSystemWalletStoreV1(tempDir);
+    });
+
+    afterEach(async () => {
+        await rimraf(tempDir);
+    });
+
+    async function removePrivateKeyFiles(label: string) {
+        const identityDir = path.join(tempDir, label);
+        const files = await fs.promises.readdir(identityDir);
+        const keyFiles = files.filter((file) => file.endsWith("-priv"));
+        for (const file of keyFiles) {
+            const filePath = path.join(identityDir, file);
+            await fs.promises.unlink(filePath);
+        }
+    }
+
+    describe("#get", () => {
+        it("returns undefined for identity that does not exist", async () => {
+            const result = await store.get("label");
+            expect(result).toBeUndefined;
+        });
+
+        it("returns store data for X.509 identity", async () => {
+            await wallet.import("label", identity);
+
+            const buffer = await store.get("label");
+
+            expect(buffer).toBeDefined;
+            const result = bufferToObject(buffer!);
+            expect(result.credentials.privateKey).toBeDefined;
+            result.credentials.privateKey = stripNewlines(result.credentials.privateKey!);
+            expect(result).toEqual(x509Data);
+        });
+
+        it("returns store data for HSM identity", async () => {
+            await wallet.import("label", identity);
+            await removePrivateKeyFiles("label");
+
+            const buffer = await store.get("label");
+
+            expect(buffer).toBeDefined;
+            const result = bufferToObject(buffer!);
+            expect(result).toEqual(hsmData);
+        });
+    });
+
+    describe("#list", () => {
+        it("returns empty array for empty wallet", async () => {
+            const result = await store.list();
+            expect(result).toHaveLength(0);
+        });
+
+        it("returns labels for non-empty wallet", async () => {
+            await wallet.import("label", identity);
+
+            const result = await store.list();
+
+            expect(result).toEqual(["label"]);
+        });
+
+        it("ignores spurios files", async () => {
+            const filePath = path.join(tempDir, "fail");
+            await fs.promises.writeFile(filePath, "");
+
+            const result = await store.list();
+
+            expect(result).toEqual([]);
+        });
+
+        it("ignores spurios subdirectories", async () => {
+            const dirPath = path.join(tempDir, "fail");
+            await fs.promises.mkdir(dirPath);
+
+            const result = await store.list();
+
+            expect(result).toEqual([]);
+        });
+    });
+
+    describe("#put", () => {
+        it("adds X.509 identity to wallet", async () => {
+            const data = objectToBuffer(x509Data);
+
+            await store.put("label", data);
+            const result: any = await wallet.export("label");
+
+            // Private keys may be reformatted
+            result.privateKey = stripNewlines(result.privateKey);
+            expect(result).toEqual(identity);
+        });
+
+        it("throws for HSM identity", async () => {
+            const data = objectToBuffer(hsmData);
+
+            const promise = store.put("label", data);
+
+            await expect(promise).rejects.toThrow(hsmData.type);
+        });
+    });
+
+    describe("#remove", () => {
+        it("does nothing for non-existent identity", async () => {
+            await store.remove("label");
+
+            const result = await wallet.list();
+            expect(result).toHaveLength(0);
+        });
+
+        it("removes identity from wallet", async () => {
+            await wallet.import("label", identity);
+
+            await store.remove("label");
+
+            const result = await wallet.exists("label");
+            expect(result).toBe(false);
+        })
+    });
+});
\ No newline at end of file
diff --git a/test/IdentityConverter.spec.ts b/test/IdentityConverter.spec.ts
new file mode 100644
index 0000000..0677d87
--- /dev/null
+++ b/test/IdentityConverter.spec.ts
@@ -0,0 +1,80 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { User } from "../src/User";
+import { IdentityData } from "../src/IdentityData";
+import { IdentityConverter } from "../src/IdentityConverter";
+
+describe("IdentityConverter", () => {
+    let user: User;
+    let converter: IdentityConverter;
+    let x509Data: IdentityData;
+    let hsmData: IdentityData;
+
+    beforeEach(() => {
+        const mspId = "mspId";
+        const certificate = "certificate";
+        const privateKey = "privateKey";
+
+        x509Data = {
+            type: "X.509",
+            version: 1,
+            mspId,
+            credentials: {
+                certificate,
+                privateKey
+            }
+        };
+
+        hsmData = {
+            type: "HSM-X.509",
+            version: 1,
+            mspId,
+            credentials: {
+                certificate
+            }
+        };
+
+        user = {
+            name: "user",
+            mspid: mspId,
+            enrollment: {
+                identity: {
+                    certificate
+                },
+                signingIdentity: "id"
+            }
+        };
+
+        converter = new IdentityConverter();
+    });
+
+    describe("#userToStoreData", () => {
+        it("converts X.509 user to store data", () => {
+            const result = converter.userToStoreData(user, x509Data.credentials.privateKey);
+            expect(result).toEqual(x509Data);
+        });
+
+        it("converts HSM user to store data", () => {
+            const result = converter.userToStoreData(user, undefined);
+            expect(result).toEqual(hsmData);
+        });
+    });
+
+    describe("#storeDataToUser", () => {
+        it("throws with invalid store data type", () => {
+            (x509Data as any).type = "INVALID_TYPE";
+            expect(() => converter.storeDataToUser(x509Data, user.name))
+                .toThrow(x509Data.type);
+        });
+
+        it("converts X.509 store data to identity", () => {
+            const result = converter.storeDataToUser(x509Data, user.name);
+
+            user.enrollment.signingIdentity = expect.stringMatching(/.+/);
+            expect(result.user).toMatchObject(user);
+            expect(result.privateKey).toEqual(x509Data.credentials.privateKey);
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/WalletStoreAdapter.spec.ts b/test/WalletStoreAdapter.spec.ts
deleted file mode 100644
index 1a10bb9..0000000
--- a/test/WalletStoreAdapter.spec.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { X509WalletMixin, Identity, Wallet, InMemoryWallet } from "fabric-network";
-import { X509IdentityData } from "../src/IdentityData";
-import { WalletStoreAdapter } from "../src/WalletStoreAdapter";
-
-import fs = require("fs");
-import util = require("util");
-import path = require("path");
-
-const certificateFile = "certificate.pem";
-const privateKeyFile = "privateKey.pem";
-
-function bufferToObject(buffer: Buffer): any {
-    const jsonObj = buffer.toString("utf8");
-    return JSON.parse(jsonObj);
-}
-
-function objectToBuffer(jsonObj: any) {
-    const json = JSON.stringify(jsonObj);
-    return Buffer.from(json, "utf8");
-}
-
-async function readFile(fileName: string) {
-    const readFileAsync = util.promisify(fs.readFile);
-    const filePath = path.resolve(__dirname, fileName);
-    const buffer = await readFileAsync(filePath);
-    return buffer.toString("utf8");
-}
-
-function stripNewlines(text: string) {
-    return text.replace(/[\r\n]/g, "");
-}
-
-describe("WalletStoreAdapter", () => {
-    let identity: Identity;
-    let storeData: X509IdentityData;
-    let wallet = new InMemoryWallet();
-    let store: WalletStoreAdapter;
-
-    beforeEach(async () => {
-        const certificate = stripNewlines(await readFile(certificateFile)).trim();
-        const privateKey = stripNewlines(await readFile(privateKeyFile)).trim();
-
-        storeData = {
-            type: 'X.509',
-            version: 1,
-            mspId: 'mspId',
-            credentials: {
-                certificate,
-                privateKey
-            }
-        };
-        identity = X509WalletMixin.createIdentity(
-            storeData.mspId,
-            storeData.credentials.certificate,
-            storeData.credentials.privateKey
-        );
-
-        store = new WalletStoreAdapter(wallet);
-    });
-
-    afterEach(async () => {
-        const infos = await wallet.list();
-        const labels = infos.map((info) => info.label);
-        for (const label of labels) {
-            await wallet.delete(label);
-        }
-    });
-
-    describe("#get", () => {
-        it("returns undefined for identity that does not exist", async () => {
-            const result = await store.get("label");
-            expect(result).toBeUndefined;
-        });
-
-        it('returns store data for identity', async () => {
-            await wallet.import("label", identity);
-
-            const buffer = await store.get("label");
-
-            const result = bufferToObject(buffer!) as X509IdentityData;
-            // Private keys may be reformatted
-            result.credentials.privateKey = stripNewlines(result.credentials.privateKey);
-            expect(result).toMatchObject(storeData);
-        });
-    });
-
-    describe('#list', () => {
-        it('returns empty array for empty wallet', async () => {
-            const result = await store.list();
-            expect(result).toHaveLength(0);
-        });
-
-        it('returns labels for non-empty wallet', async () => {
-            await wallet.import("label", identity);
-
-            const result = await store.list();
-
-            expect(result).toEqual(["label"]);
-        });
-    });
-
-    describe('#put', () => {
-        it('adds identity to wallet', async () => {
-            const data = objectToBuffer(storeData);
-
-            await store.put("label", data);
-            const result: any = await wallet.export("label");
-
-            // Private keys may be reformatted
-            result.privateKey = stripNewlines(result.privateKey);
-            expect(result).toEqual(identity);
-        });
-    });
-
-    describe('#remove', () => {
-        it('does nothing for non-existent identity', async () => {
-            await store.remove("label");
-
-            const result = await wallet.list();
-            expect(result).toHaveLength(0);
-        });
-
-        it('removes identity from wallet', async () => {
-            await wallet.import("label", identity);
-
-            await store.remove("label");
-
-            const result = await wallet.exists("label");
-            expect(result).toBe(false);
-        })
-    });
-});
\ No newline at end of file
diff --git a/test/X509IdentityConverter.spec.ts b/test/X509IdentityConverter.spec.ts
deleted file mode 100644
index ea1ae89..0000000
--- a/test/X509IdentityConverter.spec.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { X509WalletMixin, Identity } from "fabric-network";
-import { X509IdentityData } from "../src/IdentityData";
-import { X509IdentityConverter } from "../src/X509IdentityConverter";
-
-describe("X509IdentityConverter", () => {
-    let identity: Identity;
-    let converter: X509IdentityConverter;
-    let storeData: X509IdentityData;
-
-    beforeEach(() => {
-        storeData = {
-            type: 'X.509',
-            version: 1,
-            mspId: 'mspId',
-            credentials: {
-                certificate: 'certificate',
-                privateKey: 'privateKey'
-            }
-        };
-        identity = X509WalletMixin.createIdentity(
-            storeData.mspId,
-            storeData.credentials.certificate,
-            storeData.credentials.privateKey
-        );
-        converter = new X509IdentityConverter();
-    });
-
-    describe("#identityToStoreData", () => {
-        it("throws with invalid identity type", () => {
-            identity.type = "INVALID_TYPE";
-            expect(() => converter.identityToStoreData(identity))
-                .toThrow(identity.type);
-        });
-
-        it("converts valid identity to store data", () => {
-            const result = converter.identityToStoreData(identity);
-            expect(result).toEqual(storeData);
-        });
-    });
-
-    describe("#storeDataToIdentity", () => {
-        it("throws with invalid store data type", () => {
-            (storeData as any).type = "INVALID_TYPE";
-            expect(() => converter.storeDataToIdentity(storeData))
-                .toThrow(storeData.type);
-        });
-
-        it("converts valid store data to identity", () => {
-            const result = converter.storeDataToIdentity(storeData);
-            expect(result).toEqual(identity);
-        });
-    });
-});
\ No newline at end of file