diff --git a/connect.js b/connect.js
index 9f45c0a..60af11b 100644
--- a/connect.js
+++ b/connect.js
@@ -5,10 +5,10 @@ const path = require('path');
 const glob = require('glob');
 const rimraf = require('rimraf');
 const mkdirp = require('mkdirp');
-const create_routes = require('./utils/create_routes.js');
+const create_routes = require('./lib/utils/create_routes.js');
 const templates = require('./lib/templates.js');
-const create_app = require('./utils/create_app.js');
-const create_webpack_compiler = require('./utils/create_webpack_compiler.js');
+const create_app = require('./lib/utils/create_app.js');
+const create_webpack_compiler = require('./lib/utils/create_webpack_compiler.js');
 const escape_html = require('escape-html');
 const { src, dest, dev } = require('./lib/config.js');
 
diff --git a/lib/route_manager.js b/lib/route_manager.js
index d551143..d829f30 100644
--- a/lib/route_manager.js
+++ b/lib/route_manager.js
@@ -1,5 +1,5 @@
 const glob = require('glob');
-const create_routes = require('../utils/create_routes.js');
+const create_routes = require('./utils/create_routes.js');
 const { src } = require('./config.js');
 
 const route_manager = {
diff --git a/utils/create_app.js b/lib/utils/create_app.js
similarity index 80%
rename from utils/create_app.js
rename to lib/utils/create_app.js
index 8f3b2b9..9e2fc34 100644
--- a/utils/create_app.js
+++ b/lib/utils/create_app.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const template = fs.readFileSync(path.resolve(__dirname, '../templates/main.js'), 'utf-8');
+const template = fs.readFileSync(path.resolve(__dirname, '../../templates/main.js'), 'utf-8');
 
 module.exports = function create_app(src, dest, routes, options) {
 	// TODO in dev mode, watch files
@@ -18,7 +18,7 @@ module.exports = function create_app(src, dest, routes, options) {
 		.join(',\n\t');
 
 	const main = template
-		.replace('__app__', path.resolve(__dirname, '../runtime/app.js'))
+		.replace('__app__', path.resolve(__dirname, '../../runtime/app.js'))
 		.replace('__selector__', options.selector || 'main')
 		.replace('__routes__', code);
 
diff --git a/utils/create_routes.js b/lib/utils/create_routes.js
similarity index 100%
rename from utils/create_routes.js
rename to lib/utils/create_routes.js
diff --git a/utils/create_routes.test.js b/lib/utils/create_routes.test.js
similarity index 100%
rename from utils/create_routes.test.js
rename to lib/utils/create_routes.test.js
diff --git a/utils/create_webpack_compiler.js b/lib/utils/create_webpack_compiler.js
similarity index 98%
rename from utils/create_webpack_compiler.js
rename to lib/utils/create_webpack_compiler.js
index a033d5c..a8528ce 100644
--- a/utils/create_webpack_compiler.js
+++ b/lib/utils/create_webpack_compiler.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const glob = require('glob');
 const webpack = require('webpack');
-const templates = require('../lib/templates.js');
+const templates = require('../templates.js');
 
 module.exports = function create_webpack_compiler(dest, routes, dev) {
 	const compiler = {};