diff --git a/lib/actions/app.coffee b/lib/actions/app.coffee
index edc6291f..cc959195 100644
--- a/lib/actions/app.coffee
+++ b/lib/actions/app.coffee
@@ -4,7 +4,7 @@ device = require('../device/device')
 table = require('../table/table')
 errors = require('../errors/errors')
 log = require('../log/log')
-server = require('../server/server')
+resin = require('../resin')
 widgets = require('../widgets/widgets')
 patterns = require('../patterns/patterns')
 applicationModel = require('../models/application')
@@ -63,7 +63,7 @@ exports.info = authHooks.failIfNotLoggedIn (id) ->
 exports.restart = authHooks.failIfNotLoggedIn (id) ->
 
 	# TODO: Move this URL to config
-	server.post("/application/#{id}/restart", errors.handle)
+	resin.server.post("/application/#{id}/restart", errors.handle)
 
 exports.remove = authHooks.failIfNotLoggedIn (id, program) ->
 	patterns.remove 'application', program.parent.yes, (callback) ->
diff --git a/lib/actions/device.coffee b/lib/actions/device.coffee
index 4dd566fd..5987cab8 100644
--- a/lib/actions/device.coffee
+++ b/lib/actions/device.coffee
@@ -3,7 +3,7 @@ getDeviceDisplayName = require('../device/device').getDisplayName
 log = require('../log/log')
 table = require('../table/table')
 errors = require('../errors/errors')
-server = require('../server/server')
+resin = require('../resin')
 widgets = require('../widgets/widgets')
 patterns = require('../patterns/patterns')
 authHooks = require('../hooks/auth')
@@ -32,4 +32,4 @@ exports.remove = authHooks.failIfNotLoggedIn (id, program) ->
 	, errors.handle
 
 exports.identify = authHooks.failIfNotLoggedIn (uuid) ->
-	server.post(config.urls.identify, { uuid }, errors.handle)
+	resin.server.post(config.urls.identify, { uuid }, errors.handle)
diff --git a/lib/actions/keys.coffee b/lib/actions/keys.coffee
index 773cefa6..d4b26f41 100644
--- a/lib/actions/keys.coffee
+++ b/lib/actions/keys.coffee
@@ -1,5 +1,5 @@
 _ = require('lodash')
-server = require('../server/server')
+resin = require('../resin')
 authHooks = require('../hooks/auth')
 log = require('../log/log')
 patterns = require('../patterns/patterns')
@@ -10,7 +10,7 @@ keyModel = require('../models/key')
 config = require('../config')
 
 exports.list = authHooks.failIfNotLoggedIn ->
-	server.get config.urls.keys, (error, response, keys) ->
+	resin.server.get config.urls.keys, (error, response, keys) ->
 		errors.handle(error) if error?
 		log.out table.horizontal keys, (key) ->
 			delete key.public_key
@@ -23,7 +23,7 @@ exports.info = authHooks.failIfNotLoggedIn (id) ->
 	# TODO: We don't have a way to query a single ssh key yet.
 	# As a workaround, we request all of them, and filter
 	# the one we need. Fix once we have a better way.
-	server.get config.urls.keys, (error, response, keys) ->
+	resin.server.get config.urls.keys, (error, response, keys) ->
 		errors.handle(error) if error?
 		key = _.findWhere(keys, { id })
 		if not key?
@@ -34,5 +34,5 @@ exports.info = authHooks.failIfNotLoggedIn (id) ->
 
 exports.remove = authHooks.failIfNotLoggedIn (id, program) ->
 	patterns.remove 'key', program.parent.yes, (callback) ->
-		server.delete("/user/keys/#{id}", callback)
+		resin.server.delete("/user/keys/#{id}", callback)
 	, errors.handle
diff --git a/lib/auth/auth.coffee b/lib/auth/auth.coffee
index f88435ee..d40b0473 100644
--- a/lib/auth/auth.coffee
+++ b/lib/auth/auth.coffee
@@ -1,11 +1,11 @@
 async = require('async')
 _ = require('lodash')
 
-server = require('../server/server')
+resin = require('../resin')
 token = require('../token/token')
 
 exports.authenticate = (credentials, callback) ->
-	server.post '/login_', credentials, (error, response) ->
+	resin.server.post '/login_', credentials, (error, response) ->
 		return callback(error, response?.body)
 
 exports.login = (credentials, callback) ->
diff --git a/lib/models/_canvas.coffee b/lib/models/_canvas.coffee
index 144b6010..24734814 100644
--- a/lib/models/_canvas.coffee
+++ b/lib/models/_canvas.coffee
@@ -2,8 +2,8 @@ _ = require('lodash')
 Canvas = require('resin-platform-api')
 Promise = require('bluebird')
 config = require('../config')
-server = require('../server/server')
-promisifiedServerRequest = Promise.promisify(server.request, server)
+resin = require('../resin')
+promisifiedServerRequest = Promise.promisify(resin.server.request)
 
 class CanvasRequestService extends Canvas(_, Promise)
 	_request: (params) ->
diff --git a/lib/resin/index.coffee b/lib/resin/index.coffee
new file mode 100644
index 00000000..c91d4ab2
--- /dev/null
+++ b/lib/resin/index.coffee
@@ -0,0 +1,2 @@
+module.exports =
+	server: require('./server/server')
diff --git a/lib/server/server.coffee b/lib/resin/server/server.coffee
similarity index 92%
rename from lib/server/server.coffee
rename to lib/resin/server/server.coffee
index 7a88f59e..6e2fb2b8 100644
--- a/lib/server/server.coffee
+++ b/lib/resin/server/server.coffee
@@ -2,9 +2,9 @@ _ = require('lodash')
 request = require('request')
 urlResolve = require('url').resolve
 async = require('async')
-connection = require('../connection/connection')
-config = require('../config')
-token = require('../token/token')
+connection = require('../../connection/connection')
+config = require('../../config')
+token = require('../../token/token')
 
 exports.request = (options = {}, callback) ->
 
diff --git a/lib/server/server.spec.coffee b/lib/resin/server/server.spec.coffee
similarity index 96%
rename from lib/server/server.spec.coffee
rename to lib/resin/server/server.spec.coffee
index 2ee4d3e1..71b99f50 100644
--- a/lib/server/server.spec.coffee
+++ b/lib/resin/server/server.spec.coffee
@@ -2,11 +2,11 @@ expect = require('chai').expect
 nock = require('nock')
 url = require('url')
 server = require('./server')
-config = require('../config')
-token = require('../token/token')
-data = require('../data/data')
-mock = require('../../tests/utils/mock')
-johnDoeFixture = require('../../tests/fixtures/johndoe.json')
+config = require('../../config')
+token = require('../../token/token')
+data = require('../../data/data')
+mock = require('../../../tests/utils/mock')
+johnDoeFixture = require('../../../tests/fixtures/johndoe.json')
 
 TEST_URI = config.remoteUrl