diff --git a/www/canvas/main.js b/www/canvas/main.js
index 64a782120..5f398da05 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -4,9 +4,9 @@ require.config({ paths: {
 
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/common/messages.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/bower_components/chainpad-json-validator/json-ot.js',
diff --git a/www/code/main.js b/www/code/main.js
index 2a9aac661..d32d3c807 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -1,14 +1,13 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-//    '/code/rt_codemirror.js',
     '/common/messages.js',
-    '/common/crypto.js',
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/toolbar.js',
     'json.sortify',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
 ], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT) {
diff --git a/www/form/main.js b/www/form/main.js
index 643d71e46..5c4bf93ab 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -1,8 +1,8 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/form/ula.js',
diff --git a/www/hack/main.js b/www/hack/main.js
index 81cc87234..8318ebe1a 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js'
 ], function (Config, Realtime, Crypto, TextPatcher) {
diff --git a/www/json/main.js b/www/json/main.js
index e81295e99..7f8567073 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -3,6 +3,7 @@ define([
     '/common/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/cryptpad-common.js',
+    '/bower_components/jquery/dist/jquery.min.js',
     //'/customize/pad.js'
 ], function (Config, RtListMap, Crypto, Common) {
     var $ = window.jQuery;
diff --git a/www/pad/main.js b/www/pad/main.js
index e22d439a4..a66053386 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -2,8 +2,8 @@ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/J
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/messages.js',
-    '/common/crypto.js',
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/hyperjson/hyperjson.amd.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
diff --git a/www/render/main.js b/www/render/main.js
index 451728ad0..d6b03eea8 100644
--- a/www/render/main.js
+++ b/www/render/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/marked/marked.min.js',
     '/common/convert.js',
     '/common/rainbow.js',
diff --git a/www/style/main.js b/www/style/main.js
index 218cc1cd8..d68a6c8c6 100644
--- a/www/style/main.js
+++ b/www/style/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
diff --git a/www/text/main.js b/www/text/main.js
index e3c23af9e..077e997b4 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'