diff --git a/lib/instruments.js b/lib/devices/ios/instruments.js
similarity index 97%
rename from lib/instruments.js
rename to lib/devices/ios/instruments.js
index 540b35b43..612153ebf 100644
--- a/lib/instruments.js
+++ b/lib/devices/ios/instruments.js
@@ -3,7 +3,7 @@
 
 var spawn = require('child_process').spawn
   , exec = require('child_process').exec
-  , logger = require('../lib/server/logger').get('appium')
+  , logger = require('../../server/logger.js').get('appium')
   , fs = require('fs')
   , _ = require('underscore')
   , net = require('net')
@@ -11,7 +11,7 @@ var spawn = require('child_process').spawn
   , path = require('path')
   , rimraf = require('rimraf')
   , mkdirp = require('mkdirp')
-  , codes = require('./server/status.js').codes;
+  , codes = require('../../server/status.js').codes;
 
 var Instruments = function(app, udid, isSafariLauncherApp, bootstrap, template, sock, withoutDelay, xcodeVersion, webSocket, cb, exitCb) {
   this.app = app;
@@ -210,12 +210,12 @@ Instruments.prototype.spawnInstruments = function(tmpDir) {
   if (this.withoutDelay && !this.udid) {
     var isXcode4 = this.xcodeVersion !== null && this.xcodeVersion[0] === '4';
     env.DYLD_INSERT_LIBRARIES = path.resolve(__dirname, isXcode4 ?
-      "../build/iwd4/InstrumentsShim.dylib" :
-      "../build/iwd/InstrumentsShim.dylib");
+      "../../../build/iwd4/InstrumentsShim.dylib" :
+      "../../../build/iwd/InstrumentsShim.dylib");
 
     env.LIB_PATH = path.resolve(__dirname, isXcode4 ?
-      "../build/iwd4" :
-      "../build/iwd");
+      "../../../build/iwd4" :
+      "../../../build/iwd");
   }
   logger.info("Spawning instruments with command: " + this.instrumentsPath +
               " " + args.join(" "));
diff --git a/lib/devices/ios/ios.js b/lib/devices/ios/ios.js
index 0e891535b..db814292e 100644
--- a/lib/devices/ios/ios.js
+++ b/lib/devices/ios/ios.js
@@ -10,7 +10,7 @@ var path = require('path')
   , 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')
   , escapeSpecialChars = helpers.escapeSpecialChars