diff --git a/benchmark/less-benchmark.js b/benchmark/less-benchmark.js
index fe142c06c..36f83e816 100644
--- a/benchmark/less-benchmark.js
+++ b/benchmark/less-benchmark.js
@@ -2,9 +2,7 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 var file = path.join(__dirname, 'benchmark.less');
 
 if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }
diff --git a/bin/lessc b/bin/lessc
index 1e3c961ff..48205fd66 100755
--- a/bin/lessc
+++ b/bin/lessc
@@ -4,8 +4,6 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
 var less = require('less');
 var args = process.argv.slice(1);
 var options = {
diff --git a/lib/less/browser.js b/lib/less/browser.js
index cba4c3b61..d8f2df3dd 100644
--- a/lib/less/browser.js
+++ b/lib/less/browser.js
@@ -51,7 +51,6 @@ if (less.env === 'development') {
 }
 
 var cache;
-
 try {
     cache = (typeof(window.localStorage) === 'undefined') ? null : window.localStorage;
 } catch (_) {
diff --git a/lib/less/functions.js b/lib/less/functions.js
index fc9d86f1d..96dcc8c4c 100644
--- a/lib/less/functions.js
+++ b/lib/less/functions.js
@@ -182,4 +182,4 @@ function clamp(val) {
     return Math.min(1, Math.max(0, val));
 }
 
-})(require('less/tree'));
+})(require('./tree'));
diff --git a/lib/less/index.js b/lib/less/index.js
index a333f63fd..81f2c351c 100644
--- a/lib/less/index.js
+++ b/lib/less/index.js
@@ -2,13 +2,11 @@ var path = require('path'),
     sys = require('sys'),
     fs = require('fs');
 
-require.paths.unshift(path.join(__dirname, '..'));
-
 var less = {
     version: [1, 1, 3],
-    Parser: require('less/parser').Parser,
-    importer: require('less/parser').importer,
-    tree: require('less/tree'),
+    Parser: require('./parser').Parser,
+    importer: require('./parser').importer,
+    tree: require('./tree'),
     render: function (input, options, callback) {
         options = options || {};
 
@@ -16,7 +14,7 @@ var less = {
             callback = options, options = {};
         }
 
-        var parser = new(this.Parser)(options),
+        var parser = new(less.Parser)(options),
             ee;
 
         if (callback) {
@@ -81,7 +79,7 @@ var less = {
  'call',     'url',       'alpha',      'import',
  'mixin',    'comment',   'anonymous',  'value', 'javascript'
 ].forEach(function (n) {
-    require(path.join('less', 'tree', n));
+    require('./tree/'+ n);
 });
 
 less.Parser.importer = function (file, paths, callback) {
@@ -117,7 +115,7 @@ less.Parser.importer = function (file, paths, callback) {
     }
 }
 
-require('less/functions');
+require('./functions');
 
 for (var k in less) { exports[k] = less[k] }
 
diff --git a/lib/less/parser.js b/lib/less/parser.js
index 7e02bdcab..9b6df6470 100644
--- a/lib/less/parser.js
+++ b/lib/less/parser.js
@@ -2,7 +2,7 @@ var less, tree;
 
 if (typeof(window) === 'undefined') {
     less = exports,
-    tree = require('less/tree');
+    tree = require('./tree');
 } else {
     if (typeof(window.less) === 'undefined') { window.less = {} }
     less = window.less,
diff --git a/lib/less/tree.js b/lib/less/tree.js
index eb08aa4ff..4c471c085 100644
--- a/lib/less/tree.js
+++ b/lib/less/tree.js
@@ -1,10 +1,10 @@
-require('less/tree').find = function (obj, fun) {
+require('./tree').find = function (obj, fun) {
     for (var i = 0, r; i < obj.length; i++) {
         if (r = fun.call(obj, obj[i])) { return r }
     }
     return null;
 };
-require('less/tree').jsify = function (obj) {
+require('./tree').jsify = function (obj) {
     if (Array.isArray(obj.value) && (obj.value.length > 1)) {
         return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']';
     } else {
diff --git a/lib/less/tree/alpha.js b/lib/less/tree/alpha.js
index 551ccba6b..139ae9204 100644
--- a/lib/less/tree/alpha.js
+++ b/lib/less/tree/alpha.js
@@ -14,4 +14,4 @@ tree.Alpha.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/anonymous.js b/lib/less/tree/anonymous.js
index 89840d0df..460c9ec78 100644
--- a/lib/less/tree/anonymous.js
+++ b/lib/less/tree/anonymous.js
@@ -10,4 +10,4 @@ tree.Anonymous.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/call.js b/lib/less/tree/call.js
index 4a72932bf..c6ea5d0fb 100644
--- a/lib/less/tree/call.js
+++ b/lib/less/tree/call.js
@@ -42,4 +42,4 @@ tree.Call.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/color.js b/lib/less/tree/color.js
index bb7646a5c..37ce1781d 100644
--- a/lib/less/tree/color.js
+++ b/lib/less/tree/color.js
@@ -98,4 +98,4 @@ tree.Color.prototype = {
 };
 
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/comment.js b/lib/less/tree/comment.js
index 2d95dff89..f4a33840d 100644
--- a/lib/less/tree/comment.js
+++ b/lib/less/tree/comment.js
@@ -11,4 +11,4 @@ tree.Comment.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/dimension.js b/lib/less/tree/dimension.js
index 41f3ca2cb..33560d760 100644
--- a/lib/less/tree/dimension.js
+++ b/lib/less/tree/dimension.js
@@ -31,4 +31,4 @@ tree.Dimension.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/directive.js b/lib/less/tree/directive.js
index fbe9a93e5..0e8df2437 100644
--- a/lib/less/tree/directive.js
+++ b/lib/less/tree/directive.js
@@ -30,4 +30,4 @@ tree.Directive.prototype = {
     rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/element.js b/lib/less/tree/element.js
index 27cf82285..0003a0f5f 100644
--- a/lib/less/tree/element.js
+++ b/lib/less/tree/element.js
@@ -32,4 +32,4 @@ tree.Combinator.prototype.toCSS = function (env) {
     }[this.value];
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/expression.js b/lib/less/tree/expression.js
index f638a1be6..405a2ac67 100644
--- a/lib/less/tree/expression.js
+++ b/lib/less/tree/expression.js
@@ -20,4 +20,4 @@ tree.Expression.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/import.js b/lib/less/tree/import.js
index 427c1095e..b3f9bd602 100644
--- a/lib/less/tree/import.js
+++ b/lib/less/tree/import.js
@@ -74,4 +74,4 @@ tree.Import.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/javascript.js b/lib/less/tree/javascript.js
index 4ec66b9eb..772a31ddd 100644
--- a/lib/less/tree/javascript.js
+++ b/lib/less/tree/javascript.js
@@ -47,5 +47,5 @@ tree.JavaScript.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
 
diff --git a/lib/less/tree/keyword.js b/lib/less/tree/keyword.js
index a4431ba3a..01635b225 100644
--- a/lib/less/tree/keyword.js
+++ b/lib/less/tree/keyword.js
@@ -6,4 +6,4 @@ tree.Keyword.prototype = {
     toCSS: function () { return this.value }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/mixin.js b/lib/less/tree/mixin.js
index 24cb8e4c0..86f8a1894 100644
--- a/lib/less/tree/mixin.js
+++ b/lib/less/tree/mixin.js
@@ -103,4 +103,4 @@ tree.mixin.Definition.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/operation.js b/lib/less/tree/operation.js
index d2e4d5780..1ce22fb04 100644
--- a/lib/less/tree/operation.js
+++ b/lib/less/tree/operation.js
@@ -29,4 +29,4 @@ tree.operate = function (op, a, b) {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/quoted.js b/lib/less/tree/quoted.js
index 6ddfa40f5..38a3f1338 100644
--- a/lib/less/tree/quoted.js
+++ b/lib/less/tree/quoted.js
@@ -26,4 +26,4 @@ tree.Quoted.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/rule.js b/lib/less/tree/rule.js
index 18cc49bfa..911cde6dc 100644
--- a/lib/less/tree/rule.js
+++ b/lib/less/tree/rule.js
@@ -35,4 +35,4 @@ tree.Shorthand.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/ruleset.js b/lib/less/tree/ruleset.js
index cc9a60aec..bd7845cbb 100644
--- a/lib/less/tree/ruleset.js
+++ b/lib/less/tree/ruleset.js
@@ -209,4 +209,4 @@ tree.Ruleset.prototype = {
         }
     }
 };
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/selector.js b/lib/less/tree/selector.js
index ddc684260..69eda8922 100644
--- a/lib/less/tree/selector.js
+++ b/lib/less/tree/selector.js
@@ -39,4 +39,4 @@ tree.Selector.prototype.toCSS = function (env) {
     }).join('');
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/url.js b/lib/less/tree/url.js
index f427070a8..50540c0ce 100644
--- a/lib/less/tree/url.js
+++ b/lib/less/tree/url.js
@@ -22,4 +22,4 @@ tree.URL.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/value.js b/lib/less/tree/value.js
index 922096cdc..3c1eb29a2 100644
--- a/lib/less/tree/value.js
+++ b/lib/less/tree/value.js
@@ -21,4 +21,4 @@ tree.Value.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/lib/less/tree/variable.js b/lib/less/tree/variable.js
index 10f7c0847..902859fd0 100644
--- a/lib/less/tree/variable.js
+++ b/lib/less/tree/variable.js
@@ -21,4 +21,4 @@ tree.Variable.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
diff --git a/test/less-test.js b/test/less-test.js
index 8dc162e75..b2349d8f9 100644
--- a/test/less-test.js
+++ b/test/less-test.js
@@ -2,9 +2,7 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 
 less.tree.functions.add = function (a, b) {
     return new(less.tree.Dimension)(a.value + b.value);