diff --git a/ui/.gitignore b/ui/.gitignore
index 0abcfe0..07e6e47 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -1 +1 @@
-packages/npm-container/.npm
+/node_modules
diff --git a/ui/.meteor/.finished-upgraders b/ui/.meteor/.finished-upgraders
index 61ee313..910574c 100644
--- a/ui/.meteor/.finished-upgraders
+++ b/ui/.meteor/.finished-upgraders
@@ -10,3 +10,8 @@ notices-for-facebook-graph-api-2
 1.2.0-meteor-platform-split
 1.2.0-cordova-changes
 1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
diff --git a/ui/.meteor/packages b/ui/.meteor/packages
index c15bfb0..0bf00cb 100644
--- a/ui/.meteor/packages
+++ b/ui/.meteor/packages
@@ -4,30 +4,30 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-less
+ecmascript@0.8.2
+less@2.7.9
 iron:router
-jquery
-react
+jquery@1.11.10
+react@15.0.1
 react-template-helper
 steeve:reactive-cookie
-meteorhacks:npm
 mizzao:timesync
-
-
-npm-container
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
+meteor-base@1.1.0
+mobile-experience@1.0.4
+mongo@1.2.0
 blaze-html-templates
-session
-tracker
-logging
-reload
-random
-ejson
+session@1.1.7
+tracker@1.1.3
+logging@1.1.17
+reload@1.1.11
+random@1.0.10
+ejson@1.0.14
 spacebars
-check
+check@1.2.5
 keypress:keypress
 momentjs:moment
 twbs:bootstrap
+standard-minifier-css@1.3.4
+standard-minifier-js@2.1.1
+shell-server@0.2.4
+dynamic-import
diff --git a/ui/.meteor/release b/ui/.meteor/release
index 5684262..47c31ab 100644
--- a/ui/.meteor/release
+++ b/ui/.meteor/release
@@ -1 +1 @@
-METEOR@1.2.0.2
+METEOR@1.5.2
diff --git a/ui/.meteor/versions b/ui/.meteor/versions
index 02ddcf5..406f1ba 100644
--- a/ui/.meteor/versions
+++ b/ui/.meteor/versions
@@ -1,89 +1,94 @@
-autoupdate@1.2.3
-babel-compiler@5.8.24_1
-babel-runtime@0.1.4
-base64@1.0.4
-binary-heap@1.0.4
-blaze@2.1.3
-blaze-html-templates@1.0.1
-blaze-tools@1.0.4
-boilerplate-generator@1.0.4
-caching-compiler@1.0.0
-caching-html-compiler@1.0.2
-callback-hook@1.0.4
-check@1.0.6
-coffeescript@1.0.10
-cosmos:browserify@0.4.0
-ddp@1.2.2
-ddp-client@1.2.1
-ddp-common@1.2.1
-ddp-server@1.2.1
-deps@1.0.9
-diff-sequence@1.0.1
-ecmascript@0.1.5
-ecmascript-collections@0.1.6
-ejson@1.0.7
-fastclick@1.0.7
-geojson-utils@1.0.4
-hot-code-push@1.0.0
-html-tools@1.0.5
-htmljs@1.0.5
-http@1.1.1
-id-map@1.0.4
-iron:controller@1.0.8
-iron:core@1.0.8
-iron:dynamic-template@1.0.8
-iron:layout@1.0.8
-iron:location@1.0.9
-iron:middleware-stack@1.0.9
-iron:router@1.0.9
-iron:url@1.0.9
-jquery@1.11.4
-jsx@0.2.1
+allow-deny@1.0.9
+autoupdate@1.3.12
+babel-compiler@6.20.0
+babel-runtime@1.0.1
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.3.2
+blaze-html-templates@1.1.2
+blaze-tools@1.0.10
+boilerplate-generator@1.2.0
+caching-compiler@1.1.9
+caching-html-compiler@1.1.2
+callback-hook@1.0.10
+check@1.2.5
+ddp@1.3.1
+ddp-client@2.1.3
+ddp-common@1.2.9
+ddp-server@2.0.2
+deps@1.0.12
+diff-sequence@1.0.7
+dynamic-import@0.1.3
+ecmascript@0.8.2
+ecmascript-runtime@0.4.1
+ecmascript-runtime-client@0.4.3
+ecmascript-runtime-server@0.4.1
+ejson@1.0.14
+fastclick@1.0.13
+geojson-utils@1.0.10
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.2.12
+id-map@1.0.9
+iron:controller@1.0.12
+iron:core@1.0.11
+iron:dynamic-template@1.0.12
+iron:layout@1.0.12
+iron:location@1.0.11
+iron:middleware-stack@1.1.0
+iron:router@1.1.2
+iron:url@1.1.0
+jquery@1.11.10
 keypress:keypress@2.1.0
-launch-screen@1.0.4
-less@2.5.0_3
-livedata@1.0.15
-logging@1.0.8
-meteor@1.1.9
-meteor-base@1.0.1
-meteorhacks:async@1.0.0
-meteorhacks:npm@1.5.0
-minifiers@1.1.7
-minimongo@1.0.10
-mizzao:timesync@0.3.3
-mobile-experience@1.0.1
-mobile-status-bar@1.0.6
-momentjs:moment@2.10.6
-mongo@1.1.2
-mongo-id@1.0.1
-npm-container@1.2.0
-npm-mongo@1.4.39_1
-observe-sequence@1.0.7
-ordered-dict@1.0.4
-promise@0.5.0
-random@1.0.4
-react@0.1.13
-react-meteor-data@0.1.9
-react-runtime@0.13.3_7
-react-runtime-dev@0.13.3_7
-react-runtime-prod@0.13.3_6
-react-template-helper@0.1.6
-reactive-dict@1.1.2
-reactive-var@1.0.6
-reload@1.1.4
-retry@1.0.4
-routepolicy@1.0.6
-session@1.1.1
-spacebars@1.0.7
-spacebars-compiler@1.0.7
-standard-minifiers@1.0.1
+launch-screen@1.1.1
+less@2.7.9
+livedata@1.0.18
+logging@1.1.17
+meteor@1.7.2
+meteor-base@1.1.0
+minifier-css@1.2.16
+minifier-js@2.1.3
+minimongo@1.3.1
+mizzao:timesync@0.5.0
+mobile-experience@1.0.4
+mobile-status-bar@1.0.14
+modules@0.10.0
+modules-runtime@0.8.0
+momentjs:moment@2.18.1
+mongo@1.2.2
+mongo-dev-server@1.0.1
+mongo-id@1.0.6
+npm-mongo@2.2.30
+observe-sequence@1.0.16
+ordered-dict@1.0.9
+promise@0.9.0
+random@1.0.10
+react@15.0.1
+react-meteor-data@0.2.13
+react-runtime@15.0.1
+react-template-helper@0.2.9
+reactive-dict@1.1.9
+reactive-var@1.0.11
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
+session@1.1.7
+shell-server@0.2.4
+spacebars@1.0.15
+spacebars-compiler@1.1.3
+standard-minifier-css@1.3.5
+standard-minifier-js@2.1.1
 steeve:reactive-cookie@0.0.8
-templating@1.1.4
-templating-tools@1.0.0
-tracker@1.0.9
-twbs:bootstrap@3.3.5
-ui@1.0.8
-underscore@1.0.4
-url@1.0.5
-webapp@1.2.2
-webapp-hashing@1.0.5
+templating@1.3.2
+templating-compiler@1.3.3
+templating-runtime@1.3.2
+templating-tools@1.1.2
+tmeasday:check-npm-versions@0.3.1
+tracker@1.1.3
+twbs:bootstrap@3.3.6
+ui@1.0.13
+underscore@1.0.10
+url@1.1.0
+webapp@1.3.19
+webapp-hashing@1.0.9
diff --git a/ui/package.json b/ui/package.json
new file mode 100644
index 0000000..c03bd3d
--- /dev/null
+++ b/ui/package.json
@@ -0,0 +1,18 @@
+{
+  "dependencies": {
+    "babel-runtime": "^6.23.0",
+    "extend": "^3.0.0",
+    "meteor-node-stubs": "^0.2.6",
+    "moment": "^2.18.1",
+    "react": "^15.4.2",
+    "react-addons-create-fragment": "^15.4.2",
+    "react-addons-css-transition-group": "^15.4.2",
+    "react-addons-linked-state-mixin": "^15.4.2",
+    "react-addons-perf": "^15.4.2",
+    "react-addons-pure-render-mixin": "^15.4.2",
+    "react-addons-test-utils": "^15.4.2",
+    "react-addons-transition-group": "^15.4.2",
+    "react-addons-update": "^15.4.2",
+    "react-dom": "^15.4.2"
+  }
+}
diff --git a/ui/packages.json b/ui/packages.json
deleted file mode 100644
index 72b1667..0000000
--- a/ui/packages.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extend": "3.0.0",
-  "moment": "2.10.3"
-}
diff --git a/ui/packages/npm-container/index.js b/ui/packages/npm-container/index.js
deleted file mode 100644
index c3fc862..0000000
--- a/ui/packages/npm-container/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Meteor.npmRequire = function(moduleName) {
-  var module = Npm.require(moduleName);
-  return module;
-};
-
-Meteor.require = function(moduleName) {
-  console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!');
-  return Meteor.npmRequire(moduleName);
-};
\ No newline at end of file
diff --git a/ui/packages/npm-container/package.js b/ui/packages/npm-container/package.js
deleted file mode 100644
index 9fab3ce..0000000
--- a/ui/packages/npm-container/package.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var path = Npm.require('path');
-var fs = Npm.require('fs');
-
-Package.describe({
-  summary: 'Contains all your npm dependencies',
-  version: '1.2.0',
-  name: 'npm-container'
-});
-
-var packagesJsonFile = path.resolve('./packages.json');
-try {
-  var fileContent = fs.readFileSync(packagesJsonFile);
-  var packages = JSON.parse(fileContent.toString());
-  Npm.depends(packages);
-} catch (ex) {
-  console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]');
-}
-
-// Adding the app's packages.json as a used file for this package will get
-// Meteor to watch it and reload this package when it changes
-Package.onUse(function(api) {
-  api.addFiles('index.js', 'server');
-  if (api.addAssets) {
-    api.addAssets('../../packages.json', 'server');
-  } else {
-    api.addFiles('../../packages.json', 'server', {
-      isAsset: true
-    });
-  }
-});
\ No newline at end of file
diff --git a/ui/server/main.js b/ui/server/main.js
index 3c46659..5e45afa 100644
--- a/ui/server/main.js
+++ b/ui/server/main.js
@@ -1,6 +1,5 @@
-
-extend = Meteor.npmRequire("extend");
-moment = Meteor.npmRequire('moment');
+import extend from "extend";
+import moment from "moment";
 
 TaskAttempts = new Mongo.Collection("task_attempts");