diff --git a/cookies.js b/cookies.js
index 0182dca..4ec5cd7 100644
--- a/cookies.js
+++ b/cookies.js
@@ -1,6 +1,6 @@
 var fs = require('fs'),
-    _ = require('underscore')._,
-    wsrc = require('wsrc');
+    _ = require('./underscore')._,
+    wsrc = require('./wsrc');
 
 var rc = wsrc.get();
 var cookieJar = rc.cookies || {};
@@ -182,4 +182,4 @@ function readCookie(name) {
 function eraseCookie(name) {
 	createCookie(name,"",-1);
 }
-*/
\ No newline at end of file
+*/
diff --git a/env.js b/env.js
index b4d819c..d178191 100644
--- a/env.js
+++ b/env.js
@@ -6,12 +6,12 @@
 
 var http = require('http'),
     url = require('url'),
-    _ = require('underscore')._;
+    _ = require('./underscore')._;
 var libxml;
 try {
   libxml = require('libxmljs');
 } catch (e) {
-  var stylize = require('colors').stylize;
+  var stylize = require('./colors').stylize;
   console.log(stylize("Unable to load libxmljs.  jQuery won't work!\n", 'yellow'));
   exports.DOMDocument = function(x) { };
   exports.window = {};
diff --git a/shell.js b/shell.js
index 004e350..48a8287 100755
--- a/shell.js
+++ b/shell.js
@@ -1,24 +1,22 @@
 #!/usr/bin/env node
-require.paths.unshift(__dirname + '/deps');
 var webshellVersion = '0.3-dev';
 
-require.paths.unshift(__dirname);
 var WebShell = {
   Util: {}
 };
 
 var util = require('util'),
     repl = require('repl'),
-    wsrepl = require('wsrepl'),
+    wsrepl = require('./wsrepl'),
     fs = require('fs'),
-    stylize = require('colors').stylize,
-    wsrc = require('wsrc'),
-    wsreadline = require('wsreadline'),
-    _ = require('underscore')._,
-    jquery = require('jquery'),
-    WsHttp = require('wshttp').WsHttp;
+    stylize = require('./colors').stylize,
+    wsrc = require('./wsrc'),
+    wsreadline = require('./wsreadline'),
+    _ = require('./underscore')._,
+    jquery = require('./jquery'),
+    WsHttp = require('./wshttp').WsHttp;
 
-_.extend(WebShell.Util, require('wsutil'));
+_.extend(WebShell.Util, require('./wsutil'));
 
 _.mixin({
   isJSON: function(headers) {
@@ -43,7 +41,7 @@ var $_ = {
   printResponse: true,
   postToRequestData: function (post) { return WebShell.Util.postToRequestData(this, post); },
   fileToRequestData: function (filename, encoding) { return WebShell.Util.fileToRequestData(this, filename, encoding); },
-  cookies: require('cookies'),
+  cookies: require('./cookies'),
   toolbox: {},
   evalFile: WebShell.Util.evalFile
 };
diff --git a/wshttp.js b/wshttp.js
index 4837b53..2563a65 100644
--- a/wshttp.js
+++ b/wshttp.js
@@ -2,15 +2,15 @@
 //   https://github.com/codehero/node-http-digest
 // "node-http-digest is in the public domain."
 
-var _ = require('underscore')._,
+var _ = require('./underscore')._,
     http = require('http'),
     https = require('https'),
     url = require('url'),
-    cookies = require('cookies'),
-    stylize = require('colors').stylize,
+    cookies = require('./cookies'),
+    stylize = require('./colors').stylize,
     querystring = require('qs'),
     hashlib = require('hashlib'),
-    wsutil = require('wsutil');
+    wsutil = require('./wsutil');
 
 var failCount = 0;
 var digestPersistent = {
diff --git a/wsrc.js b/wsrc.js
index cfed1a2..cb17156 100644
--- a/wsrc.js
+++ b/wsrc.js
@@ -1,7 +1,7 @@
 var fs = require('fs'),
-    stylize = require('colors').stylize,
-    wsutil = require('wsutil'),
-    _ = require('underscore')._;
+    stylize = require('./colors').stylize,
+    wsutil = require('./wsutil'),
+    _ = require('./underscore')._;
 
 var functionPrefix = '___WSFUNC___';
 
diff --git a/wsreadline.js b/wsreadline.js
index 48e33a6..2a89a96 100644
--- a/wsreadline.js
+++ b/wsreadline.js
@@ -5,9 +5,8 @@ var readline = require('readline'),
 
 module.exports = readline;
 
-var stdio = process.binding('stdio');
 var getCols = function() {
-  return tty.getWindowSize(stdio)[1];
+  return tty.getWindowSize(process.stdin);
 };
 
 readline.Interface.prototype.cursorToEnd = function() {
@@ -182,7 +181,7 @@ readline.Interface.prototype._prevLineParams = null;
 readline.Interface.prototype._refreshLine  = function () {
   if (this._closed) return;
 
-  stdio.setRawMode(true);
+  tty.setRawMode(true);
 
   var lineLen = this.line.length + this._promptLength;
   var rows = Math.floor(lineLen / getCols());
diff --git a/wsutil.js b/wsutil.js
index 5053423..f3c8f25 100644
--- a/wsutil.js
+++ b/wsutil.js
@@ -1,11 +1,11 @@
 // vim: sw=2 ts=2 et
 var url = require('url'),
     util = require('util'),
-    stylize = require('colors').stylize,
+    stylize = require('./colors').stylize,
     querystring = require('querystring'),
     fs = require('fs'),
-    wsrc = require('wsrc'),
-    _ = require('underscore')._;
+    wsrc = require('./wsrc'),
+    _ = require('./underscore')._;
 
 exports.parseURL = function(urlStr, protocolHelp, previousUrl) {
   var u = url.parse(urlStr);