diff --git a/bower.json b/bower.json
index 19db3026e..57b1c6eb4 100644
--- a/bower.json
+++ b/bower.json
@@ -18,9 +18,6 @@
     "tests"
   ],
   "dependencies": {
-    "chainpad-crypto": "^0.2.0",
-    "chainpad-listmap": "^1.0.0",
-    "chainpad": "^5.2.0",
     "file-saver": "1.3.1",
     "alertifyjs": "1.0.11",
     "scrypt-async": "1.2.0",
diff --git a/customize.dist/delta-words.js b/customize.dist/delta-words.js
index 4eec0d0b3..4e55e1ab1 100644
--- a/customize.dist/delta-words.js
+++ b/customize.dist/delta-words.js
@@ -1,5 +1,5 @@
 define([
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (ChainPad) {
     var Diff = ChainPad.Diff;
 
diff --git a/customize.dist/login.js b/customize.dist/login.js
index ac6e6535b..f44796d1f 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -1,11 +1,11 @@
 define([
     'jquery',
     'chainpad-listmap',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/common-util.js',
     '/common/outer/network-config.js',
     '/common/common-credential.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/common/common-realtime.js',
     '/common/common-constants.js',
     '/common/common-interface.js',
diff --git a/package-lock.json b/package-lock.json
index 0c31cee90..6f160b478 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,9 @@
         "ws": "^3.3.1"
       },
       "devDependencies": {
+        "chainpad": "^5.2.0",
+        "chainpad-listmap": "github:xwiki-labs/chainpad-listmap#^1.0.0",
+        "chainpad-netflux": "^1.0.0",
         "ckeditor": "^4.12.1",
         "codemirror": "^5.19.0",
         "components-font-awesome": "^4.6.3",
@@ -108,6 +111,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+      "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -125,6 +140,37 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/amd-resolve": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/amd-resolve/-/amd-resolve-0.1.1.tgz",
+      "integrity": "sha512-NyZL3M2Ebru5CAkH3NYxJmxPQnMiM++waHLUakbH2RCAkcop/1JlieF1HTw5oYqImKdYT3YXZCE2xb0GWKoDIg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/amdetective": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/amdetective/-/amdetective-0.0.1.tgz",
+      "integrity": "sha512-z8+f9qhA7k3GTHUPbWOnOQyUaUBzgsI6EspAEQ0Iow/89pGCPPPnYjIe2JKH0ZMCJVkXqx8OT2d2js1ABuYCqg==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "~1.0.4"
+      }
+    },
+    "node_modules/amdetective/node_modules/esprima": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/ansi-bgblack": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-bgblack/-/ansi-bgblack-0.1.1.tgz",
@@ -764,6 +810,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/browser-resolve": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
+      "integrity": "sha512-z8CRZZEv/MVAuJ9u9/LwzAcGswFtWbdAHh8f8ZkHgThUb88rBZbpwoxYZaQnmbAxvCoOA1gFIONrspStOhldkg==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "0.6.3"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -850,6 +905,19 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/chainpad": {
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/chainpad/-/chainpad-5.2.5.tgz",
+      "integrity": "sha512-dr9qIuHgsPXqJ1kOcOxf2Jsy35FxTZssS7pf0xOtWqqAYZgX8r2ytTpk/fMTfxJVpuvVFqtvkulhSR7qy5gWfQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2",
+        "gluejs": "~2.4.0",
+        "json.sortify": "^2.2.2",
+        "nthen": "^0.1.5",
+        "xmhell": "~0.1.2"
+      }
+    },
     "node_modules/chainpad-crypto": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.7.tgz",
@@ -858,6 +926,27 @@
         "tweetnacl": "~0.12.2"
       }
     },
+    "node_modules/chainpad-listmap": {
+      "version": "1.0.1",
+      "resolved": "git+ssh://git@github.com/xwiki-labs/chainpad-listmap.git#1ed90edf3c20ce9ba230d26c983b04de240f7b2a",
+      "dev": true,
+      "license": "AGPL-3.0+"
+    },
+    "node_modules/chainpad-netflux": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chainpad-netflux/-/chainpad-netflux-1.0.0.tgz",
+      "integrity": "sha512-WQcm9qNJYMR8PRVB5Lxu35BN+qL1pch0MUUb0uCcYnCttD2wq/mx1Yp7Fy6ZBKi0GJasJgfXQQKtOyuU09qzEg==",
+      "dev": true,
+      "dependencies": {
+        "netflux-websocket": "^1.0.0"
+      }
+    },
+    "node_modules/chainpad-netflux/node_modules/netflux-websocket": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-1.0.0.tgz",
+      "integrity": "sha512-xU5AXzSne9yA7eC6jXTU7UGvcG1Al0IUSeNd7IrumJBIr70DLa0nQfV3TOpZsmytBJbefi6fcfVjkgclAgWuOQ==",
+      "dev": true
+    },
     "node_modules/chainpad-server": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz",
@@ -869,6 +958,16 @@
         "ws": "^3.3.1"
       }
     },
+    "node_modules/chainpad/node_modules/json.sortify": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/json.sortify/-/json.sortify-2.2.2.tgz",
+      "integrity": "sha512-wwFLdDffs747s5cqLA3htIKp9wdID2rWNofJKxwDjFo+rqqt5Vg7SnYOh7mc7MW6Iw43rrOFhr6MKytOtNceSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0",
+        "npm": "~1.0.20"
+      }
+    },
     "node_modules/choices-separator": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/choices-separator/-/choices-separator-2.0.0.tgz",
@@ -1204,6 +1303,16 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/debuglog": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz",
+      "integrity": "sha512-R6Bl6JxzWVrquXohdoHkyGMgaL8esUXhSzB6WUfSX1N+1dFg30Yo9gshTu7ExV6ntKN4VoJFw8zVdPsVVYGmKg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -1225,6 +1334,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -1252,6 +1370,16 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detective": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz",
+      "integrity": "sha512-a1rssac1j40ueg2uKcyxfK21OwCQW5sOIXF2Ceela1u2IIjOOF2FhN+mTrQ1arYQTSk3DQHkh/w68aikgpLV9w==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^3.1.0",
+        "defined": "^1.0.0"
+      }
+    },
     "node_modules/dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -1700,6 +1828,12 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
     "node_modules/fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -2008,6 +2142,61 @@
         "node": ">=6"
       }
     },
+    "node_modules/gluejs": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/gluejs/-/gluejs-2.4.0.tgz",
+      "integrity": "sha512-ONu5oMBNppp7ybu5PvrnCDh7nv6B6YHKiCrvU9KHFv/ML94Kw18kLilc1z+VucPUeprqrHKMBwNq0nnxWbn1qg==",
+      "dev": true,
+      "dependencies": {
+        "amd-resolve": "~0.1.1",
+        "amdetective": "0.0.1",
+        "browser-resolve": "~1.2.2",
+        "bytes": "~2.2.0",
+        "detective": "~4.3.1",
+        "minilog": "~2.1.0",
+        "minimatch": "~0.2.12",
+        "minitask": "~0.2.0",
+        "optimist": "~0.6.1",
+        "progress": "~1.1.2",
+        "readable-stream": "1.1.9",
+        "resolve": "~0.6.1"
+      },
+      "bin": {
+        "gluejs": "bin/gluejs"
+      }
+    },
+    "node_modules/gluejs/node_modules/bytes": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz",
+      "integrity": "sha512-zGRpnr2l5w/s8PxkrquUJoVeR06KvqPelrYqiSyQV7QEBqCYivpb6UzXYWC6JDBVtNFOT0rzJRFhkfJgxzmILA==",
+      "dev": true
+    },
+    "node_modules/gluejs/node_modules/minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gluejs/node_modules/readable-stream": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz",
+      "integrity": "sha512-Xz7W+ck1vQnTauU5Uo2zYK/Ae8Ou5mRJrKkGFDZX+VF921HwsjL6lz3ga+vT8jQa6HT/0ZbamKffh9OE7xJ4vQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0"
+      },
+      "optionalDependencies": {
+        "debuglog": "0.0.2"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -2700,6 +2889,12 @@
       "resolved": "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz",
       "integrity": "sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k="
     },
+    "node_modules/lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true
+    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -2762,6 +2957,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/microee": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz",
+      "integrity": "sha512-YtNUgIojy1brPWluzA/lE+vf21Tf4qgfs9vqbgY0tFZTsLqKkc+P/UHjf1UrLjB0RSqmPbNm3dihC/HvkqZnTg==",
+      "dev": true
+    },
     "node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -2816,6 +3017,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/minilog": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/minilog/-/minilog-2.1.0.tgz",
+      "integrity": "sha512-UPg2RLmS2JteQ8bn5xA69skwi7evHYcHgRULQIGnNsuXheOHUsFyWitMkqpa3Q9ezSpbDC7vaYKxYCLryCV4og==",
+      "dev": true,
+      "dependencies": {
+        "microee": "0.0.2"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
@@ -2832,8 +3042,35 @@
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/miniq": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/miniq/-/miniq-0.1.2.tgz",
+      "integrity": "sha512-RrLjyiUep4m+ynM6viqtnh20qAdBzfjrmxTIcXU0oschLaEAqUKTxEhYq2Gm3V3IsgzOICG7PMkxuio+I6X6Rw==",
       "dev": true,
-      "optional": true
+      "dependencies": {
+        "microee": "~0.0.5"
+      }
+    },
+    "node_modules/miniq/node_modules/microee": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz",
+      "integrity": "sha512-/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A==",
+      "dev": true
+    },
+    "node_modules/minitask": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/minitask/-/minitask-0.2.3.tgz",
+      "integrity": "sha512-Ka6EQ9R2XsLc80vr3rdh4C56guoKq5tItG50etoNxJ8wV/0p59og2BdGBtqnNhkWchI/B4W4GTQ/Fvdy5N2rng==",
+      "dev": true,
+      "dependencies": {
+        "miniq": "~0.1.1",
+        "mkdirp": "~0.5.0"
+      },
+      "peerDependencies": {
+        "minilog": "2.x"
+      }
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -2881,7 +3118,6 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -3078,6 +3314,22 @@
         "wrappy": "1"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true
+    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -3266,6 +3518,15 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "node_modules/progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -3688,6 +3949,12 @@
       "integrity": "sha512-bX1vGnjDd1iIod3hst47oM/Nv9JiYw4qodWNKgyeQw5ahzSvPI3j1K6hMcK0HtiGRKxebCf+QUrtWzbrZtzQog==",
       "dev": true
     },
+    "node_modules/resolve": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
+      "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
+      "dev": true
+    },
     "node_modules/resolve-from": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -3915,6 +4182,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
     "node_modules/slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -4755,6 +5028,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -4771,6 +5053,15 @@
         "ultron": "~1.1.0"
       }
     },
+    "node_modules/xmhell": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/xmhell/-/xmhell-0.1.2.tgz",
+      "integrity": "sha512-9JF9o/dM1PHifwtc7KE/Pcc8pp2Jfj7462TakZFPXNzVPBNglePITwj7bQj94aAaQ6ZGokIb3BFu4nToPYuoeA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/xml2js": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
@@ -4847,6 +5138,12 @@
         "negotiator": "0.6.3"
       }
     },
+    "acorn": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+      "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
+      "dev": true
+    },
     "ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -4860,6 +5157,29 @@
         "uri-js": "^4.2.2"
       }
     },
+    "amd-resolve": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/amd-resolve/-/amd-resolve-0.1.1.tgz",
+      "integrity": "sha512-NyZL3M2Ebru5CAkH3NYxJmxPQnMiM++waHLUakbH2RCAkcop/1JlieF1HTw5oYqImKdYT3YXZCE2xb0GWKoDIg==",
+      "dev": true
+    },
+    "amdetective": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/amdetective/-/amdetective-0.0.1.tgz",
+      "integrity": "sha512-z8+f9qhA7k3GTHUPbWOnOQyUaUBzgsI6EspAEQ0Iow/89pGCPPPnYjIe2JKH0ZMCJVkXqx8OT2d2js1ABuYCqg==",
+      "dev": true,
+      "requires": {
+        "esprima": "~1.0.4"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+          "dev": true
+        }
+      }
+    },
     "ansi-bgblack": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-bgblack/-/ansi-bgblack-0.1.1.tgz",
@@ -5359,6 +5679,15 @@
         }
       }
     },
+    "browser-resolve": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
+      "integrity": "sha512-z8CRZZEv/MVAuJ9u9/LwzAcGswFtWbdAHh8f8ZkHgThUb88rBZbpwoxYZaQnmbAxvCoOA1gFIONrspStOhldkg==",
+      "dev": true,
+      "requires": {
+        "resolve": "0.6.3"
+      }
+    },
     "bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -5427,6 +5756,27 @@
       "dev": true,
       "optional": true
     },
+    "chainpad": {
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/chainpad/-/chainpad-5.2.5.tgz",
+      "integrity": "sha512-dr9qIuHgsPXqJ1kOcOxf2Jsy35FxTZssS7pf0xOtWqqAYZgX8r2ytTpk/fMTfxJVpuvVFqtvkulhSR7qy5gWfQ==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2",
+        "gluejs": "~2.4.0",
+        "json.sortify": "^2.2.2",
+        "nthen": "^0.1.5",
+        "xmhell": "~0.1.2"
+      },
+      "dependencies": {
+        "json.sortify": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/json.sortify/-/json.sortify-2.2.2.tgz",
+          "integrity": "sha512-wwFLdDffs747s5cqLA3htIKp9wdID2rWNofJKxwDjFo+rqqt5Vg7SnYOh7mc7MW6Iw43rrOFhr6MKytOtNceSA==",
+          "dev": true
+        }
+      }
+    },
     "chainpad-crypto": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.7.tgz",
@@ -5435,6 +5785,28 @@
         "tweetnacl": "~0.12.2"
       }
     },
+    "chainpad-listmap": {
+      "version": "git+ssh://git@github.com/xwiki-labs/chainpad-listmap.git#1ed90edf3c20ce9ba230d26c983b04de240f7b2a",
+      "dev": true,
+      "from": "chainpad-listmap@github:xwiki-labs/chainpad-listmap#^1.0.0"
+    },
+    "chainpad-netflux": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chainpad-netflux/-/chainpad-netflux-1.0.0.tgz",
+      "integrity": "sha512-WQcm9qNJYMR8PRVB5Lxu35BN+qL1pch0MUUb0uCcYnCttD2wq/mx1Yp7Fy6ZBKi0GJasJgfXQQKtOyuU09qzEg==",
+      "dev": true,
+      "requires": {
+        "netflux-websocket": "^1.0.0"
+      },
+      "dependencies": {
+        "netflux-websocket": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-1.0.0.tgz",
+          "integrity": "sha512-xU5AXzSne9yA7eC6jXTU7UGvcG1Al0IUSeNd7IrumJBIr70DLa0nQfV3TOpZsmytBJbefi6fcfVjkgclAgWuOQ==",
+          "dev": true
+        }
+      }
+    },
     "chainpad-server": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-5.1.0.tgz",
@@ -5710,6 +6082,13 @@
         "ms": "2.0.0"
       }
     },
+    "debuglog": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-0.0.2.tgz",
+      "integrity": "sha512-R6Bl6JxzWVrquXohdoHkyGMgaL8esUXhSzB6WUfSX1N+1dFg30Yo9gshTu7ExV6ntKN4VoJFw8zVdPsVVYGmKg==",
+      "dev": true,
+      "optional": true
+    },
     "decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -5725,6 +6104,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+      "dev": true
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -5742,6 +6127,16 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
+    "detective": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz",
+      "integrity": "sha512-a1rssac1j40ueg2uKcyxfK21OwCQW5sOIXF2Ceela1u2IIjOOF2FhN+mTrQ1arYQTSk3DQHkh/w68aikgpLV9w==",
+      "dev": true,
+      "requires": {
+        "acorn": "^3.1.0",
+        "defined": "^1.0.0"
+      }
+    },
     "dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -6097,6 +6492,12 @@
       "dev": true,
       "optional": true
     },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -6347,6 +6748,54 @@
         "slash": "^2.0.0"
       }
     },
+    "gluejs": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/gluejs/-/gluejs-2.4.0.tgz",
+      "integrity": "sha512-ONu5oMBNppp7ybu5PvrnCDh7nv6B6YHKiCrvU9KHFv/ML94Kw18kLilc1z+VucPUeprqrHKMBwNq0nnxWbn1qg==",
+      "dev": true,
+      "requires": {
+        "amd-resolve": "~0.1.1",
+        "amdetective": "0.0.1",
+        "browser-resolve": "~1.2.2",
+        "bytes": "~2.2.0",
+        "detective": "~4.3.1",
+        "minilog": "~2.1.0",
+        "minimatch": "~0.2.12",
+        "minitask": "~0.2.0",
+        "optimist": "~0.6.1",
+        "progress": "~1.1.2",
+        "readable-stream": "1.1.9",
+        "resolve": "~0.6.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz",
+          "integrity": "sha512-zGRpnr2l5w/s8PxkrquUJoVeR06KvqPelrYqiSyQV7QEBqCYivpb6UzXYWC6JDBVtNFOT0rzJRFhkfJgxzmILA==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "1.1.9",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.9.tgz",
+          "integrity": "sha512-Xz7W+ck1vQnTauU5Uo2zYK/Ae8Ou5mRJrKkGFDZX+VF921HwsjL6lz3ga+vT8jQa6HT/0ZbamKffh9OE7xJ4vQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "debuglog": "0.0.2"
+          }
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -6910,6 +7359,12 @@
       "resolved": "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz",
       "integrity": "sha1-LvpUw7HLq6m5Su4uWRSwvlf7t0k="
     },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -6951,6 +7406,12 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
+    "microee": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz",
+      "integrity": "sha512-YtNUgIojy1brPWluzA/lE+vf21Tf4qgfs9vqbgY0tFZTsLqKkc+P/UHjf1UrLjB0RSqmPbNm3dihC/HvkqZnTg==",
+      "dev": true
+    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -6990,6 +7451,15 @@
         "mime-db": "1.52.0"
       }
     },
+    "minilog": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/minilog/-/minilog-2.1.0.tgz",
+      "integrity": "sha512-UPg2RLmS2JteQ8bn5xA69skwi7evHYcHgRULQIGnNsuXheOHUsFyWitMkqpa3Q9ezSpbDC7vaYKxYCLryCV4og==",
+      "dev": true,
+      "requires": {
+        "microee": "0.0.2"
+      }
+    },
     "minimatch": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
@@ -7003,8 +7473,34 @@
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "miniq": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/miniq/-/miniq-0.1.2.tgz",
+      "integrity": "sha512-RrLjyiUep4m+ynM6viqtnh20qAdBzfjrmxTIcXU0oschLaEAqUKTxEhYq2Gm3V3IsgzOICG7PMkxuio+I6X6Rw==",
       "dev": true,
-      "optional": true
+      "requires": {
+        "microee": "~0.0.5"
+      },
+      "dependencies": {
+        "microee": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz",
+          "integrity": "sha512-/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A==",
+          "dev": true
+        }
+      }
+    },
+    "minitask": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/minitask/-/minitask-0.2.3.tgz",
+      "integrity": "sha512-Ka6EQ9R2XsLc80vr3rdh4C56guoKq5tItG50etoNxJ8wV/0p59og2BdGBtqnNhkWchI/B4W4GTQ/Fvdy5N2rng==",
+      "dev": true,
+      "requires": {
+        "miniq": "~0.1.1",
+        "mkdirp": "~0.5.0"
+      }
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -7042,7 +7538,6 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "minimist": "^1.2.6"
       }
@@ -7198,6 +7693,24 @@
         "wrappy": "1"
       }
     },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        }
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -7342,6 +7855,12 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+      "dev": true
+    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -7689,6 +8208,12 @@
       "integrity": "sha512-bX1vGnjDd1iIod3hst47oM/Nv9JiYw4qodWNKgyeQw5ahzSvPI3j1K6hMcK0HtiGRKxebCf+QUrtWzbrZtzQog==",
       "dev": true
     },
+    "resolve": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
+      "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
+      "dev": true
+    },
     "resolve-from": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -7876,6 +8401,12 @@
         "object-inspect": "^1.9.0"
       }
     },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
     "slash": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -8541,6 +9072,12 @@
         }
       }
     },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -8557,6 +9094,12 @@
         "ultron": "~1.1.0"
       }
     },
+    "xmhell": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/xmhell/-/xmhell-0.1.2.tgz",
+      "integrity": "sha512-9JF9o/dM1PHifwtc7KE/Pcc8pp2Jfj7462TakZFPXNzVPBNglePITwj7bQj94aAaQ6ZGokIb3BFu4nToPYuoeA==",
+      "dev": true
+    },
     "xml2js": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
diff --git a/package.json b/package.json
index 189edf659..9cf946f07 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,9 @@
     "ws": "^3.3.1"
   },
   "devDependencies": {
+    "chainpad": "^5.2.0",
+    "chainpad-listmap": "github:xwiki-labs/chainpad-listmap#^1.0.0",
+    "chainpad-netflux": "^1.0.0",
     "ckeditor": "^4.12.1",
     "codemirror": "^5.19.0",
     "components-font-awesome": "^4.6.3",
diff --git a/scripts/copy-components.js b/scripts/copy-components.js
index e2769eb77..ab6e957e6 100644
--- a/scripts/copy-components.js
+++ b/scripts/copy-components.js
@@ -17,6 +17,10 @@ Fse.mkdirpSync(componentsPath);
     "requirejs-plugins",
     "json.sortify",
     "hyper-json",
+    "chainpad",
+    "chainpad-crypto",
+    "chainpad-listmap",
+    "chainpad-netflux",
 ].forEach(l => {
     const source = Path.join("node_modules", l);
     const destination = Path.join(componentsPath, l);
diff --git a/scripts/tests/test-lkh.js b/scripts/tests/test-lkh.js
index bf6ba12bb..31a8d44f3 100644
--- a/scripts/tests/test-lkh.js
+++ b/scripts/tests/test-lkh.js
@@ -2,7 +2,7 @@
 var Client = require("../../lib/client");
 var Nacl = require("tweetnacl/nacl-fast");
 var nThen = require("nthen");
-var CPNetflux = require("../../www/bower_components/chainpad-netflux/chainpad-netflux");
+var CPNetflux = require("../../www/components/chainpad-netflux/chainpad-netflux");
 var Hash = require("../../www/common/common-hash");
 var Rpc = require("../../www/common/rpc");
 var HK = require("../../lib/hk-util");
diff --git a/scripts/tests/test-mailbox.js b/scripts/tests/test-mailbox.js
index d152cf0f2..4115bc5bc 100644
--- a/scripts/tests/test-mailbox.js
+++ b/scripts/tests/test-mailbox.js
@@ -1,14 +1,14 @@
 /* globals process */
 
 var Client = require("../../lib/client/");
-var Crypto = require("../../www/bower_components/chainpad-crypto");
+var Crypto = require("../../www/components/chainpad-crypto");
 var Mailbox = Crypto.Mailbox;
 var Nacl = require("tweetnacl/nacl-fast");
 var nThen = require("nthen");
 var Pinpad = require("../../www/common/pinpad");
 var Rpc = require("../../www/common/rpc");
 var Hash = require("../../www/common/common-hash");
-var CpNetflux = require("../../www/bower_components/chainpad-netflux");
+var CpNetflux = require("../../www/components/chainpad-netflux");
 var Util = require("../../lib/common-util");
 
 // you need more than 100 messages in the history, and you need a lastKnownHash between "50" and "length - 50"
diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js
index b92cf6287..fe6864d96 100644
--- a/scripts/tests/test-rpc.js
+++ b/scripts/tests/test-rpc.js
@@ -1,14 +1,14 @@
 /* globals process */
 
 var Client = require("../../lib/client/");
-var Crypto = require("../../www/bower_components/chainpad-crypto");
+var Crypto = require("../../www/components/chainpad-crypto");
 var Mailbox = Crypto.Mailbox;
 var Nacl = require("tweetnacl/nacl-fast");
 var nThen = require("nthen");
 var Pinpad = require("../../www/common/pinpad");
 var Rpc = require("../../www/common/rpc");
 var Hash = require("../../www/common/common-hash");
-var CpNetflux = require("../../www/bower_components/chainpad-netflux");
+var CpNetflux = require("../../www/components/chainpad-netflux");
 var Roster = require("./roster");
 var Util = require("../../lib/common-util");
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 5c9ca3513..ff9cdfdb9 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -2,7 +2,7 @@ define([
     'jquery',
     '/api/config',
     '/customize/application_config.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index ba66b122e..70c17f46a 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     'json.sortify',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/code/markers.js b/www/code/markers.js
index 48e5a25fb..1a6ea4bfb 100644
--- a/www/code/markers.js
+++ b/www/code/markers.js
@@ -2,7 +2,7 @@ define([
     '/common/common-util.js',
     '/common/sframe-common-codemirror.js',
     '/customize/messages.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/common/inner/common-mediatag.js',
     '/common/common-interface.js',
 ], function (Util, SFCodeMirror, Messages, ChainPad, MT, UI) {
diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index 28ea09b2d..bbd3aaba5 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -750,7 +750,7 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
             '/common/common-util.js',
-            '/bower_components/chainpad-crypto/crypto.js',
+            '/components/chainpad-crypto/crypto.js',
             '/common/common-signing-keys.js',
             '/components/tweetnacl/nacl-fast.min.js'
         ], function (Util, Crypto, Keys) {
diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 4a3eb2a91..f3dcc1a29 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -1,5 +1,5 @@
 define([
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/common-hash.js',
     '/common/common-util.js',
     '/common/common-constants.js',
diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index c4c17eb70..13c56e940 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -1,5 +1,5 @@
 define([
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     'chainpad-netflux',
     'netflux-client',
     '/common/common-util.js',
@@ -9,7 +9,7 @@ define([
     '/common/outer/cache-store.js',
     '/common/pinpad.js',
     '/bower_components/nthen/index.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (Crypto, CPNetflux, Netflux, Util, Hash, Realtime, NetConfig, Cache, Pinpad, nThen) {
     var finish = function (S, err, doc) {
         if (S.done) { return; }
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index c720471ba..81e2ab03c 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1702,7 +1702,7 @@ define([
 
             require([
                 '/common/cryptget.js',
-                '/bower_components/chainpad-crypto/crypto.js',
+                '/components/chainpad-crypto/crypto.js',
             ], waitFor(function (_Crypt, _Crypto) {
                 Crypt = _Crypt;
                 Crypto = _Crypto;
diff --git a/www/common/inner/snapshots.js b/www/common/inner/snapshots.js
index ced6f9296..7b812aa3a 100644
--- a/www/common/inner/snapshots.js
+++ b/www/common/inner/snapshots.js
@@ -4,7 +4,7 @@ define([
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/bower_components/nthen/index.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function ($, UI, h, Messages, nThen, ChainPad /* JsonOT */) {
     var Snapshots = {};
 
diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js
index 1e532ebc9..09825a59d 100644
--- a/www/common/migrate-user-object.js
+++ b/www/common/migrate-user-object.js
@@ -9,7 +9,7 @@ define([
     '/customize/messages.js',
     '/common/common-realtime.js',
     '/bower_components/nthen/index.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
 ], function (AppConfig, Feedback, Hash, Util, Messaging, Crypt, Mailbox, Messages, Realtime, nThen, Crypto) {
     // Start migration check
     // Versions:
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index c77423319..9e669de11 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -13,7 +13,7 @@ define([
     '/api/config',
     '/customize/messages.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/file/file-crypto.js',
     '/common/onlyoffice/history.js',
     '/common/onlyoffice/oocell_base.js',
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 327309f20..8e9ced469 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -24,8 +24,8 @@ define([
     '/common/outer/network-config.js',
     '/customize/application_config.js',
 
-    '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad-crypto/crypto.js',
+    '/components/chainpad/chainpad.dist.js',
     'chainpad-netflux',
     'chainpad-listmap',
     'netflux-client',
diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js
index c09208110..221cbf608 100644
--- a/www/common/outer/calendar.js
+++ b/www/common/outer/calendar.js
@@ -8,8 +8,8 @@ define([
     '/customize/messages.js',
     '/bower_components/nthen/index.js',
     'chainpad-listmap',
-    '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad-crypto/crypto.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (Util, Hash, Constants, Realtime, Cache, Rec, Messages, nThen, Listmap, Crypto, ChainPad) {
     var Calendar = {};
 
diff --git a/www/common/outer/cursor.js b/www/common/outer/cursor.js
index b1a5e7cd0..9dcd3d9ab 100644
--- a/www/common/outer/cursor.js
+++ b/www/common/outer/cursor.js
@@ -3,7 +3,7 @@ define([
     '/common/common-constants.js',
     '/customize/messages.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
 ], function (Util, Constants, Messages, AppConfig, Crypto) {
     var Cursor = {};
 
diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index ceb49f9a5..e35149267 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -109,7 +109,7 @@ var factory = function (Util, Cred, Nacl, Crypto) {
         define([
             '/common/common-util.js',
             '/common/common-credential.js',
-            '/bower_components/chainpad-crypto/crypto.js',
+            '/components/chainpad-crypto/crypto.js',
             '/components/tweetnacl/nacl-fast.min.js',
         ], function (Util, Cred, Crypto) {
             return factory(Util, Cred, window.nacl, Crypto);
diff --git a/www/common/outer/mailbox-handlers.js b/www/common/outer/mailbox-handlers.js
index ecca57383..f4a3bbf91 100644
--- a/www/common/outer/mailbox-handlers.js
+++ b/www/common/outer/mailbox-handlers.js
@@ -2,7 +2,7 @@ define([
     '/common/common-messaging.js',
     '/common/common-hash.js',
     '/common/common-util.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
 ], function (Messaging, Hash, Util, Crypto) {
 
     // Random timeout between 10 and 30 times your sync time (lag + chainpad sync)
diff --git a/www/common/outer/mailbox.js b/www/common/outer/mailbox.js
index 3e85585dc..c4e71081d 100644
--- a/www/common/outer/mailbox.js
+++ b/www/common/outer/mailbox.js
@@ -8,7 +8,7 @@ define([
     '/common/notify.js',
     '/common/outer/mailbox-handlers.js',
     'chainpad-netflux',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
 ], function (Config, BCast, Util, Hash, Realtime, Messaging, Notify, Handlers, CpNetflux, Crypto) {
     var Mailbox = {};
 
diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js
index bcbd4b48e..12fd90d22 100644
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@@ -1,5 +1,5 @@
 define([
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/common-hash.js',
     '/common/common-util.js',
     '/common/common-realtime.js',
diff --git a/www/common/outer/profile.js b/www/common/outer/profile.js
index 7cba963c7..b03a0a4dc 100644
--- a/www/common/outer/profile.js
+++ b/www/common/outer/profile.js
@@ -4,8 +4,8 @@ define([
     '/common/common-constants.js',
     '/common/common-realtime.js',
     'chainpad-listmap',
-    '/bower_components/chainpad-crypto/crypto.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad-crypto/crypto.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (Util, Hash, Constants, Realtime, Listmap, Crypto, ChainPad) {
     var Profile = {};
 
diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 033e6cd42..4ac952843 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -920,10 +920,10 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback)
         module.exports = factory(
             require("../common-util"),
             require("../common-hash"),
-            require("../../bower_components/chainpad-netflux/chainpad-netflux.js"),
+            require("../../components/chainpad-netflux/chainpad-netflux.js"),
             require("../../components/json.sortify"),
             require("nthen"),
-            require("../../bower_components/chainpad-crypto/crypto"),
+            require("../../components/chainpad-crypto/crypto"),
             null // no feedback here
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
@@ -934,7 +934,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback)
             'chainpad-netflux',
             'json.sortify',
             '/bower_components/nthen/index.js',
-            '/bower_components/chainpad-crypto/crypto.js',
+            '/components/chainpad-crypto/crypto.js',
             '/common/common-feedback.js',
             //'/components/tweetnacl/nacl-fast.min.js',
         ], function (Util, Hash, CPNF, Sortify, nThen, Crypto, Feedback) {
diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js
index 468b1138f..8c4f81c22 100644
--- a/www/common/outer/sharedfolder.js
+++ b/www/common/outer/sharedfolder.js
@@ -5,9 +5,9 @@ define([
     '/common/outer/cache-store.js',
 
     '/bower_components/nthen/index.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     'chainpad-listmap',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (Hash, Util, UserObject, Cache,
              nThen, Crypto, Listmap, ChainPad) {
     var SF = {};
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 3c9baadf3..d1a7f0029 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -15,9 +15,9 @@ define([
     '/common/outer/cache-store.js',
 
     'chainpad-listmap',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     'chainpad-netflux',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/bower_components/nthen/index.js',
     '/bower_components/saferphore/index.js',
     '/components/tweetnacl/nacl-fast.min.js',
diff --git a/www/common/requireconfig.js b/www/common/requireconfig.js
index 075391492..f3429cee5 100644
--- a/www/common/requireconfig.js
+++ b/www/common/requireconfig.js
@@ -18,8 +18,8 @@ define([
             'tui-code-snippet': '/lib/calendar/tui-code-snippet.min',
             'tui-date-picker': '/lib/calendar/date-picker',
             'netflux-client': '/bower_components/netflux-websocket/netflux-client',
-            'chainpad-netflux': '/bower_components/chainpad-netflux/chainpad-netflux',
-            'chainpad-listmap': '/bower_components/chainpad-listmap/chainpad-listmap',
+            'chainpad-netflux': '/components/chainpad-netflux/chainpad-netflux',
+            'chainpad-listmap': '/components/chainpad-listmap/chainpad-listmap',
             'cm-extra': '/lib/codemirror-extra-modes',
             // asciidoctor same
             'asciidoctor': '/lib/asciidoctor/asciidoctor.min'
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index e811ac6c8..80dd7c9c5 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -15,7 +15,7 @@ define([
     '/common/common-feedback.js',
     '/common/inner/snapshots.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/common/test.js',
 
     '/bower_components/file-saver/FileSaver.min.js',
diff --git a/www/common/sframe-chainpad-netflux-inner.js b/www/common/sframe-chainpad-netflux-inner.js
index 1bdcc260f..d18403015 100644
--- a/www/common/sframe-chainpad-netflux-inner.js
+++ b/www/common/sframe-chainpad-netflux-inner.js
@@ -17,7 +17,7 @@
 define([
     '/common/common-util.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad/chainpad.dist.js'
+    '/components/chainpad/chainpad.dist.js'
 ], function (Util, AppConfig, ChainPad) {
     var module = { exports: {} };
 
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 316a49da5..dfa91964e 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -8,7 +8,7 @@ define([
     '/common/common-hash.js',
     '/common/common-util.js',
     '/common/text-cursor.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function ($, Modes, Themes, Messages, UIElements, MT, Hash, Util, TextCursor, ChainPad) {
     var module = {};
 
diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js
index a5292e2a5..298e70586 100644
--- a/www/common/sframe-common-history.js
+++ b/www/common/sframe-common-history.js
@@ -5,9 +5,9 @@ define([
     '/common/hyperscript.js',
     '/customize/messages.js',
     '/bower_components/nthen/index.js',
-    //'/bower_components/chainpad-json-validator/json-ot.js',
+    //'/components/chainpad-json-validator/json-ot.js',
 
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function ($, UI, Util, h, Messages, nThen, ChainPad /* JsonOT */) {
     //var ChainPad = window.ChainPad;
     var History = {};
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 219dc915d..2f6d4605f 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -130,7 +130,7 @@ define([
             require([
                 '/common/sframe-chainpad-netflux-outer.js',
                 '/common/cryptpad-common.js',
-                '/bower_components/chainpad-crypto/crypto.js',
+                '/components/chainpad-crypto/crypto.js',
                 '/common/cryptget.js',
                 '/common/outer/worker-channel.js',
                 '/secureiframe/main.js',
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 9e033f5c0..827f5e2f3 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -5,7 +5,7 @@ define([
     '/common/common-constants.js',
     '/common/outer/userObject.js',
     '/customize/messages.js',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
 ], function (AppConfig, Util, Hash, Constants, OuterFO, Messages, Crypto) {
     var module = {};
 
diff --git a/www/contacts/inner.js b/www/contacts/inner.js
index 255b24057..cb85bc8bb 100644
--- a/www/contacts/inner.js
+++ b/www/contacts/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/convert/inner.js b/www/convert/inner.js
index 5b6364223..a75357ea1 100644
--- a/www/convert/inner.js
+++ b/www/convert/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     '/api/config',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/debug/inner.js b/www/debug/inner.js
index f1faa0ecf..a33d4571c 100644
--- a/www/debug/inner.js
+++ b/www/debug/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     'json.sortify',
     '/common/common-util.js',
diff --git a/www/form/inner.js b/www/form/inner.js
index 4744a032b..6ebc6b294 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -2,7 +2,7 @@ define([
     'jquery',
     'json.sortify',
     '/api/config',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/sframe-app-framework.js',
     '/common/toolbar.js',
     '/form/export.js',
@@ -21,7 +21,7 @@ define([
     '/common/sframe-common-codemirror.js',
     '/common/text-cursor.js',
     'cm/lib/codemirror',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 
     '/common/inner/share.js',
     '/common/inner/access.js',
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 0cf415ead..e482a1383 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -14,7 +14,7 @@ define([
     '/common/hyperscript.js',
     '/common/text-cursor.js',
     '/common/diffMarked.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/components/marked/marked.min.js',
     'cm/lib/codemirror',
     '/kanban/jkanban_cp.js',
diff --git a/www/notifications/inner.js b/www/notifications/inner.js
index c250a3d37..020f48f87 100644
--- a/www/notifications/inner.js
+++ b/www/notifications/inner.js
@@ -1,7 +1,7 @@
 define([
     'jquery',
     '/api/config',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
diff --git a/www/pad/cursor.js b/www/pad/cursor.js
index b0268336b..6d8b5b7ac 100644
--- a/www/pad/cursor.js
+++ b/www/pad/cursor.js
@@ -2,7 +2,7 @@ define([
     'jquery',
     '/common/common-ui-elements.js',
     '/common/common-interface.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/customize/messages.js',
     '/common/inner/common-mediatag.js',
 ], function ($, UIElements, UI, ChainPad, Messages, MT) {
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 37f084edb..1f29f9299 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -41,7 +41,7 @@ define([
     '/common/common-interface.js',
     '/common/common-ui-elements.js',
     '/common/hyperscript.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     //'/customize/application_config.js',
     //'/common/test.js',
 
diff --git a/www/poll/render.js b/www/poll/render.js
index c4aaf5702..679c9df26 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -2,7 +2,7 @@ define([
     'jquery',
     '/components/hyper-json/hyperjson.js',
     '/common/text-cursor.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/common/common-util.js',
     '/customize/messages.js',
 
diff --git a/www/profile/inner.js b/www/profile/inner.js
index c22d3557e..c0502bd1f 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     'chainpad-listmap',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
diff --git a/www/report/main.js b/www/report/main.js
index 479faead4..e4ff2e07d 100644
--- a/www/report/main.js
+++ b/www/report/main.js
@@ -11,7 +11,7 @@ define([
     '/common/outer/cache-store.js',
     '/common/common-interface.js',
     'chainpad-netflux',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/userObject.js',
     '/common/clipboard.js',
 
diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js
index 9bf2fc72b..5856e6906 100644
--- a/www/secureiframe/inner.js
+++ b/www/secureiframe/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
     '/common/common-interface.js',
diff --git a/www/todo/inner.js b/www/todo/inner.js
index 297723539..1fb400078 100644
--- a/www/todo/inner.js
+++ b/www/todo/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     'chainpad-listmap',
     '/common/toolbar.js',
     '/bower_components/nthen/index.js',
diff --git a/www/unsafeiframe/inner.js b/www/unsafeiframe/inner.js
index 73374182b..3db2aaa40 100644
--- a/www/unsafeiframe/inner.js
+++ b/www/unsafeiframe/inner.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
     '/common/common-interface.js',
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index a10b64e78..57152166f 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -12,7 +12,7 @@ define([
     '/customize/messages.js',
     '/whiteboard/colors.js',
     '/customize/application_config.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 
     '/lib/fabric.min.js',
     'less!/whiteboard/app-whiteboard.less'