diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages
index 2710bf464..1e597cb78 100644
--- a/OHIFViewer/.meteor/packages
+++ b/OHIFViewer/.meteor/packages
@@ -30,15 +30,11 @@ shell-server@0.4.0
 ohif:polyfill
 ohif:design
 ohif:core
-ohif:commands
-ohif:hotkeys
-ohif:header
 ohif:cornerstone
 ohif:cornerstone-settings
 ohif:viewerbase
 ohif:study-list
 ohif:hanging-protocols
-ohif:metadata
 ohif:user-oidc
 ohif:measurement-table
 
diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions
index 527a6f59f..50d08125b 100644
--- a/OHIFViewer/.meteor/versions
+++ b/OHIFViewer/.meteor/versions
@@ -78,20 +78,14 @@ mongo-id@1.0.7
 natestrauser:select2@4.0.3
 npm-mongo@3.1.2-beta181.7
 observe-sequence@1.0.16
-ohif:commands@0.0.1
 ohif:core@0.0.1
 ohif:cornerstone@0.0.1
 ohif:cornerstone-settings@0.0.1
 ohif:design@0.0.1
 ohif:hanging-protocols@0.0.1
-ohif:header@0.0.1
-ohif:hotkeys@0.0.1
-ohif:log@0.0.1
 ohif:measurement-table@0.0.1
 ohif:measurements@0.0.1
-ohif:metadata@0.0.1
 ohif:polyfill@0.0.1
-ohif:select-tree@0.0.1
 ohif:servers@0.0.1
 ohif:studies@0.0.1
 ohif:study-list@0.0.1
diff --git a/Packages/ohif-core/client/components/index.js b/Packages/ohif-core/client/components/index.js
index fdcfd036b..ae79784e1 100644
--- a/Packages/ohif-core/client/components/index.js
+++ b/Packages/ohif-core/client/components/index.js
@@ -1,8 +1,9 @@
 import './base';
 import './bootstrap';
+import './header';
+import './hotkeys';
 import './pages';
 import './paginationArea';
-import './playground/playground.html';
-import './playground/playground.styl';
-import './playground/playground.js';
+import './playground';
 import './scrollArea';
+import './userLogin';
diff --git a/Packages/ohif-core/client/components/playground/index.js b/Packages/ohif-core/client/components/playground/index.js
new file mode 100644
index 000000000..0668f3dc1
--- /dev/null
+++ b/Packages/ohif-core/client/components/playground/index.js
@@ -0,0 +1,3 @@
+import './playground.html';
+import './playground.js';
+import './playground.styl';
diff --git a/Packages/ohif-core/client/index.js b/Packages/ohif-core/client/index.js
index 2a7930717..bc9f5f4fa 100644
--- a/Packages/ohif-core/client/index.js
+++ b/Packages/ohif-core/client/index.js
@@ -1,6 +1,11 @@
 import './lib';
 import './helpers';
+import './commands';
+import './hotkeys';
 import './components';
 import './ui';
 
 import './routes.js';
+import './header.js';
+import './hotkeys.js';
+import './hotkeys.js';
diff --git a/Packages/ohif-core/main.js b/Packages/ohif-core/main.js
index f79be869c..ab4e5a3d7 100644
--- a/Packages/ohif-core/main.js
+++ b/Packages/ohif-core/main.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import './log.js';
 
 /*
  * Defines the base OHIF object
diff --git a/Packages/ohif-core/package.js b/Packages/ohif-core/package.js
index b2b4a1231..c732ca9f3 100644
--- a/Packages/ohif-core/package.js
+++ b/Packages/ohif-core/package.js
@@ -1,5 +1,7 @@
 Npm.depends({
     'isomorphic-base64': '1.0.2',
+    'jquery.hotkeys': '0.1.0',
+    loglevel: '1.4.1'
 });
 
 Package.describe({
@@ -17,6 +19,8 @@ Package.onUse(function(api) {
     api.use('underscore');
     api.use('templating');
     api.use('reactive-var');
+    api.use('session');
+    api.use('cultofcoders:persistent-session');
 
     // Router dependencies
     api.use('clinical:router@2.0.19', 'client');
@@ -38,6 +42,11 @@ Package.onUse(function(api) {
 
     api.mainModule('main.js', ['client', 'server']);
 
+    api.use([
+        'accounts-base',
+        'accounts-password'
+    ], 'server');
+
     // Client imports and routes
     api.addFiles('client/index.js', 'client');
 
diff --git a/Packages/ohif-core/server/index.js b/Packages/ohif-core/server/index.js
new file mode 100644
index 000000000..b3741506a
--- /dev/null
+++ b/Packages/ohif-core/server/index.js
@@ -0,0 +1,2 @@
+import './mongo.js';
+import './user.js';
diff --git a/Packages/ohif-measurements/package.js b/Packages/ohif-measurements/package.js
index 080fc5e10..80fbcb1ef 100644
--- a/Packages/ohif-measurements/package.js
+++ b/Packages/ohif-measurements/package.js
@@ -32,8 +32,6 @@ Package.onUse(function(api) {
     api.use('ohif:cornerstone');
     api.use('ohif:design');
     api.use('ohif:core');
-    api.use('ohif:select-tree');
-    api.use('ohif:log');
     api.use('ohif:studies');
     api.use('ohif:viewerbase');
 
diff --git a/Packages/ohif-servers/package.js b/Packages/ohif-servers/package.js
index 465d7ef52..4d126e1a9 100644
--- a/Packages/ohif-servers/package.js
+++ b/Packages/ohif-servers/package.js
@@ -16,7 +16,6 @@ Package.onUse(function(api) {
 
     // Our custom packages
     api.use('ohif:core');
-    api.use('ohif:log');
 
     // Client and server imports
     api.addFiles('both/index.js', [ 'client', 'server' ]);
diff --git a/Packages/ohif-studies/package.js b/Packages/ohif-studies/package.js
index 69bae79c1..cb6d7f8ec 100644
--- a/Packages/ohif-studies/package.js
+++ b/Packages/ohif-studies/package.js
@@ -24,7 +24,6 @@ Package.onUse(function(api) {
     api.use([
         'ohif:design',
         'ohif:core',
-        'ohif:log',
         'ohif:servers',
         'ohif:viewerbase',
         'ohif:wadoproxy'
diff --git a/Packages/ohif-study-list/package.js b/Packages/ohif-study-list/package.js
index cfdcbfdd5..e3abfc0a1 100644
--- a/Packages/ohif-study-list/package.js
+++ b/Packages/ohif-study-list/package.js
@@ -28,7 +28,6 @@ Package.onUse(function(api) {
     // Our custom packages
     api.use('ohif:design');
     api.use('ohif:core');
-    api.use('ohif:log');
     api.use('ohif:servers');
     api.use('ohif:viewerbase');
     api.use('ohif:wadoproxy');
diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js
index 304d504a0..ff8b5ba7f 100644
--- a/Packages/ohif-viewerbase/package.js
+++ b/Packages/ohif-viewerbase/package.js
@@ -34,7 +34,6 @@ Package.onUse(function(api) {
         'ohif:core',
         'ohif:cornerstone-settings',
         'ohif:hotkeys',
-        'ohif:log'
     ]);
 
     const assets = [
@@ -203,7 +202,6 @@ Package.onTest(function(api) {
         'ohif:design',
         'ohif:core',
         'ohif:hotkeys',
-        'ohif:log'
     ], 'client');
 
     /*
diff --git a/legacy/Packages/ohif-user-management/package.js b/legacy/Packages/ohif-user-management/package.js
index 901e0bc65..79f876c2a 100644
--- a/legacy/Packages/ohif-user-management/package.js
+++ b/legacy/Packages/ohif-user-management/package.js
@@ -27,6 +27,4 @@ Package.onUse(function(api) {
 
     // Client imports
     api.addFiles('client/index.js', 'client');
-
-    api.addFiles('server/createDemoUser.js', [ 'server' ]);
 });