diff --git a/lib/units/device/index.js b/lib/units/device/index.js
index e22ab6ed..461b79c4 100644
--- a/lib/units/device/index.js
+++ b/lib/units/device/index.js
@@ -21,7 +21,6 @@ module.exports = function(options) {
         .dependency(require('./plugins/screen/stream'))
         .dependency(require('./plugins/screen/capture'))
         .dependency(require('./plugins/service'))
-        .dependency(require('./plugins/display'))
         .dependency(require('./plugins/browser'))
         .dependency(require('./plugins/store'))
         .dependency(require('./plugins/clipboard'))
@@ -34,7 +33,6 @@ module.exports = function(options) {
         .dependency(require('./plugins/cleanup'))
         .dependency(require('./plugins/reboot'))
         .dependency(require('./plugins/connect'))
-        .dependency(require('./plugins/data'))
         .dependency(require('./plugins/account'))
         .dependency(require('./plugins/ringer'))
         .dependency(require('./plugins/wifi'))
diff --git a/lib/units/device/plugins/account.js b/lib/units/device/plugins/account.js
index 53950c37..4faab5fc 100644
--- a/lib/units/device/plugins/account.js
+++ b/lib/units/device/plugins/account.js
@@ -6,7 +6,7 @@ var wireutil = require('../../../wire/util')
 
 module.exports = syrup.serial()
   .dependency(require('./service'))
-  .dependency(require('./identity'))
+  .dependency(require('./util/identity'))
   .dependency(require('./touch'))
   .dependency(require('../support/router'))
   .dependency(require('../support/push'))
diff --git a/lib/units/device/plugins/group.js b/lib/units/device/plugins/group.js
index 7c1722d5..883a8653 100644
--- a/lib/units/device/plugins/group.js
+++ b/lib/units/device/plugins/group.js
@@ -11,7 +11,7 @@ var lifecycle = require('../../../util/lifecycle')
 
 module.exports = syrup.serial()
   .dependency(require('./solo'))
-  .dependency(require('./identity'))
+  .dependency(require('./util/identity'))
   .dependency(require('./service'))
   .dependency(require('../support/router'))
   .dependency(require('../support/push'))
diff --git a/lib/units/device/plugins/screen/capture.js b/lib/units/device/plugins/screen/capture.js
index a917a242..1ccf8c4c 100644
--- a/lib/units/device/plugins/screen/capture.js
+++ b/lib/units/device/plugins/screen/capture.js
@@ -13,7 +13,7 @@ module.exports = syrup.serial()
   .dependency(require('../../support/push'))
   .dependency(require('../../support/storage'))
   .dependency(require('../../resources/minicap'))
-  .dependency(require('../display'))
+  .dependency(require('../util/display'))
   .define(function(options, adb, router, push, storage, minicap, display) {
     var log = logger.createLogger('device:plugins:screen:capture')
     var plugin = Object.create(null)
diff --git a/lib/units/device/plugins/screen/stream.js b/lib/units/device/plugins/screen/stream.js
index 4316677f..f75069fa 100644
--- a/lib/units/device/plugins/screen/stream.js
+++ b/lib/units/device/plugins/screen/stream.js
@@ -21,7 +21,7 @@ var FailCounter = require('../../../../util/failcounter')
 module.exports = syrup.serial()
   .dependency(require('../../support/adb'))
   .dependency(require('../../resources/minicap'))
-  .dependency(require('../display'))
+  .dependency(require('../util/display'))
   .dependency(require('./options'))
   .define(function(options, adb, minicap, display, screenOptions) {
     var log = logger.createLogger('device:plugins:screen:stream')
diff --git a/lib/units/device/plugins/solo.js b/lib/units/device/plugins/solo.js
index 6655829d..0451c4fc 100644
--- a/lib/units/device/plugins/solo.js
+++ b/lib/units/device/plugins/solo.js
@@ -10,7 +10,7 @@ module.exports = syrup.serial()
   .dependency(require('../support/sub'))
   .dependency(require('../support/push'))
   .dependency(require('../support/router'))
-  .dependency(require('./identity'))
+  .dependency(require('./util/identity'))
   .define(function(options, sub, push, router, identity) {
     var log = logger.createLogger('device:plugins:solo')
 
diff --git a/lib/units/device/plugins/touch/index.js b/lib/units/device/plugins/touch/index.js
index 14d550ad..90dd6a64 100644
--- a/lib/units/device/plugins/touch/index.js
+++ b/lib/units/device/plugins/touch/index.js
@@ -19,7 +19,7 @@ module.exports = syrup.serial()
   .dependency(require('../../support/adb'))
   .dependency(require('../../support/router'))
   .dependency(require('../../resources/minitouch'))
-  .dependency(require('../flags'))
+  .dependency(require('../util/flags'))
   .define(function(options, adb, router, minitouch, flags) {
     var log = logger.createLogger('device:plugins:touch')
 
diff --git a/lib/units/device/plugins/data.js b/lib/units/device/plugins/util/data.js
similarity index 90%
rename from lib/units/device/plugins/data.js
rename to lib/units/device/plugins/util/data.js
index 8106974b..a0aa6a66 100644
--- a/lib/units/device/plugins/data.js
+++ b/lib/units/device/plugins/util/data.js
@@ -1,7 +1,7 @@
 var syrup = require('stf-syrup')
 var deviceData = require('stf-device-db')
 
-var logger = require('../../../util/logger')
+var logger = require('../../../../util/logger')
 
 module.exports = syrup.serial()
   .dependency(require('./identity'))
diff --git a/lib/units/device/plugins/display.js b/lib/units/device/plugins/util/display.js
similarity index 85%
rename from lib/units/device/plugins/display.js
rename to lib/units/device/plugins/util/display.js
index fc89cc5d..5f20e1c3 100644
--- a/lib/units/device/plugins/display.js
+++ b/lib/units/device/plugins/util/display.js
@@ -3,14 +3,14 @@ var util = require('util')
 var syrup = require('stf-syrup')
 var EventEmitter = require('eventemitter3').EventEmitter
 
-var logger = require('../../../util/logger')
-var streamutil = require('../../../util/streamutil')
+var logger = require('../../../../util/logger')
+var streamutil = require('../../../../util/streamutil')
 
 module.exports = syrup.serial()
-  .dependency(require('../support/adb'))
-  .dependency(require('../resources/minicap'))
-  .dependency(require('./service'))
-  .dependency(require('./screen/options'))
+  .dependency(require('../../support/adb'))
+  .dependency(require('../../resources/minicap'))
+  .dependency(require('../service'))
+  .dependency(require('../screen/options'))
   .define(function(options, adb, minicap, service, screenOptions) {
     var log = logger.createLogger('device:plugins:display')
 
diff --git a/lib/units/device/plugins/flags.js b/lib/units/device/plugins/util/flags.js
similarity index 100%
rename from lib/units/device/plugins/flags.js
rename to lib/units/device/plugins/util/flags.js
diff --git a/lib/units/device/plugins/identity.js b/lib/units/device/plugins/util/identity.js
similarity index 77%
rename from lib/units/device/plugins/identity.js
rename to lib/units/device/plugins/util/identity.js
index ca77d732..1d14f3e3 100644
--- a/lib/units/device/plugins/identity.js
+++ b/lib/units/device/plugins/util/identity.js
@@ -1,10 +1,10 @@
 var syrup = require('stf-syrup')
 
-var devutil = require('../../../util/devutil')
-var logger = require('../../../util/logger')
+var devutil = require('../../../../util/devutil')
+var logger = require('../../../../util/logger')
 
 module.exports = syrup.serial()
-  .dependency(require('../support/properties'))
+  .dependency(require('../../support/properties'))
   .dependency(require('./display'))
   .dependency(require('./phone'))
   .define(function(options, properties, display, phone) {
diff --git a/lib/units/device/plugins/phone.js b/lib/units/device/plugins/util/phone.js
similarity index 81%
rename from lib/units/device/plugins/phone.js
rename to lib/units/device/plugins/util/phone.js
index 37dcb3bf..1ae02289 100644
--- a/lib/units/device/plugins/phone.js
+++ b/lib/units/device/plugins/util/phone.js
@@ -1,9 +1,9 @@
 var syrup = require('stf-syrup')
 
-var logger = require('../../../util/logger')
+var logger = require('../../../../util/logger')
 
 module.exports = syrup.serial()
-  .dependency(require('./service'))
+  .dependency(require('../service'))
   .define(function(options, service) {
     var log = logger.createLogger('device:plugins:phone')
 
diff --git a/lib/units/device/plugins/util/urlformat.js b/lib/units/device/plugins/util/urlformat.js
index bd23ea75..b85c6e3d 100644
--- a/lib/units/device/plugins/util/urlformat.js
+++ b/lib/units/device/plugins/util/urlformat.js
@@ -3,8 +3,8 @@ var _ = require('lodash')
 var tr = require('transliteration')
 
 module.exports = syrup.serial()
-  .dependency(require('../identity'))
-  .dependency(require('../data'))
+  .dependency(require('./identity'))
+  .dependency(require('./data'))
   .define(function(options, identity, data) {
     function createSlug() {
       var model = identity.model