diff --git a/Makefile b/Makefile
index 6b6dacf..97f9b40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,17 @@
 .SILENT:
-.PHONY: build watch docs test deploy
+.PHONY: docs test deploy
 
 BIN = ./node_modules/.bin
+
+LIB_PATH = ./lib
+TEST_PATH = ./test
 REPORTER = spec
-TEST_DIR = ./test
 
 deploy:
 	git push heroku master
 
 docs:
-	$(BIN)/docco $(shell find $(COFFEE_SRC) -name '*.coffee')
+	$(BIN)/docco app.coffee $(shell find $(LIB_PATH) -name '*.coffee')
 
 test:
-	$(BIN)/mocha -R $(REPORTER) $(shell find $(TEST_DIR) -name '*.test.coffee')
+	$(BIN)/mocha -R $(REPORTER) $(shell find $(TEST_PATH) -name '*.test.coffee')
diff --git a/Procfile b/Procfile
index 9e9c9c3..2dcde33 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: coffee server.coffee
\ No newline at end of file
+web: coffee app.coffee
\ No newline at end of file
diff --git a/app.coffee b/app.coffee
new file mode 100644
index 0000000..e2173e7
--- /dev/null
+++ b/app.coffee
@@ -0,0 +1,38 @@
+# Module Dependencies.
+express = require 'express'
+
+# Create server instance.
+app = module.exports = express.createServer()
+
+# Configuration.
+app.configure ->
+  app.set 'views', __dirname + '/views'
+  app.set 'view engine', 'coffee'
+  app.register '.coffee', require('coffeekup').adapters.express
+  app.use express.bodyParser()
+  app.use express.methodOverride()
+  app.use express.static(__dirname + '/public')
+
+app.configure 'development', ->
+  app.use express.errorHandler(dumpExceptions: true, showStack: true)
+
+app.configure 'production', ->
+  app.use express.errorHandler()
+  app.use require('./lib/middleware/host_redirect')
+    "www.heartb.it": "http://heartb.it/"
+
+
+# Routes
+app.get '/', (req, res) ->
+  res.render 'index', format: true
+
+# 404 Fallback
+app.get '*', (req, res) ->
+  res.render '404', format: true
+
+# Set port and start server.
+app.listen process.env.PORT || 3000
+
+# Print debug
+console.log "Express app listening on port %d in %s mode",
+  app.address().port, app.settings.env
diff --git a/middleware/host_redirect.coffee b/lib/middleware/host_redirect.coffee
similarity index 100%
rename from middleware/host_redirect.coffee
rename to lib/middleware/host_redirect.coffee
diff --git a/server.coffee b/server.coffee
deleted file mode 100644
index 1bab051..0000000
--- a/server.coffee
+++ /dev/null
@@ -1,38 +0,0 @@
-# Module Dependencies.
-express = require 'express'
-
-# Create server instance.
-server = module.exports = express.createServer()
-
-# Configuration.
-server.configure ->
-  server.set 'views', __dirname + '/views'
-  server.set 'view engine', 'coffee'
-  server.register '.coffee', require('coffeekup').adapters.express
-  server.use express.bodyParser()
-  server.use express.methodOverride()
-  server.use express.static(__dirname + '/public')
-
-server.configure 'development', ->
-  server.use express.errorHandler(dumpExceptions: true, showStack: true)
-
-server.configure 'production', ->
-  server.use express.errorHandler()
-  server.use require('./middleware/host_redirect')
-    "www.heartb.it": "http://heartb.it/"
-
-
-# Routes
-server.get '/', (req, res) ->
-  res.render 'index', format: true
-
-# 404 Fallback
-server.get '*', (req, res) ->
-  res.render '404', format: true
-
-# Set port and start server.
-server.listen process.env.PORT || 3000
-
-# Print debug
-console.log "Express server listening on port %d in %s mode",
-  server.address().port, server.settings.env
diff --git a/test/middleware/host_redirect.test.coffee b/test/middleware/host_redirect.test.coffee
index 2647554..bb43909 100644
--- a/test/middleware/host_redirect.test.coffee
+++ b/test/middleware/host_redirect.test.coffee
@@ -1,6 +1,6 @@
 require 'should'
 
-host_redirect = require '../../middleware/host_redirect'
+host_redirect = require '../../lib/middleware/host_redirect'
 
 describe 'host_redirect', ->