diff --git a/lib/roles/device/plugins/heartbeat.js b/lib/roles/device/plugins/heartbeat.js
index 493a59cd..a63201a2 100644
--- a/lib/roles/device/plugins/heartbeat.js
+++ b/lib/roles/device/plugins/heartbeat.js
@@ -4,7 +4,7 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./push'))
+  .dependency(require('../support/push'))
   .define(function(options, push) {
     function heartbeat() {
       push.send([
diff --git a/lib/roles/device/plugins/http.js b/lib/roles/device/plugins/http.js
index 803d9eb4..1faeeb23 100644
--- a/lib/roles/device/plugins/http.js
+++ b/lib/roles/device/plugins/http.js
@@ -12,8 +12,8 @@ var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, quit, remote) {
     var log = logger.createLogger('device:plugins:http')
diff --git a/lib/roles/device/plugins/identity.js b/lib/roles/device/plugins/identity.js
index d65eaf3a..11126ab6 100644
--- a/lib/roles/device/plugins/identity.js
+++ b/lib/roles/device/plugins/identity.js
@@ -4,7 +4,7 @@ var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
+  .dependency(require('../support/adb'))
   .define(function(options, adb) {
     var log = logger.createLogger('device:plugins:identity')
 
diff --git a/lib/roles/device/plugins/input.js b/lib/roles/device/plugins/input.js
index ec87eed8..0e6b7b31 100644
--- a/lib/roles/device/plugins/input.js
+++ b/lib/roles/device/plugins/input.js
@@ -11,9 +11,9 @@ var streamutil = require('../../../util/streamutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/inputagent'))
   .define(function(options, adb, router, quit, apk) {
     var log = logger.createLogger('device:plugins:input')
diff --git a/lib/roles/device/plugins/logcat.js b/lib/roles/device/plugins/logcat.js
index 514aa578..aa0fe5f1 100644
--- a/lib/roles/device/plugins/logcat.js
+++ b/lib/roles/device/plugins/logcat.js
@@ -5,9 +5,9 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .define(function(options, adb, router, quit) {
     var log = logger.createLogger('device:plugins:logcat')
 
diff --git a/lib/roles/device/plugins/logsender.js b/lib/roles/device/plugins/logsender.js
index c2214868..c7228f2d 100644
--- a/lib/roles/device/plugins/logsender.js
+++ b/lib/roles/device/plugins/logsender.js
@@ -5,7 +5,7 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./push'))
+  .dependency(require('../support/push'))
   .define(function(options, push) {
     // Forward all logs
     logger.on('entry', function(entry) {
diff --git a/lib/roles/device/plugins/owner.js b/lib/roles/device/plugins/owner.js
index bf06fa9e..d43dcd06 100644
--- a/lib/roles/device/plugins/owner.js
+++ b/lib/roles/device/plugins/owner.js
@@ -7,14 +7,14 @@ var wireutil = require('../../../wire/util')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./router'))
   .dependency(require('./identity'))
-  .dependency(require('./push'))
-  .dependency(require('./sub'))
-  .dependency(require('./channels'))
   .dependency(require('./input'))
-  .dependency(require('./quit'))
-  .define(function(options, router, identity, push, sub, channels, input, quit) {
+  .dependency(require('../support/router'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/sub'))
+  .dependency(require('../support/channels'))
+  .dependency(require('../support/quit'))
+  .define(function(options, identity, input, router, push, sub, channels, quit) {
     var log = logger.createLogger('device:plugins:owner')
     var owner = null
 
diff --git a/lib/roles/device/plugins/shell.js b/lib/roles/device/plugins/shell.js
index b0606170..25790848 100644
--- a/lib/roles/device/plugins/shell.js
+++ b/lib/roles/device/plugins/shell.js
@@ -6,10 +6,10 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./push'))
-  .dependency(require('./sub'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/sub'))
   .define(function(options, adb, router, push, sub) {
     var log = logger.createLogger('device:plugins:shell')
 
diff --git a/lib/roles/device/plugins/solo.js b/lib/roles/device/plugins/solo.js
index e8029570..b998fda2 100644
--- a/lib/roles/device/plugins/solo.js
+++ b/lib/roles/device/plugins/solo.js
@@ -5,9 +5,9 @@ var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
 
 module.exports = syrup()
-  .dependency(require('./sub'))
-  .dependency(require('./push'))
-  .dependency(require('./channels'))
+  .dependency(require('../support/sub'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/channels'))
   .define(function(options, sub, push, channels) {
     var log = logger.createLogger('device:plugins:solo')
     var channel = wireutil.makePrivateChannel()
diff --git a/lib/roles/device/plugins/stats.js b/lib/roles/device/plugins/stats.js
index c0bc24a8..32ddcafb 100644
--- a/lib/roles/device/plugins/stats.js
+++ b/lib/roles/device/plugins/stats.js
@@ -5,8 +5,8 @@ var logger = require('../../../util/logger')
 var devutil = require('../../../util/devutil')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, quit, remote) {
     var log = logger.createLogger('device:plugins:stats')
diff --git a/lib/roles/device/plugins/touch.js b/lib/roles/device/plugins/touch.js
index 39fd4546..a2c29aa8 100644
--- a/lib/roles/device/plugins/touch.js
+++ b/lib/roles/device/plugins/touch.js
@@ -8,9 +8,9 @@ var devutil = require('../../../util/devutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('./adb'))
-  .dependency(require('./router'))
-  .dependency(require('./quit'))
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/quit'))
   .dependency(require('../resources/remote'))
   .define(function(options, adb, router, quit, remote) {
     var log = logger.createLogger('device:plugins:touch')
diff --git a/lib/roles/device/resources/inputagent.js b/lib/roles/device/resources/inputagent.js
index 8969be8b..7e00f953 100644
--- a/lib/roles/device/resources/inputagent.js
+++ b/lib/roles/device/resources/inputagent.js
@@ -9,7 +9,7 @@ var streamutil = require('../../../util/streamutil')
 var logger = require('../../../util/logger')
 
 module.exports = syrup()
-  .dependency(require('../plugins/adb'))
+  .dependency(require('../support/adb'))
   .define(function(options, adb) {
     var log = logger.createLogger('device:resources:inputagent')
 
diff --git a/lib/roles/device/resources/remote.js b/lib/roles/device/resources/remote.js
index a5afd566..7117684e 100644
--- a/lib/roles/device/resources/remote.js
+++ b/lib/roles/device/resources/remote.js
@@ -9,7 +9,7 @@ var devutil = require('../../../util/devutil')
 var streamutil = require('../../../util/streamutil')
 
 module.exports = syrup()
-  .dependency(require('../plugins/adb'))
+  .dependency(require('../support/adb'))
   .dependency(require('../plugins/identity'))
   .define(function(options, adb, identity) {
     var log = logger.createLogger('device:resources:remote')
diff --git a/lib/roles/device/plugins/adb.js b/lib/roles/device/support/adb.js
similarity index 100%
rename from lib/roles/device/plugins/adb.js
rename to lib/roles/device/support/adb.js
diff --git a/lib/roles/device/plugins/channels.js b/lib/roles/device/support/channels.js
similarity index 100%
rename from lib/roles/device/plugins/channels.js
rename to lib/roles/device/support/channels.js
diff --git a/lib/roles/device/plugins/push.js b/lib/roles/device/support/push.js
similarity index 100%
rename from lib/roles/device/plugins/push.js
rename to lib/roles/device/support/push.js
diff --git a/lib/roles/device/plugins/quit.js b/lib/roles/device/support/quit.js
similarity index 100%
rename from lib/roles/device/plugins/quit.js
rename to lib/roles/device/support/quit.js
diff --git a/lib/roles/device/plugins/router.js b/lib/roles/device/support/router.js
similarity index 100%
rename from lib/roles/device/plugins/router.js
rename to lib/roles/device/support/router.js
diff --git a/lib/roles/device/plugins/sub.js b/lib/roles/device/support/sub.js
similarity index 100%
rename from lib/roles/device/plugins/sub.js
rename to lib/roles/device/support/sub.js