diff --git a/tasks/gulp-console.js b/tasks/gulp-console.js
index 95a1962fd4..768df81e3b 100644
--- a/tasks/gulp-console.js
+++ b/tasks/gulp-console.js
@@ -2,7 +2,7 @@ import 'coffee-script';
 
 import mongoose from 'mongoose';
 import autoinc  from 'mongoose-id-autoinc';
-import logging  from '../website/src/libs/logging';
+import logging  from '../website/src/libs/api-v2/logging';
 import nconf    from 'nconf';
 import utils    from '../website/src/libs/utils';
 import repl     from 'repl';
diff --git a/website/src/controllers/api-v2/challenges.js b/website/src/controllers/api-v2/challenges.js
index 72f28d9f3d..21104f2885 100644
--- a/website/src/controllers/api-v2/challenges.js
+++ b/website/src/controllers/api-v2/challenges.js
@@ -7,7 +7,7 @@ var shared = require('../../../../common');
 var User = require('./../../models/user').model;
 var Group = require('./../../models/group').model;
 var Challenge = require('./../../models/challenge').model;
-var logging = require('./../../libs/logging');
+var logging = require('./../../libs/api-v2/logging');
 var csv = require('express-csv');
 var utils = require('../../libs/utils');
 var api = module.exports;
diff --git a/website/src/controllers/api-v2/user.js b/website/src/controllers/api-v2/user.js
index b3a83dd80c..b8d3dd7bf1 100644
--- a/website/src/controllers/api-v2/user.js
+++ b/website/src/controllers/api-v2/user.js
@@ -12,7 +12,7 @@ var analytics = utils.analytics;
 var Group = require('./../../models/group').model;
 var Challenge = require('./../../models/challenge').model;
 var moment = require('moment');
-var logging = require('./../../libs/logging');
+var logging = require('./../../libs/api-v2/logging');
 var acceptablePUTPaths;
 var api = module.exports;
 var firebase = require('../../libs/firebase');
diff --git a/website/src/controllers/payments/paypal.js b/website/src/controllers/payments/paypal.js
index 30970f72cf..19f9cc4136 100644
--- a/website/src/controllers/payments/paypal.js
+++ b/website/src/controllers/payments/paypal.js
@@ -5,7 +5,7 @@ var _ = require('lodash');
 var url = require('url');
 var User = require('mongoose').model('User');
 var payments = require('./index');
-var logger = require('../../libs/logging');
+var logger = require('../../libs/api-v2/logging');
 var ipn = require('paypal-ipn');
 var paypal = require('paypal-rest-sdk');
 var shared = require('../../../../common');
diff --git a/website/src/index.js b/website/src/index.js
index 3f21cedbfb..9454b0c46b 100644
--- a/website/src/index.js
+++ b/website/src/index.js
@@ -2,12 +2,12 @@
 require('babel/register');
 
 // TODO remove this once we've fully converted over
-require('coffee-script'); 
+require('coffee-script');
 
 // Only do the minimal amount of work before forking just in case of a dyno restart
 var cluster = require('cluster');
 var nconf = require('nconf');
-var logging = require('./libs/logging');
+var logging = require('./libs/api-v2/logging');
 
 // Initialize configuration
 var setupNconf = require('./libs/api-v3/setupNconf');
@@ -33,4 +33,4 @@ if (cores !== 0 && cluster.isMaster && (IS_DEV || IS_PROD)) {
   });
 } else {
   module.exports = require('./server.js');
-}
\ No newline at end of file
+}
diff --git a/website/src/libs/logging.js b/website/src/libs/api-v2/logging.js
similarity index 100%
rename from website/src/libs/logging.js
rename to website/src/libs/api-v2/logging.js
diff --git a/website/src/libs/utils.js b/website/src/libs/utils.js
index a39fa639ff..1016a35daf 100644
--- a/website/src/libs/utils.js
+++ b/website/src/libs/utils.js
@@ -16,7 +16,7 @@ module.exports.sendEmail = function(mailData) {
     }
   });
   smtpTransport.sendMail(mailData, function(error, response){
-      var logging = require('./logging');
+      var logging = require('./api-v2/logging');
     if(error) logging.error(error);
     else logging.info("Message sent: " + response.message);
     smtpTransport.close(); // shut down the connection pool, no more messages
diff --git a/website/src/middlewares/errorHandler.js b/website/src/middlewares/errorHandler.js
index 9a82316a75..36daacdf2b 100644
--- a/website/src/middlewares/errorHandler.js
+++ b/website/src/middlewares/errorHandler.js
@@ -1,4 +1,4 @@
-var logging = require('../libs/logging');
+var logging = require('../libs/api-v2/logging');
 
 module.exports = function(err, req, res, next) {
   //res.locals.domain.emit('error', err);
diff --git a/website/src/models/group.js b/website/src/models/group.js
index 7ba8dac173..b2da0011d7 100644
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -4,7 +4,7 @@ var User = require('./user').model;
 var shared = require('../../../common');
 var _ = require('lodash');
 var async = require('async');
-var logging = require('../libs/logging');
+var logging = require('../libs/api-v2/logging');
 var Challenge = require('./../models/challenge').model;
 var firebase = require('../libs/firebase');
 
diff --git a/website/src/server.js b/website/src/server.js
index 74c8e87e5e..224022b192 100644
--- a/website/src/server.js
+++ b/website/src/server.js
@@ -1,7 +1,7 @@
 // TODO cleanup all comments when finished API v3
 
 import nconf from 'nconf';
-import logging from './libs/logging';
+import logging from './libs/api-v2/logging';
 import utils from './libs/utils';
 import express from 'express';
 import http from 'http';
@@ -161,4 +161,4 @@ server.listen(app.get('port'), () => {
   return logging.info(`Express server listening on port ${app.get('port')}`);
 });
 
-export default server;
\ No newline at end of file
+export default server;