diff --git a/benchmark/less-benchmark.js b/benchmark/less-benchmark.js
index 03636e5c..297d6700 100644
--- a/benchmark/less-benchmark.js
+++ b/benchmark/less-benchmark.js
@@ -4,7 +4,7 @@ var path = require('path'),
 
 require.paths.unshift(__dirname, path.join(__dirname, '..'));
 
-var less = require('index');
+var less = require('lib/less');
 var file = path.join(__dirname, 'benchmark.less');
 
 fs.stat(file, function (e, stats) {
diff --git a/bin/lessc b/bin/lessc
index f102b814..30863bd2 100755
--- a/bin/lessc
+++ b/bin/lessc
@@ -6,7 +6,7 @@ var path = require('path'),
 
 require.paths.unshift(__dirname, path.join(__dirname, '..'));
 
-var less = require('index');
+var less = require('lib/less');
 var args = process.argv.slice(1);
 
 args = args.filter(function (arg) {
diff --git a/index.js b/lib/less/index.js
similarity index 98%
rename from index.js
rename to lib/less/index.js
index 9f9b862d..369c123e 100644
--- a/index.js
+++ b/lib/less/index.js
@@ -1,7 +1,7 @@
 var path = require('path'),
     fs = require('fs');
 
-require.paths.unshift(path.join(__dirname, 'lib'));
+require.paths.unshift(path.join(__dirname, '..'));
 
 var less = {
     version: [2, 0, 0],
diff --git a/test/less-test.js b/test/less-test.js
index 4e0e314f..05f00871 100644
--- a/test/less-test.js
+++ b/test/less-test.js
@@ -4,7 +4,7 @@ var path = require('path'),
 
 require.paths.unshift(__dirname, path.join(__dirname, '..'));
 
-var less = require('index');
+var less = require('lib/less');
 
 less.tree.functions.add = function (a, b) {
     return new(less.tree.Dimension)(a.value + b.value);