diff --git a/lib/less/data/index.js b/lib/less/data/index.js
new file mode 100644
index 00000000..436caae8
--- /dev/null
+++ b/lib/less/data/index.js
@@ -0,0 +1,4 @@
+module.exports = {
+    colors: require("./colors.js"),
+    unitConversions: require("./unit-conversions.js")
+};
diff --git a/lib/less/non-node-index.js b/lib/less/non-node-index.js
index 7a7e0f5f..df25f9a8 100644
--- a/lib/less/non-node-index.js
+++ b/lib/less/non-node-index.js
@@ -1,11 +1,9 @@
 var less = {
     version: [1, 6, 3],
-    data: {
-        colors: require('./data/colors')
-    }
+    data: require('./data/index.js')
 };
 
-less.tree = require('./tree');
+less.tree = require('./tree/index.js');
 less.visitor = require('./visitor/index.js')(less, less.tree);
 less.Parser = (require('./parser'))(less, less.tree, less.visitor);
 less.functions = (require('./functions/index.js'))(less, less.tree);
diff --git a/lib/less/tree.js b/lib/less/tree.js
deleted file mode 100644
index ed72dc47..00000000
--- a/lib/less/tree.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var tree = {};
-
-tree.Alpha = require('./tree/alpha');
-tree.Color = require('./tree/color');
-tree.Directive = require('./tree/directive');
-tree.DetachedRuleset = require('./tree/detached-ruleset');
-tree.Operation = require('./tree/operation');
-tree.Dimension = require('./tree/dimension');
-tree.Unit = require('./tree/unit');
-tree.Keyword = require('./tree/keyword');
-tree.Variable = require('./tree/variable');
-tree.Ruleset = require('./tree/ruleset');
-tree.Element = require('./tree/element');
-tree.Attribute = require('./tree/attribute');
-tree.Combinator = require('./tree/combinator');
-tree.Selector = require('./tree/selector');
-tree.Quoted = require('./tree/quoted');
-tree.Expression = require('./tree/expression');
-tree.Rule = require('./tree/rule');
-tree.Call = require('./tree/call');
-tree.URL = require('./tree/url');
-tree.Import = require('./tree/import');
-tree.mixin = {
-    Call: require('./tree/mixin-call'),
-    Definition: require('./tree/mixin-definition')
-};
-tree.Comment = require('./tree/comment');
-tree.Anonymous = require('./tree/anonymous');
-tree.Value = require('./tree/value');
-tree.JavaScript = require('./tree/javascript');
-tree.Assignment = require('./tree/assignment');
-tree.Condition = require('./tree/condition');
-tree.Paren = require('./tree/paren');
-tree.Media = require('./tree/media');
-tree.UnicodeDescriptor = require('./tree/unicode-descriptor');
-tree.Negative = require('./tree/negative');
-tree.Extend = require('./tree/extend');
-tree.RulesetCall = require('./tree/ruleset-call');
-
-module.exports = tree;
diff --git a/lib/less/tree/index.js b/lib/less/tree/index.js
new file mode 100644
index 00000000..a6004465
--- /dev/null
+++ b/lib/less/tree/index.js
@@ -0,0 +1,40 @@
+var tree = {};
+
+tree.Alpha = require('./alpha');
+tree.Color = require('./color');
+tree.Directive = require('./directive');
+tree.DetachedRuleset = require('./detached-ruleset');
+tree.Operation = require('./operation');
+tree.Dimension = require('./dimension');
+tree.Unit = require('./unit');
+tree.Keyword = require('./keyword');
+tree.Variable = require('./variable');
+tree.Ruleset = require('./ruleset');
+tree.Element = require('./element');
+tree.Attribute = require('./attribute');
+tree.Combinator = require('./combinator');
+tree.Selector = require('./selector');
+tree.Quoted = require('./quoted');
+tree.Expression = require('./expression');
+tree.Rule = require('./rule');
+tree.Call = require('./call');
+tree.URL = require('./url');
+tree.Import = require('./import');
+tree.mixin = {
+    Call: require('./mixin-call'),
+    Definition: require('./mixin-definition')
+};
+tree.Comment = require('./comment');
+tree.Anonymous = require('./anonymous');
+tree.Value = require('./value');
+tree.JavaScript = require('./javascript');
+tree.Assignment = require('./assignment');
+tree.Condition = require('./condition');
+tree.Paren = require('./paren');
+tree.Media = require('./media');
+tree.UnicodeDescriptor = require('./unicode-descriptor');
+tree.Negative = require('./negative');
+tree.Extend = require('./extend');
+tree.RulesetCall = require('./ruleset-call');
+
+module.exports = tree;