moved server.js entry to root and updated build

server.js

@@ -5,7 +5,7 @@ const expressHandlebars = require('express-handlebars');
 const Handlebars = require('handlebars');
 const helmet = require('helmet');
 const passport = require('passport');
-const { serializeSpeechUser, deserializeSpeechUser } = require('./helpers/authHelpers.js');
+const { serializeSpeechUser, deserializeSpeechUser } = require('./server/helpers/authHelpers.js');
 const cookieSession = require('cookie-session');
 const http = require('http');
 // logging dependencies
@@ -13,15 +13,15 @@ const logger = require('winston');
 
 function SpeechServer () {
   this.configureMysql = (mysqlConfig) => {
-    require('../config/mysqlConfig.js').configure(mysqlConfig);
+    require('./config/mysqlConfig.js').configure(mysqlConfig);
   };
   this.configureSite = (siteConfig) => {
-    require('../config/siteConfig.js').configure(siteConfig);
+    require('./config/siteConfig.js').configure(siteConfig);
     this.sessionKey = siteConfig.auth.sessionKey;
     this.PORT = siteConfig.details.port;
   };
   this.configureSlack = (slackConfig) => {
-    require('../config/slackConfig.js').configure(slackConfig);
+    require('./config/slackConfig.js').configure(slackConfig);
   };
   this.createApp = () => {
     // create an Express application
@@ -43,8 +43,8 @@ function SpeechServer () {
     // configure passport
     passport.serializeUser(serializeSpeechUser);
     passport.deserializeUser(deserializeSpeechUser);
-    const localSignupStrategy = require('./passport/local-signup.js');
+    const localSignupStrategy = require('./server/passport/local-signup.js');
-    const localLoginStrategy = require('./passport/local-login.js');
+    const localLoginStrategy = require('./server/passport/local-login.js');
     passport.use('local-signup', localSignupStrategy);
     passport.use('local-login', localLoginStrategy);
     // initialize passport
@@ -65,22 +65,22 @@ function SpeechServer () {
     app.set('view engine', 'handlebars');
 
     // set the routes on the app
-    require('./routes/auth-routes.js')(app);
+    require('./server/routes/auth-routes.js')(app);
-    require('./routes/api-routes.js')(app);
+    require('./server/routes/api-routes.js')(app);
-    require('./routes/page-routes.js')(app);
+    require('./server/routes/page-routes.js')(app);
-    require('./routes/asset-routes.js')(app);
+    require('./server/routes/asset-routes.js')(app);
-    require('./routes/fallback-routes.js')(app);
+    require('./server/routes/fallback-routes.js')(app);
 
     this.app = app;
   };
   this.initialize = () => {
-    require('./helpers/configureLogger.js')(logger);
+    require('./server/helpers/configureLogger.js')(logger);
-    require('./helpers/configureSlack.js')(logger);
+    require('./server/helpers/configureSlack.js')(logger);
     this.createApp();
     this.server = http.Server(this.app);
   };
   this.start = () => {
-    const db = require('./models/index');
+    const db = require('./server/models/index');
     // sync sequelize
     db.sequelize.sync()
       // start the server

webpack.server.common.js

@@ -8,7 +8,7 @@ module.exports = {
     __dirname: false,
   },
   externals: [nodeExternals()],
-  entry    : ['babel-polyfill', 'whatwg-fetch', './server/server.js'],
+  entry    : ['babel-polyfill', 'whatwg-fetch', './server.js'],
   output   : {
     path         : Path.join(__dirname, '/'),
     publicPath   : '/',