diff --git a/bin/jitsu b/bin/jitsu
index 1f8ea3d..2066501 100755
--- a/bin/jitsu
+++ b/bin/jitsu
@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var eyes = require('eyes'),
     colors = require('colors'),
     winston = require('winston'),
     argv = require('optimist').argv,
-    jitsu = require('jitsu');
+    jitsu = require('../lib/jitsu');
 
 
 jitsu.start(argv, function (err) {
diff --git a/lib/jitsu.js b/lib/jitsu.js
index 07a3364..8997ae7 100644
--- a/lib/jitsu.js
+++ b/lib/jitsu.js
@@ -5,8 +5,6 @@
  *
  */
 
-require.paths.unshift(__dirname);
-
 var jitsu = exports;
 
 // Failure HTTP Response codes based
@@ -28,20 +26,20 @@ var successCodes = jitsu.successCodes = {
 
 jitsu.skipAuth          = false;
 jitsu.started           = false;
-jitsu.utils             = require('jitsu/utils');
-jitsu.package           = require('jitsu/package');
+jitsu.utils             = require('./jitsu/utils');
+jitsu.package           = require('./jitsu/package');
 jitsu.log               = require('cliff');
 jitsu.api               = {};
-jitsu.api.Client        = require('jitsu/api/client').Client;
-jitsu.api.Apps          = require('jitsu/api/apps').Apps;
-jitsu.api.Databases     = require('jitsu/api/databases').Databases;
-jitsu.api.Logs          = require('jitsu/api/logs').Logs;
-jitsu.api.Snapshots     = require('jitsu/api/snapshots').Snapshots;
-jitsu.api.Users         = require('jitsu/api/users').Users;
+jitsu.api.Client        = require('./jitsu/api/client').Client;
+jitsu.api.Apps          = require('./jitsu/api/apps').Apps;
+jitsu.api.Databases     = require('./jitsu/api/databases').Databases;
+jitsu.api.Logs          = require('./jitsu/api/logs').Logs;
+jitsu.api.Snapshots     = require('./jitsu/api/snapshots').Snapshots;
+jitsu.api.Users         = require('./jitsu/api/users').Users;
 jitsu.prompt            = require('prompt');
-jitsu.prompt.properties = require('jitsu/properties').properties;
-jitsu.config            = require('jitsu/config');
-jitsu.commands          = require('jitsu/commands');
+jitsu.prompt.properties = require('./jitsu/properties').properties;
+jitsu.config            = require('./jitsu/config');
+jitsu.commands          = require('./jitsu/commands');
 
 //
 // Alias the appropriate commands for simplier CLI usage
diff --git a/lib/jitsu/api/apps.js b/lib/jitsu/api/apps.js
index 0eca1a1..c08b14c 100644
--- a/lib/jitsu/api/apps.js
+++ b/lib/jitsu/api/apps.js
@@ -7,7 +7,7 @@
 
 var util = require('util'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 //
 // ### function Apps (options)
diff --git a/lib/jitsu/api/client.js b/lib/jitsu/api/client.js
index 3a65614..7cf3c5b 100644
--- a/lib/jitsu/api/client.js
+++ b/lib/jitsu/api/client.js
@@ -8,7 +8,7 @@
 var eyes = require('eyes'),
     fs = require('fs'),
     request = require('request'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 //
 // ### function Client (options)
diff --git a/lib/jitsu/api/databases.js b/lib/jitsu/api/databases.js
index aca4fe6..9f72a5c 100644
--- a/lib/jitsu/api/databases.js
+++ b/lib/jitsu/api/databases.js
@@ -7,7 +7,7 @@
 
 var util = require('util'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 //
 // ### function Databases (options)
diff --git a/lib/jitsu/api/logs.js b/lib/jitsu/api/logs.js
index 6550a22..0e3af3e 100644
--- a/lib/jitsu/api/logs.js
+++ b/lib/jitsu/api/logs.js
@@ -7,7 +7,7 @@
 
 var util = require('util'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 //
 // ### function Logs (options)
diff --git a/lib/jitsu/api/snapshots.js b/lib/jitsu/api/snapshots.js
index 23f2ffc..4d9d45c 100644
--- a/lib/jitsu/api/snapshots.js
+++ b/lib/jitsu/api/snapshots.js
@@ -7,7 +7,7 @@
 
 var util = require('util'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 //
 // ### function Snapshots (options)
diff --git a/lib/jitsu/api/users.js b/lib/jitsu/api/users.js
index 3800ef5..8bf0b83 100644
--- a/lib/jitsu/api/users.js
+++ b/lib/jitsu/api/users.js
@@ -7,7 +7,7 @@
  
 var util = require('util'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
     
 //
 // ### function Users (options)
diff --git a/lib/jitsu/commands.js b/lib/jitsu/commands.js
index 4a89bc2..676646e 100644
--- a/lib/jitsu/commands.js
+++ b/lib/jitsu/commands.js
@@ -3,7 +3,7 @@
 var fs = require('fs'),
     path = require('path'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../jitsu');
 
 var commands = exports;
 
@@ -15,7 +15,7 @@ commands.commands = {};
 fs.readdirSync(path.join(__dirname, 'commands')).forEach(function (cmd) {
   cmd = cmd.replace('.js', '');
   commands.commands.__defineGetter__(cmd, function () {
-    return require('jitsu/commands/' + cmd);
+    return require('./commands/' + cmd);
   });
 });
 
diff --git a/lib/jitsu/commands/apps.js b/lib/jitsu/commands/apps.js
index 4a5686e..1ceb784 100644
--- a/lib/jitsu/commands/apps.js
+++ b/lib/jitsu/commands/apps.js
@@ -8,7 +8,7 @@
 var eyes = require('eyes'),
     winston = require('winston'),
     analyzer = require('require-analyzer'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 var apps = exports;
 
diff --git a/lib/jitsu/commands/config.js b/lib/jitsu/commands/config.js
index f216281..5328d5e 100644
--- a/lib/jitsu/commands/config.js
+++ b/lib/jitsu/commands/config.js
@@ -5,8 +5,8 @@
  *
  */
 
-var jitsu = require('jitsu'),
-    winston = require('winston');
+var winston = require('winston'),
+    jitsu = require('../../jitsu');
  
 var config = exports,
     noDelete = ['root', 'remoteUri', 'userconfig', 'auth', 'tmproot', 'tar', 'gzipbin'];
diff --git a/lib/jitsu/commands/databases.js b/lib/jitsu/commands/databases.js
index 8460158..d850818 100644
--- a/lib/jitsu/commands/databases.js
+++ b/lib/jitsu/commands/databases.js
@@ -6,7 +6,7 @@
  */
  
 var winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 var databases = exports;
 
diff --git a/lib/jitsu/commands/help.js b/lib/jitsu/commands/help.js
index ac3778d..63471fc 100644
--- a/lib/jitsu/commands/help.js
+++ b/lib/jitsu/commands/help.js
@@ -7,7 +7,7 @@
  
 var colors = require('colors'),
     winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
  
 var help = exports;
 
diff --git a/lib/jitsu/commands/logs.js b/lib/jitsu/commands/logs.js
index 79f2cca..311725c 100644
--- a/lib/jitsu/commands/logs.js
+++ b/lib/jitsu/commands/logs.js
@@ -6,7 +6,7 @@
  */
 
 var winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 var logs = exports;
 
diff --git a/lib/jitsu/commands/package.js b/lib/jitsu/commands/package.js
index 47dde19..40dd616 100644
--- a/lib/jitsu/commands/package.js
+++ b/lib/jitsu/commands/package.js
@@ -6,7 +6,7 @@
  */
  
 var winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 var package = exports;
 
diff --git a/lib/jitsu/commands/snapshots.js b/lib/jitsu/commands/snapshots.js
index 405f590..ce12c45 100644
--- a/lib/jitsu/commands/snapshots.js
+++ b/lib/jitsu/commands/snapshots.js
@@ -7,7 +7,7 @@
  
 var winston = require('winston'),
     semver = require('semver'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
 
 var snapshots = exports;
 
diff --git a/lib/jitsu/commands/users.js b/lib/jitsu/commands/users.js
index ee85792..30796c3 100644
--- a/lib/jitsu/commands/users.js
+++ b/lib/jitsu/commands/users.js
@@ -6,7 +6,7 @@
  */
  
 var winston = require('winston'),
-    jitsu = require('jitsu');
+    jitsu = require('../../jitsu');
     
 var users = exports;
 
diff --git a/lib/jitsu/package.js b/lib/jitsu/package.js
index da668cf..afb054c 100644
--- a/lib/jitsu/package.js
+++ b/lib/jitsu/package.js
@@ -5,19 +5,19 @@
  *
  */
 
-var util = require('util'),
+var fs = require('fs'),
     path = require('path'),
-    fs = require('fs'),
     spawn = require('child_process').spawn,
+    util = require('util'),
     async = require('async'),
     analyzer = require('require-analyzer'),
     npm = require('npm'),
     npmout = require('npm/lib/utils/output'),
     npmtar = require('npm/lib/utils/tar'),
+    optimist = require('optimist'),
     semver = require('semver'),
     winston = require('winston'),
-    jitsu = require('jitsu'),
-    optimist = require('optimist');
+    jitsu = require('../jitsu');
 
 var package = exports;
 
diff --git a/lib/jitsu/utils/index.js b/lib/jitsu/utils/index.js
index 19ed806..7414c20 100644
--- a/lib/jitsu/utils/index.js
+++ b/lib/jitsu/utils/index.js
@@ -5,15 +5,15 @@
  *
  */
  
-var util = require('util'),
-    spawn = require('child_process').spawn,
-    fs = require('fs'),
+var fs = require('fs'),
     path = require('path'),
+    spawn = require('child_process').spawn,
+    util = require('util'),
     async = require('async'),
     request = require('request'),
-    winston = require('winston'),
     semver = require('semver'),
-    jitsu = require('jitsu');
+    winston = require('winston'),
+    jitsu = require('../../jitsu');
  
 var utils = exports;
 
diff --git a/test/client-test.js b/test/client-test.js
index 4a2fa67..2beb3fc 100644
--- a/test/client-test.js
+++ b/test/client-test.js
@@ -5,13 +5,11 @@
  *
  */
  
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var assert = require('assert'),
-    vows = require('vows'),
-    jitsu = require('jitsu'),
     optimist = require('optimist'),
     mockRequest = require('mock-request'),
+    vows = require('vows'),
+    jitsu = require('../lib/jitsu'),
     helper = require('./helpers/mock-helpers');
 
 var port = 90210, 
diff --git a/test/commands/apps-test.js b/test/commands/apps-test.js
index 4223ebb..1589579 100644
--- a/test/commands/apps-test.js
+++ b/test/commands/apps-test.js
@@ -5,15 +5,13 @@
  *
  */
  
-require.paths.unshift(require('path').join(__dirname, '..', '..', 'lib'));
-
-var fs = require('fs'),
+var assert = require('assert'),
+    fs = require('fs'),
     path = require('path'),
-    assert = require('assert'),
+    mockRequest = require('mock-request'),
     vows = require('vows'),
-    jitsu = require('jitsu'),
-    helper = require('../helpers/mock-helpers'),
-    mockRequest = require('mock-request');
+    jitsu = require('../../lib/jitsu'),
+    helper = require('../helpers/mock-helpers');
 
 var mockPrompt2 = helper.mockPrompt2,
     runJitsuCommand = helper.runJitsuCommand;
diff --git a/test/commands/snapshots-test.js b/test/commands/snapshots-test.js
index 0d8da9f..c739541 100644
--- a/test/commands/snapshots-test.js
+++ b/test/commands/snapshots-test.js
@@ -5,13 +5,11 @@
  *
  */
  
-require.paths.unshift(require('path').join(__dirname, '..', '..', 'lib'));
-
 var assert = require('assert'),
-    jitsu = require('jitsu'),
     vows = require('vows'),
-    helper = require('../helpers/mock-helpers'),
-    mockRequest = require('mock-request');
+    mockRequest = require('mock-request'),
+    jitsu = require('../../lib/jitsu'),
+    helper = require('../helpers/mock-helpers');
 
 var mockPrompt = helper.mockPrompt,
     runJitsuCommand = helper.runJitsuCommand;
diff --git a/test/commands/users-test.js b/test/commands/users-test.js
index 342bec4..bffcd11 100644
--- a/test/commands/users-test.js
+++ b/test/commands/users-test.js
@@ -5,13 +5,11 @@
  *
  */
  
-require.paths.unshift(require('path').join(__dirname, '..', '..', 'lib'));
-
 var assert = require('assert'),
-    jitsu = require('jitsu'),
     vows = require('vows'),
-    helper = require('../helpers/mock-helpers'),
-    mockRequest = require('mock-request');
+    mockRequest = require('mock-request'),
+    jitsu = require('../../lib/jitsu'),
+    helper = require('../helpers/mock-helpers');
 
 var mockPrompt = helper.mockPrompt,
     runJitsuCommand = helper.runJitsuCommand;
diff --git a/test/fixtures/example-app/server.js b/test/fixtures/example-app/server.js
index 68b66d5..71c3728 100644
--- a/test/fixtures/example-app/server.js
+++ b/test/fixtures/example-app/server.js
@@ -1,6 +1,4 @@
 
-require('jitsu')
-
 module.exports = {hi:console.log}
 
 //console.log('FIXTURES/EXAMPLE-APP')
\ No newline at end of file
diff --git a/test/helpers/mock-helpers.js b/test/helpers/mock-helpers.js
index 9618ce1..d875e53 100644
--- a/test/helpers/mock-helpers.js
+++ b/test/helpers/mock-helpers.js
@@ -1,17 +1,15 @@
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var assert = require('assert'),
-    eyes = require('eyes'),
-    jitsu = require('jitsu'),
     http = require('http'),
     util = require('util'),
-    optimist = require('optimist'),
+    eyes = require('eyes'),
     it = require('it-is'),
+    inspect = eyes.inspector({ stream: null })
     nodemock = require('nodemock'),
-    inspect = require('eyes').inspector({ stream: null })
-    base64 = require('jitsu/utils/base64'),
-    MockRequest = require('mock-request').MockRequest;
+    MockRequest = require('mock-request').MockRequest,
+    optimist = require('optimist'),
+    jitsu = require('../../lib/jitsu'),
+    base64 = require('../../lib/jitsu/utils/base64');
 
 var port = 90210,
     remoteHost = 'api.mockjitsu.com';
diff --git a/test/package-test.js b/test/package-test.js
index f34ae1e..ef87cd9 100644
--- a/test/package-test.js
+++ b/test/package-test.js
@@ -1,23 +1,21 @@
 /*
- * log-test.js: Tests for the jitsu log module.
+ * package-test.js: Tests for the jitsu package module.
  *
  * (C) 2010, Nodejitsu Inc.
  *
  */
  
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var assert = require('assert'),
+    fs = require('fs'),
+    join = require('path').join,
     vows = require('vows'),
+    analyzer = require('require-analyzer'),
     eyes = require('eyes'),
-    jitsu = require('jitsu'),
-    join = require('path').join,
+    optimist = require('optimist'),
     nodemock = require('nodemock'),
-    helper = require('./helpers/mock-helpers'),
-    analyzer = require('require-analyzer'),
-    fs = require('fs'),
     nm = require('nodemock'),
-    optimist = require('optimist');
+    jitsu = require('../lib/jitsu'),
+    helper = require('./helpers/mock-helpers');
 
 //
 //  package.create prompts user to create package.json