diff --git a/Gruntfile.js b/Gruntfile.js
index cf321f100..bfd053c2f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
         , trailing: true
         , node: true
         , strict: true
-        , ignores: ['./submodules/**/*.js', './node_modules/**/*.js', './lib/hybrid/ios/webdriver-atoms/*.js', './sample-code/**/*.js', './test/harmony/**/*.js', './test/functional/_joined/*.js', './lib/server/static/**/*.js', './lib/hybrid/firefoxos/atoms/*.js', './lib/uiauto/**/*.js']
+        , ignores: ['./submodules/**/*.js', './node_modules/**/*.js', './lib/devices/ios/webdriver-atoms/*.js', './sample-code/**/*.js', './test/harmony/**/*.js', './test/functional/_joined/*.js', './lib/server/static/**/*.js', './lib/hybrid/firefoxos/atoms/*.js', './lib/uiauto/**/*.js']
       }
     }
     , mochaTest: {
diff --git a/lib/appium.js b/lib/appium.js
index c7b900957..a55df53b3 100644
--- a/lib/appium.js
+++ b/lib/appium.js
@@ -15,7 +15,7 @@ var routing = require('./server/routing.js')
   , UUID = require('uuid-js')
   , _ = require('underscore')
   , fs = require('fs')
-  , ios = require('./devices/ios.js')
+  , ios = require('./devices/ios/ios.js')
   , android = require('./devices/android.js')
   , selendroid = require('./devices/selendroid.js')
   , chrome = require('./devices/chrome_android.js')
diff --git a/lib/devices/ios.js b/lib/devices/ios/ios.js
similarity index 99%
rename from lib/devices/ios.js
rename to lib/devices/ios/ios.js
index 3035e4ee8..cd7f28919 100644
--- a/lib/devices/ios.js
+++ b/lib/devices/ios/ios.js
@@ -3,24 +3,24 @@ var path = require('path')
   , rimraf = require('rimraf')
   , fs = require('fs')
   , _ = require('underscore')
-  , logger = require('../server/logger.js').get('appium')
+  , logger = require('../../server/logger.js').get('appium')
   , sock = '/tmp/instruments_sock'
   , glob = require('glob')
   , exec = require('child_process').exec
   , bplistCreate = require('bplist-creator')
   , bplistParse = require('bplist-parser')
   , xmlplist = require('plist')
-  , instruments = require('../instruments.js')
+  , instruments = require('../../instruments.js')
   , uuid = require('uuid-js')
-  , helpers = require('../helpers.js')
+  , helpers = require('../../helpers.js')
   , escapeSpecialChars = helpers.escapeSpecialChars
   , parseWebCookies = helpers.parseWebCookies
   , rotateImage = helpers.rotateImage
-  , rd = require('../hybrid/ios/remote-debugger.js')
-  , wkrd = require('../hybrid/ios/webkit-remote-debugger.js')
-  , errors = require('../server/errors.js')
-  , deviceCommon = require('./common.js')
-  , status = require("../uiauto/lib/status.js")
+  , rd = require('./remote-debugger.js')
+  , wkrd = require('./webkit-remote-debugger.js')
+  , errors = require('../../server/errors.js')
+  , deviceCommon = require('../common.js')
+  , status = require("../../uiauto/lib/status.js")
   , IDevice = require('node-idevice')
   , async = require('async')
   , request = require('request')
@@ -180,7 +180,7 @@ IOS.prototype.start = function(cb, onDie) {
       this.app || this.bundleId
       , this.udid
       , this.isSafariLauncherApp
-      , path.resolve(__dirname, '..', 'uiauto', 'bootstrap.js')
+      , path.resolve(__dirname, '..', '..', 'uiauto', 'bootstrap.js')
       , this.automationTraceTemplatePath
       , sock
       , this.withoutDelay
diff --git a/lib/hybrid/ios/remote-debugger.js b/lib/devices/ios/remote-debugger.js
similarity index 100%
rename from lib/hybrid/ios/remote-debugger.js
rename to lib/devices/ios/remote-debugger.js
diff --git a/lib/hybrid/ios/remote-messages.js b/lib/devices/ios/remote-messages.js
similarity index 100%
rename from lib/hybrid/ios/remote-messages.js
rename to lib/devices/ios/remote-messages.js
diff --git a/lib/hybrid/ios/webdriver-atoms.js b/lib/devices/ios/webdriver-atoms.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms.js
rename to lib/devices/ios/webdriver-atoms.js
diff --git a/lib/hybrid/ios/webdriver-atoms/active_element.js b/lib/devices/ios/webdriver-atoms/active_element.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/active_element.js
rename to lib/devices/ios/webdriver-atoms/active_element.js
diff --git a/lib/hybrid/ios/webdriver-atoms/clear.js b/lib/devices/ios/webdriver-atoms/clear.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/clear.js
rename to lib/devices/ios/webdriver-atoms/clear.js
diff --git a/lib/hybrid/ios/webdriver-atoms/clear_local_storage.js b/lib/devices/ios/webdriver-atoms/clear_local_storage.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/clear_local_storage.js
rename to lib/devices/ios/webdriver-atoms/clear_local_storage.js
diff --git a/lib/hybrid/ios/webdriver-atoms/clear_session_storage.js b/lib/devices/ios/webdriver-atoms/clear_session_storage.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/clear_session_storage.js
rename to lib/devices/ios/webdriver-atoms/clear_session_storage.js
diff --git a/lib/hybrid/ios/webdriver-atoms/click.js b/lib/devices/ios/webdriver-atoms/click.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/click.js
rename to lib/devices/ios/webdriver-atoms/click.js
diff --git a/lib/hybrid/ios/webdriver-atoms/default_content.js b/lib/devices/ios/webdriver-atoms/default_content.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/default_content.js
rename to lib/devices/ios/webdriver-atoms/default_content.js
diff --git a/lib/hybrid/ios/webdriver-atoms/deps.js b/lib/devices/ios/webdriver-atoms/deps.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/deps.js
rename to lib/devices/ios/webdriver-atoms/deps.js
diff --git a/lib/hybrid/ios/webdriver-atoms/double_click.js b/lib/devices/ios/webdriver-atoms/double_click.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/double_click.js
rename to lib/devices/ios/webdriver-atoms/double_click.js
diff --git a/lib/hybrid/ios/webdriver-atoms/drag.js b/lib/devices/ios/webdriver-atoms/drag.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/drag.js
rename to lib/devices/ios/webdriver-atoms/drag.js
diff --git a/lib/hybrid/ios/webdriver-atoms/execute_async_script.js b/lib/devices/ios/webdriver-atoms/execute_async_script.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/execute_async_script.js
rename to lib/devices/ios/webdriver-atoms/execute_async_script.js
diff --git a/lib/hybrid/ios/webdriver-atoms/execute_script.js b/lib/devices/ios/webdriver-atoms/execute_script.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/execute_script.js
rename to lib/devices/ios/webdriver-atoms/execute_script.js
diff --git a/lib/hybrid/ios/webdriver-atoms/execute_sql.js b/lib/devices/ios/webdriver-atoms/execute_sql.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/execute_sql.js
rename to lib/devices/ios/webdriver-atoms/execute_sql.js
diff --git a/lib/hybrid/ios/webdriver-atoms/find_element.js b/lib/devices/ios/webdriver-atoms/find_element.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/find_element.js
rename to lib/devices/ios/webdriver-atoms/find_element.js
diff --git a/lib/hybrid/ios/webdriver-atoms/find_elements.js b/lib/devices/ios/webdriver-atoms/find_elements.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/find_elements.js
rename to lib/devices/ios/webdriver-atoms/find_elements.js
diff --git a/lib/hybrid/ios/webdriver-atoms/focus_on_element.js b/lib/devices/ios/webdriver-atoms/focus_on_element.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/focus_on_element.js
rename to lib/devices/ios/webdriver-atoms/focus_on_element.js
diff --git a/lib/hybrid/ios/webdriver-atoms/frame_by_id_or_name.js b/lib/devices/ios/webdriver-atoms/frame_by_id_or_name.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/frame_by_id_or_name.js
rename to lib/devices/ios/webdriver-atoms/frame_by_id_or_name.js
diff --git a/lib/hybrid/ios/webdriver-atoms/frame_by_index.js b/lib/devices/ios/webdriver-atoms/frame_by_index.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/frame_by_index.js
rename to lib/devices/ios/webdriver-atoms/frame_by_index.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_appcache_status.js b/lib/devices/ios/webdriver-atoms/get_appcache_status.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_appcache_status.js
rename to lib/devices/ios/webdriver-atoms/get_appcache_status.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_attribute.js b/lib/devices/ios/webdriver-atoms/get_attribute.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_attribute.js
rename to lib/devices/ios/webdriver-atoms/get_attribute.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_attribute_value.js b/lib/devices/ios/webdriver-atoms/get_attribute_value.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_attribute_value.js
rename to lib/devices/ios/webdriver-atoms/get_attribute_value.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_current_position.js b/lib/devices/ios/webdriver-atoms/get_current_position.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_current_position.js
rename to lib/devices/ios/webdriver-atoms/get_current_position.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_element_from_cache.js b/lib/devices/ios/webdriver-atoms/get_element_from_cache.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_element_from_cache.js
rename to lib/devices/ios/webdriver-atoms/get_element_from_cache.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_frame_window.js b/lib/devices/ios/webdriver-atoms/get_frame_window.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_frame_window.js
rename to lib/devices/ios/webdriver-atoms/get_frame_window.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_in_view_location.js b/lib/devices/ios/webdriver-atoms/get_in_view_location.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_in_view_location.js
rename to lib/devices/ios/webdriver-atoms/get_in_view_location.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_local_storage_item.js b/lib/devices/ios/webdriver-atoms/get_local_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_local_storage_item.js
rename to lib/devices/ios/webdriver-atoms/get_local_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_local_storage_keys.js b/lib/devices/ios/webdriver-atoms/get_local_storage_keys.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_local_storage_keys.js
rename to lib/devices/ios/webdriver-atoms/get_local_storage_keys.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_local_storage_size.js b/lib/devices/ios/webdriver-atoms/get_local_storage_size.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_local_storage_size.js
rename to lib/devices/ios/webdriver-atoms/get_local_storage_size.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_location.js b/lib/devices/ios/webdriver-atoms/get_location.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_location.js
rename to lib/devices/ios/webdriver-atoms/get_location.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_location_in_view.js b/lib/devices/ios/webdriver-atoms/get_location_in_view.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_location_in_view.js
rename to lib/devices/ios/webdriver-atoms/get_location_in_view.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_session_storage_item.js b/lib/devices/ios/webdriver-atoms/get_session_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_session_storage_item.js
rename to lib/devices/ios/webdriver-atoms/get_session_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_session_storage_keys.js b/lib/devices/ios/webdriver-atoms/get_session_storage_keys.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_session_storage_keys.js
rename to lib/devices/ios/webdriver-atoms/get_session_storage_keys.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_session_storage_size.js b/lib/devices/ios/webdriver-atoms/get_session_storage_size.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_session_storage_size.js
rename to lib/devices/ios/webdriver-atoms/get_session_storage_size.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_size.js b/lib/devices/ios/webdriver-atoms/get_size.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_size.js
rename to lib/devices/ios/webdriver-atoms/get_size.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_text.js b/lib/devices/ios/webdriver-atoms/get_text.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_text.js
rename to lib/devices/ios/webdriver-atoms/get_text.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_top_left_coordinates.js b/lib/devices/ios/webdriver-atoms/get_top_left_coordinates.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_top_left_coordinates.js
rename to lib/devices/ios/webdriver-atoms/get_top_left_coordinates.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_value_of_css_property.js b/lib/devices/ios/webdriver-atoms/get_value_of_css_property.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_value_of_css_property.js
rename to lib/devices/ios/webdriver-atoms/get_value_of_css_property.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_window_position.js b/lib/devices/ios/webdriver-atoms/get_window_position.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_window_position.js
rename to lib/devices/ios/webdriver-atoms/get_window_position.js
diff --git a/lib/hybrid/ios/webdriver-atoms/get_window_size.js b/lib/devices/ios/webdriver-atoms/get_window_size.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/get_window_size.js
rename to lib/devices/ios/webdriver-atoms/get_window_size.js
diff --git a/lib/hybrid/ios/webdriver-atoms/is_displayed.js b/lib/devices/ios/webdriver-atoms/is_displayed.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/is_displayed.js
rename to lib/devices/ios/webdriver-atoms/is_displayed.js
diff --git a/lib/hybrid/ios/webdriver-atoms/is_enabled.js b/lib/devices/ios/webdriver-atoms/is_enabled.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/is_enabled.js
rename to lib/devices/ios/webdriver-atoms/is_enabled.js
diff --git a/lib/hybrid/ios/webdriver-atoms/is_online.js b/lib/devices/ios/webdriver-atoms/is_online.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/is_online.js
rename to lib/devices/ios/webdriver-atoms/is_online.js
diff --git a/lib/hybrid/ios/webdriver-atoms/is_selected.js b/lib/devices/ios/webdriver-atoms/is_selected.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/is_selected.js
rename to lib/devices/ios/webdriver-atoms/is_selected.js
diff --git a/lib/hybrid/ios/webdriver-atoms/lastupdate b/lib/devices/ios/webdriver-atoms/lastupdate
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/lastupdate
rename to lib/devices/ios/webdriver-atoms/lastupdate
diff --git a/lib/hybrid/ios/webdriver-atoms/move_mouse.js b/lib/devices/ios/webdriver-atoms/move_mouse.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/move_mouse.js
rename to lib/devices/ios/webdriver-atoms/move_mouse.js
diff --git a/lib/hybrid/ios/webdriver-atoms/pinch.js b/lib/devices/ios/webdriver-atoms/pinch.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/pinch.js
rename to lib/devices/ios/webdriver-atoms/pinch.js
diff --git a/lib/hybrid/ios/webdriver-atoms/remove_local_storage_item.js b/lib/devices/ios/webdriver-atoms/remove_local_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/remove_local_storage_item.js
rename to lib/devices/ios/webdriver-atoms/remove_local_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/remove_session_storage_item.js b/lib/devices/ios/webdriver-atoms/remove_session_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/remove_session_storage_item.js
rename to lib/devices/ios/webdriver-atoms/remove_session_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/right_click.js b/lib/devices/ios/webdriver-atoms/right_click.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/right_click.js
rename to lib/devices/ios/webdriver-atoms/right_click.js
diff --git a/lib/hybrid/ios/webdriver-atoms/rotate.js b/lib/devices/ios/webdriver-atoms/rotate.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/rotate.js
rename to lib/devices/ios/webdriver-atoms/rotate.js
diff --git a/lib/hybrid/ios/webdriver-atoms/scroll_into_view.js b/lib/devices/ios/webdriver-atoms/scroll_into_view.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/scroll_into_view.js
rename to lib/devices/ios/webdriver-atoms/scroll_into_view.js
diff --git a/lib/hybrid/ios/webdriver-atoms/scroll_mouse.js b/lib/devices/ios/webdriver-atoms/scroll_mouse.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/scroll_mouse.js
rename to lib/devices/ios/webdriver-atoms/scroll_mouse.js
diff --git a/lib/hybrid/ios/webdriver-atoms/set_local_storage_item.js b/lib/devices/ios/webdriver-atoms/set_local_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/set_local_storage_item.js
rename to lib/devices/ios/webdriver-atoms/set_local_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/set_session_storage_item.js b/lib/devices/ios/webdriver-atoms/set_session_storage_item.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/set_session_storage_item.js
rename to lib/devices/ios/webdriver-atoms/set_session_storage_item.js
diff --git a/lib/hybrid/ios/webdriver-atoms/set_window_position.js b/lib/devices/ios/webdriver-atoms/set_window_position.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/set_window_position.js
rename to lib/devices/ios/webdriver-atoms/set_window_position.js
diff --git a/lib/hybrid/ios/webdriver-atoms/set_window_size.js b/lib/devices/ios/webdriver-atoms/set_window_size.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/set_window_size.js
rename to lib/devices/ios/webdriver-atoms/set_window_size.js
diff --git a/lib/hybrid/ios/webdriver-atoms/submit.js b/lib/devices/ios/webdriver-atoms/submit.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/submit.js
rename to lib/devices/ios/webdriver-atoms/submit.js
diff --git a/lib/hybrid/ios/webdriver-atoms/swipe.js b/lib/devices/ios/webdriver-atoms/swipe.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/swipe.js
rename to lib/devices/ios/webdriver-atoms/swipe.js
diff --git a/lib/hybrid/ios/webdriver-atoms/tap.js b/lib/devices/ios/webdriver-atoms/tap.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/tap.js
rename to lib/devices/ios/webdriver-atoms/tap.js
diff --git a/lib/hybrid/ios/webdriver-atoms/type.js b/lib/devices/ios/webdriver-atoms/type.js
similarity index 100%
rename from lib/hybrid/ios/webdriver-atoms/type.js
rename to lib/devices/ios/webdriver-atoms/type.js
diff --git a/lib/hybrid/ios/webkit-remote-debugger.js b/lib/devices/ios/webkit-remote-debugger.js
similarity index 100%
rename from lib/hybrid/ios/webkit-remote-debugger.js
rename to lib/devices/ios/webkit-remote-debugger.js
diff --git a/lib/hybrid/ios/remote-test.js b/lib/hybrid/ios/remote-test.js
deleted file mode 100644
index bd70f85ea..000000000
--- a/lib/hybrid/ios/remote-test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-"use strict";
-var rd = require('./remote-debugger.js')
-  , _ = require("underscore");
-
-var remote = rd.init(function() {
-  console.log("Debugger said app disconnected");
-  process.exit(0);
-});
-
-remote.connect(function(appDict) {
-  console.log("App dict:");
-  console.log(appDict);
-  var appBundleId = null;
-  _.each(appDict, function(appName, appId) {
-    appBundleId = appId;
-  });
-  if (appBundleId) {
-    remote.selectApp(appBundleId, function(pageArray) {
-      console.log(pageArray);
-      var pageIdKey = null;
-      _.each(pageArray, function(page) {
-        pageIdKey = page.id;
-      });
-      if (pageIdKey) {
-        remote.selectPage(pageIdKey, function() {
-          remote.execute("alert('hi');", function(res) {
-            console.log(res);
-            process.exit(0);
-          });
-        });
-      } else {
-        console.log("No page is available");
-        process.exit(1);
-      }
-    });
-  } else {
-    console.log("No apps are available");
-    process.exit(1);
-  }
-});
diff --git a/test/unit/queue.js b/test/unit/queue.js
index 8f428c878..e63cdc341 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -7,7 +7,7 @@
 var should = require('should')
   , appium = require('../../lib/appium.js')
   , path = require('path')
-  , ios = require('../../lib/devices/ios.js');
+  , ios = require('../../lib/devices/ios/ios.js');
 
 describe('IOS', function() {
   // we'd like to test ios.proxy; mock instruments