diff --git a/website/src/controllers/auth.js b/website/src/controllers/auth.js
index 6586ce37ad..ac553c34a5 100644
--- a/website/src/controllers/auth.js
+++ b/website/src/controllers/auth.js
@@ -1,7 +1,7 @@
 var _ = require('lodash');
 var validator = require('validator');
 var passport = require('passport');
-var shared = require('../../common');
+var shared = require('../../../common');
 var async = require('async');
 var utils = require('../utils');
 var nconf = require('nconf');
diff --git a/website/src/controllers/challenges.js b/website/src/controllers/challenges.js
index ea5aa11e96..1f4a7da2e1 100644
--- a/website/src/controllers/challenges.js
+++ b/website/src/controllers/challenges.js
@@ -3,7 +3,7 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../common');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var Challenge = require('./../models/challenge').model;
diff --git a/website/src/controllers/groups.js b/website/src/controllers/groups.js
index e3f4d1d170..7e02096b86 100644
--- a/website/src/controllers/groups.js
+++ b/website/src/controllers/groups.js
@@ -8,7 +8,7 @@ var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
 var utils = require('./../utils');
-var shared = require('../../common');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var Challenge = require('./../models/challenge').model;
diff --git a/website/src/controllers/hall.js b/website/src/controllers/hall.js
index 6389b72e9a..8754bc2e94 100644
--- a/website/src/controllers/hall.js
+++ b/website/src/controllers/hall.js
@@ -1,7 +1,7 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../common');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var api = module.exports;
diff --git a/website/src/controllers/members.js b/website/src/controllers/members.js
index bc695dbb05..77083428a4 100644
--- a/website/src/controllers/members.js
+++ b/website/src/controllers/members.js
@@ -4,7 +4,7 @@ var partyFields = require('./groups').partyFields
 var api = module.exports;
 var async = require('async');
 var _ = require('lodash');
-var shared = require('../../common');
+var shared = require('../../../common');
 
 var fetchMember = function(uuid, restrict){
   return function(cb){
diff --git a/website/src/controllers/payments/index.js b/website/src/controllers/payments/index.js
index c900e94ada..27bc261f80 100644
--- a/website/src/controllers/payments/index.js
+++ b/website/src/controllers/payments/index.js
@@ -1,6 +1,6 @@
 /* @see ./routes.coffee for routing*/
 var _ = require('lodash');
-var shared = require('../../../common');
+var shared = require('../../../../common');
 var nconf = require('nconf');
 var utils = require('./../../utils');
 var moment = require('moment');
diff --git a/website/src/controllers/payments/paypal.js b/website/src/controllers/payments/paypal.js
index 9b71e279bd..094171e3af 100644
--- a/website/src/controllers/payments/paypal.js
+++ b/website/src/controllers/payments/paypal.js
@@ -8,7 +8,7 @@ var payments = require('./index');
 var logger = require('../../logging');
 var ipn = require('paypal-ipn');
 var paypal = require('paypal-rest-sdk');
-var shared = require('../../../common');
+var shared = require('../../../../common');
 var mongoose = require('mongoose');
 var cc = require('coupon-code');
 
diff --git a/website/src/controllers/payments/paypalBillingSetup.js b/website/src/controllers/payments/paypalBillingSetup.js
index 94668ab2b8..88e0650d44 100644
--- a/website/src/controllers/payments/paypalBillingSetup.js
+++ b/website/src/controllers/payments/paypalBillingSetup.js
@@ -8,7 +8,7 @@ var nconf = require('nconf');
 _ = require('lodash');
 nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../../../config.json')));
 var paypal = require('paypal-rest-sdk');
-var blocks = require('../../../common').content.subscriptionBlocks;
+var blocks = require('../../../../common').content.subscriptionBlocks;
 var live = nconf.get('PAYPAL:mode')=='live';
 
 var OP = 'create'; // list create update remove
diff --git a/website/src/controllers/payments/stripe.js b/website/src/controllers/payments/stripe.js
index 3c4f2f2631..e86fa4ea86 100644
--- a/website/src/controllers/payments/stripe.js
+++ b/website/src/controllers/payments/stripe.js
@@ -3,7 +3,7 @@ var stripe = require("stripe")(nconf.get('STRIPE_API_KEY'));
 var async = require('async');
 var payments = require('./index');
 var User = require('mongoose').model('User');
-var shared = require('../../../common');
+var shared = require('../../../../common');
 var mongoose = require('mongoose');
 var cc = require('coupon-code');
 
diff --git a/website/src/controllers/user.js b/website/src/controllers/user.js
index fdd8b7444e..c705fe7553 100644
--- a/website/src/controllers/user.js
+++ b/website/src/controllers/user.js
@@ -5,7 +5,7 @@ var ipn = require('paypal-ipn');
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../common');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var utils = require('./../utils');
 var ga = utils.ga;
diff --git a/website/src/i18n.js b/website/src/i18n.js
index 159d2cc848..9d21e3021b 100644
--- a/website/src/i18n.js
+++ b/website/src/i18n.js
@@ -2,10 +2,10 @@ var fs = require('fs'),
     path = require('path'),
     _ = require('lodash'),
     User = require('./models/user').model,
-    shared = require('../common'),
+    shared = require('../../common'),
     translations = {};
 
-var localePath = path.join(__dirname, "/../common/locales/")
+var localePath = path.join(__dirname, "/../../common/locales/")
 
 var loadTranslations = function(locale){
   var files = fs.readdirSync(path.join(localePath, locale));
diff --git a/website/src/middleware.js b/website/src/middleware.js
index 2fa044748c..f44c67a9e3 100644
--- a/website/src/middleware.js
+++ b/website/src/middleware.js
@@ -8,7 +8,7 @@ var logging = require('./logging');
 var domainMiddleware = require('domain-middleware');
 var cluster = require('cluster');
 var i18n = require('./i18n.js');
-var shared = require('../common');
+var shared = require('../../common');
 var request = require('request');
 var os = require('os');
 var moment = require('moment');
@@ -148,7 +148,7 @@ var getBuildUrl = function(url){
   return '/' + url;
 }
 
-var manifestFiles = require("../common/public/manifest.json");
+var manifestFiles = require("../public/manifest.json");
 
 var getManifestFiles = function(page){
   var files = manifestFiles[page];
diff --git a/website/src/models/challenge.js b/website/src/models/challenge.js
index 1806a27292..d44b798bc0 100644
--- a/website/src/models/challenge.js
+++ b/website/src/models/challenge.js
@@ -1,6 +1,6 @@
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('../../common');
+var shared = require('../../../common');
 var _ = require('lodash');
 var TaskSchemas = require('./task');
 
diff --git a/website/src/models/group.js b/website/src/models/group.js
index bf88776806..d776377488 100644
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -1,6 +1,6 @@
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('../../common');
+var shared = require('../../../common');
 var _ = require('lodash');
 var async = require('async');
 var logging = require('../logging');
diff --git a/website/src/models/task.js b/website/src/models/task.js
index c19113207c..2646263e80 100644
--- a/website/src/models/task.js
+++ b/website/src/models/task.js
@@ -6,7 +6,7 @@
 // ------------
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('../../common');
+var shared = require('../../../common');
 var _ = require('lodash');
 
 // Task Schema
diff --git a/website/src/models/user.js b/website/src/models/user.js
index 23d97e88c2..86374cd959 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -6,7 +6,7 @@
 // ------------
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('../../common');
+var shared = require('../../../common');
 var _ = require('lodash');
 var TaskSchemas = require('./task');
 var Challenge = require('./challenge').model;
diff --git a/website/src/routes/apiv2.coffee b/website/src/routes/apiv2.coffee
index d99536ac79..21bf382782 100644
--- a/website/src/routes/apiv2.coffee
+++ b/website/src/routes/apiv2.coffee
@@ -19,7 +19,7 @@ nconf = require("nconf")
 middleware = require("../middleware")
 cron = user.cron
 _ = require('lodash')
-content = require('../../common').content
+content = require('../../../common').content
 i18n = require('../i18n')
 
 
diff --git a/website/src/server.js b/website/src/server.js
index 5d413b85b6..f98527eb81 100644
--- a/website/src/server.js
+++ b/website/src/server.js
@@ -25,7 +25,7 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
   var path = require("path");
   var swagger = require("swagger-node-express");
   var autoinc = require('mongoose-id-autoinc');
-  var shared = require('../common');
+  var shared = require('../../common');
 
   // Setup translations
   var i18n = require('./i18n');