diff --git a/gulpfile.coffee b/gulpfile.coffee
index ccb5b7df..e2ec101a 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -15,7 +15,7 @@ OPTIONS =
 	files:
 		coffee: [ 'lib/**/*.coffee', 'gulpfile.coffee' ]
 		app: [ 'lib/**/*.coffee', '!lib/**/*.spec.coffee' ]
-		tests: 'lib/**/*.spec.coffee'
+		tests: 'tests/**/*.spec.coffee'
 		json: [ 'lib/**/*.json', 'package.json' ]
 		man: 'man/**/*.md'
 	directories:
diff --git a/lib/app.coffee b/lib/app.coffee
index 495bc0a8..c7b7dcd1 100644
--- a/lib/app.coffee
+++ b/lib/app.coffee
@@ -4,7 +4,7 @@ capitano = require('capitano')
 resin = require('resin-sdk')
 nplugm = require('nplugm')
 actions = require('./actions')
-errors = require('./errors/errors')
+errors = require('./errors')
 
 capitano.permission 'user', (done) ->
 	resin.auth.isLoggedIn (isLoggedIn) ->
diff --git a/lib/errors/errors.coffee b/lib/errors.coffee
similarity index 100%
rename from lib/errors/errors.coffee
rename to lib/errors.coffee
diff --git a/lib/errors/errors.spec.coffee b/tests/errors.spec.coffee
similarity index 98%
rename from lib/errors/errors.spec.coffee
rename to tests/errors.spec.coffee
index 8145eb9b..9c4e1f7b 100644
--- a/lib/errors/errors.spec.coffee
+++ b/tests/errors.spec.coffee
@@ -3,7 +3,7 @@ expect = chai.expect
 chai.use(require('sinon-chai'))
 _ = require('lodash')
 sinon = require('sinon')
-errors = require('./errors')
+errors = require('../lib/errors')
 
 describe 'Errors:', ->