diff --git a/src/cli.ts b/src/cli.ts
index de702b7..4342571 100755
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -58,7 +58,7 @@ prog.command('build [dest]')
 				process.env.PORT = process.env.PORT || ${opts.port || 3000};
 
 				console.log('Starting server on port ' + process.env.PORT);
-				require('./server.js');
+				require('./server');
 			`.replace(/^\t+/gm, '').trim());
 
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);
diff --git a/src/rollup.ts b/src/rollup.ts
index 3910f93..cb4902a 100644
--- a/src/rollup.ts
+++ b/src/rollup.ts
@@ -24,12 +24,14 @@ export default {
 
 	server: {
 		input: () => {
-			return `${locations.src()}/server.js`
+			return {
+				index: `${locations.src()}/server.js`
+			};
 		},
 
 		output: () => {
 			return {
-				dir: locations.dest(),
+				dir: `${locations.dest()}/server`,
 				format: 'cjs',
 				sourcemap: dev()
 			};
diff --git a/src/webpack.ts b/src/webpack.ts
index 6fc0ccb..626fc18 100644
--- a/src/webpack.ts
+++ b/src/webpack.ts
@@ -23,13 +23,13 @@ export default {
 	server: {
 		entry: () => {
 			return {
-				server: `${locations.src()}/server`
+				index: `${locations.src()}/server`
 			};
 		},
 
 		output: () => {
 			return {
-				path: locations.dest(),
+				path: `${locations.dest()}/server`,
 				filename: '[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				libraryTarget: 'commonjs2'