diff --git a/gulpfile.js b/gulpfile.js
index 0bc7f50185..c858cc766d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,4 @@
-require('babel/register');
+require('babel-core/register');
 var gulp = require('gulp'),
   path = require('path'),
 
@@ -54,7 +54,7 @@ var paths = {
 
   node: {
     src: './client',
-    dest: 'server/server'
+    dest: 'common/app'
   },
 
   syncWatch: [
@@ -100,15 +100,15 @@ gulp.task('loopback', function() {
 });
 
 gulp.task('pack-client', function() {
-  return gulp.src(paths.client.src)
+  return gulp.src(webpackConfig.entry)
     .pipe(webpack(webpackConfig))
-    .pipe(gulp.dest(paths.client.dest));
+    .pipe(gulp.dest(webpackConfig.output.path));
 });
 
 gulp.task('pack-node', function() {
-  return gulp.src(paths.node.src)
+  return gulp.src(webpackConfigNode.entry)
     .pipe(webpack(webpackConfigNode))
-    .pipe(gulp.dest(paths.node.dest));
+    .pipe(gulp.dest(webpackConfigNode.output.path));
 });
 
 gulp.task('pack', ['pack-client', 'pack-node']);
diff --git a/webpack.config.js b/webpack.config.js
index e5ee22cae5..38404f7112 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,7 @@ module.exports = {
   devtool: 'sourcemap',
   entry: './client',
   output: {
-    filename: 'fcc.js',
+    filename: 'bundle.js',
     path: path.join(__dirname, '/public/js'),
     publicPath: 'public/'
   },
diff --git a/webpack.config.node.js b/webpack.config.node.js
index b74fc5d529..f422032d85 100644
--- a/webpack.config.node.js
+++ b/webpack.config.node.js
@@ -14,12 +14,12 @@ var nodeModules = fs.readdirSync('node_modules')
 module.exports = {
   devtool: 'sourcemap',
   target: 'node',
-  entry: './server/appEntry',
+  entry: './common/app',
   // keeps webpack from bundling modules
   externals: nodeModules,
   output: {
-    filename: 'fcc.js',
-    path: path.join(__dirname, '/public/js'),
+    filename: 'app-stream.bundle.js',
+    path: path.join(__dirname, '/server'),
     publicPath: 'public/'
   },
   module: {