diff --git a/.npmignore b/.npmignore
index cbef13a0c..f40958eea 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,7 +2,6 @@ coverage
 img
 misc
 node_modules
-src
 test
 tools
 component.json
diff --git a/Jakefile.js b/Jakefile.js
index c543f7a65..c301684a0 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -9,7 +9,7 @@ var jake = require('jake'),
 /**
  * Constants
  */
-var HEADER      = './src/header.js';
+var HEADER      = './lib/header.js';
 var DIST        = './dist';
 var MATHJS      = DIST + '/math.js';
 var MATHJS_MIN  = DIST + '/math.min.js';
@@ -38,7 +38,7 @@ task('bundle', {async: true}, function () {
   // make directory dist
   jake.mkdirP(DIST);
 
-  b.add('./src/index.js');
+  b.add('./lib/index.js');
   b.bundle({
     standalone: 'math'
   }, function (err, code) {
@@ -47,7 +47,7 @@ task('bundle', {async: true}, function () {
     }
 
     // add header and shim
-    var lib = util.read('./src/header.js') + code + util.read('./src/shim.js');
+    var lib = util.read('./lib/header.js') + code + util.read('./lib/shim.js');
 
     // write bundled file
     util.write(MATHJS, lib);
diff --git a/README.md b/README.md
index 4a1667518..d0ae94723 100644
--- a/README.md
+++ b/README.md
@@ -732,7 +732,7 @@ There are a few preferences regarding code contributions:
 - Math.js follows the node.js code style as described
   [here](http://nodeguide.com/style.html).
 - Send pull requests to the `develop` branch, not the `master` branch.
-- Only commit changes done in the source files under `src`, not to the library
+- Only commit changes done in the source files under `lib`, not to the builds, which are under `dist`.
   builds `math.js` and `math.min.js`.
 
 Thanks!
diff --git a/bower.json b/bower.json
index 3142b6ef3..6b2b1846d 100644
--- a/bower.json
+++ b/bower.json
@@ -7,7 +7,7 @@
     "img",
     "misc",
     "node_modules",
-    "src",
+    "lib",
     "test",
     "tools",
     ".gitignore",
diff --git a/examples/basic_usage.js b/examples/basic_usage.js
index 1530fc169..092a24f5b 100644
--- a/examples/basic_usage.js
+++ b/examples/basic_usage.js
@@ -1,7 +1,7 @@
 // basic usage
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/chained_operations.js b/examples/chained_operations.js
index 6cf07822f..21b876438 100644
--- a/examples/chained_operations.js
+++ b/examples/chained_operations.js
@@ -1,7 +1,7 @@
 // chained operations
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/complex_numbers.js b/examples/complex_numbers.js
index 93551504c..8818add21 100644
--- a/examples/complex_numbers.js
+++ b/examples/complex_numbers.js
@@ -1,7 +1,7 @@
 // complex numbers
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/expressions.js b/examples/expressions.js
index fec48c021..795ed09ed 100644
--- a/examples/expressions.js
+++ b/examples/expressions.js
@@ -8,7 +8,7 @@
  */
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/import.js b/examples/import.js
index 1f72c7d2d..85314fdaf 100644
--- a/examples/import.js
+++ b/examples/import.js
@@ -4,7 +4,7 @@
  * with functions and variables.
  */
 
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/matrices.js b/examples/matrices.js
index 1ccb288d0..6503424cf 100644
--- a/examples/matrices.js
+++ b/examples/matrices.js
@@ -1,7 +1,7 @@
 // matrices
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/examples/units.js b/examples/units.js
index 91e93b040..17e5ca36a 100644
--- a/examples/units.js
+++ b/examples/units.js
@@ -1,7 +1,7 @@
 // units
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.
diff --git a/index.js b/index.js
index ae3f7bd9b..80af54e81 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,116 @@
-module.exports = require('./src/index.js');
\ No newline at end of file
+// options (global configuration settings)
+exports.options = require('./lib/options');
+
+// expression (Parser, Scope, Nodes)
+exports.expr = {};
+exports.expr.node = require('./lib/expr/node/index.js');
+exports.expr.Scope = require('./lib/expr/Scope.js');
+exports.expr.Parser = require('./lib/expr/Parser.js');
+
+// types (Matrix, Complex, Unit, ...)
+exports.type = require('./lib/type/index.js');
+
+// docs
+exports.docs = require('./lib/docs/index.js');
+
+// functions - arithmetic
+require('./lib/function/arithmetic/abs.js')(exports);
+require('./lib/function/arithmetic/add.js')(exports);
+require('./lib/function/arithmetic/add.js')(exports);
+require('./lib/function/arithmetic/ceil.js')(exports);
+require('./lib/function/arithmetic/cube.js')(exports);
+require('./lib/function/arithmetic/divide.js')(exports);
+require('./lib/function/arithmetic/edivide.js')(exports);
+require('./lib/function/arithmetic/emultiply.js')(exports);
+require('./lib/function/arithmetic/epow.js')(exports);
+require('./lib/function/arithmetic/equal.js')(exports);
+require('./lib/function/arithmetic/exp.js')(exports);
+require('./lib/function/arithmetic/fix.js')(exports);
+require('./lib/function/arithmetic/floor.js')(exports);
+require('./lib/function/arithmetic/gcd.js')(exports);
+require('./lib/function/arithmetic/larger.js')(exports);
+require('./lib/function/arithmetic/largereq.js')(exports);
+require('./lib/function/arithmetic/lcm.js')(exports);
+require('./lib/function/arithmetic/log.js')(exports);
+require('./lib/function/arithmetic/log10.js')(exports);
+require('./lib/function/arithmetic/mod.js')(exports);
+require('./lib/function/arithmetic/multiply.js')(exports);
+require('./lib/function/arithmetic/pow.js')(exports);
+require('./lib/function/arithmetic/round.js')(exports);
+require('./lib/function/arithmetic/sign.js')(exports);
+require('./lib/function/arithmetic/smaller.js')(exports);
+require('./lib/function/arithmetic/smallereq.js')(exports);
+require('./lib/function/arithmetic/sqrt.js')(exports);
+require('./lib/function/arithmetic/square.js')(exports);
+require('./lib/function/arithmetic/subtract.js')(exports);
+require('./lib/function/arithmetic/unary.js')(exports);
+require('./lib/function/arithmetic/unequal.js')(exports);
+require('./lib/function/arithmetic/xgcd.js')(exports);
+
+// functions - complex
+require('./lib/function/complex/arg.js')(exports);
+require('./lib/function/complex/conj.js')(exports);
+require('./lib/function/complex/re.js')(exports);
+require('./lib/function/complex/im.js')(exports);
+
+// functions - construction
+require('./lib/function/construction/boolean.js')(exports);
+require('./lib/function/construction/complex.js')(exports);
+require('./lib/function/construction/matrix.js')(exports);
+require('./lib/function/construction/number.js')(exports);
+require('./lib/function/construction/parser.js')(exports);
+require('./lib/function/construction/range.js')(exports);
+require('./lib/function/construction/string.js')(exports);
+require('./lib/function/construction/unit.js')(exports);
+
+// functions - matrix
+require('./lib/function/matrix/concat.js')(exports);
+require('./lib/function/matrix/det.js')(exports);
+require('./lib/function/matrix/diag.js')(exports);
+require('./lib/function/matrix/eye.js')(exports);
+require('./lib/function/matrix/inv.js')(exports);
+require('./lib/function/matrix/ones.js')(exports);
+require('./lib/function/matrix/size.js')(exports);
+require('./lib/function/matrix/squeeze.js')(exports);
+require('./lib/function/matrix/subset.js')(exports);
+require('./lib/function/matrix/transpose.js')(exports);
+require('./lib/function/matrix/zeros.js')(exports);
+
+// functions - probability
+require('./lib/function/probability/factorial.js')(exports);
+require('./lib/function/probability/random.js')(exports);
+
+// functions - statistics
+require('./lib/function/statistics/min.js')(exports);
+require('./lib/function/statistics/max.js')(exports);
+
+// functions - trigonometry
+require('./lib/function/trigonometry/acos.js')(exports);
+require('./lib/function/trigonometry/asin.js')(exports);
+require('./lib/function/trigonometry/atan.js')(exports);
+require('./lib/function/trigonometry/atan2.js')(exports);
+require('./lib/function/trigonometry/cos.js')(exports);
+require('./lib/function/trigonometry/cot.js')(exports);
+require('./lib/function/trigonometry/csc.js')(exports);
+require('./lib/function/trigonometry/sec.js')(exports);
+require('./lib/function/trigonometry/sin.js')(exports);
+require('./lib/function/trigonometry/tan.js')(exports);
+
+// functions - units
+require('./lib/function/units/in.js')(exports);
+
+// functions - utils
+require('./lib/function/utils/clone.js')(exports);
+require('./lib/function/utils/eval.js')(exports);
+require('./lib/function/utils/format.js')(exports);
+require('./lib/function/utils/help.js')(exports);
+require('./lib/function/utils/import.js')(exports);
+require('./lib/function/utils/parse.js')(exports);
+require('./lib/function/utils/select.js')(exports);
+require('./lib/function/utils/typeof.js')(exports);
+
+// constants
+require('./lib/constants.js')(exports);
+
+// selector (we initialize after all functions are loaded)
+exports.expr.Selector = require('./lib/expr/Selector.js')(exports);
diff --git a/src/constants.js b/lib/constants.js
similarity index 100%
rename from src/constants.js
rename to lib/constants.js
diff --git a/src/docs/constants/Infinity.js b/lib/docs/constants/Infinity.js
similarity index 100%
rename from src/docs/constants/Infinity.js
rename to lib/docs/constants/Infinity.js
diff --git a/src/docs/constants/LN10.js b/lib/docs/constants/LN10.js
similarity index 100%
rename from src/docs/constants/LN10.js
rename to lib/docs/constants/LN10.js
diff --git a/src/docs/constants/LN2.js b/lib/docs/constants/LN2.js
similarity index 100%
rename from src/docs/constants/LN2.js
rename to lib/docs/constants/LN2.js
diff --git a/src/docs/constants/LOG10E.js b/lib/docs/constants/LOG10E.js
similarity index 100%
rename from src/docs/constants/LOG10E.js
rename to lib/docs/constants/LOG10E.js
diff --git a/src/docs/constants/LOG2E.js b/lib/docs/constants/LOG2E.js
similarity index 100%
rename from src/docs/constants/LOG2E.js
rename to lib/docs/constants/LOG2E.js
diff --git a/src/docs/constants/NaN.js b/lib/docs/constants/NaN.js
similarity index 100%
rename from src/docs/constants/NaN.js
rename to lib/docs/constants/NaN.js
diff --git a/src/docs/constants/SQRT1_2.js b/lib/docs/constants/SQRT1_2.js
similarity index 100%
rename from src/docs/constants/SQRT1_2.js
rename to lib/docs/constants/SQRT1_2.js
diff --git a/src/docs/constants/SQRT2.js b/lib/docs/constants/SQRT2.js
similarity index 100%
rename from src/docs/constants/SQRT2.js
rename to lib/docs/constants/SQRT2.js
diff --git a/src/docs/constants/e.js b/lib/docs/constants/e.js
similarity index 100%
rename from src/docs/constants/e.js
rename to lib/docs/constants/e.js
diff --git a/src/docs/constants/false.js b/lib/docs/constants/false.js
similarity index 100%
rename from src/docs/constants/false.js
rename to lib/docs/constants/false.js
diff --git a/src/docs/constants/i.js b/lib/docs/constants/i.js
similarity index 100%
rename from src/docs/constants/i.js
rename to lib/docs/constants/i.js
diff --git a/src/docs/constants/pi.js b/lib/docs/constants/pi.js
similarity index 100%
rename from src/docs/constants/pi.js
rename to lib/docs/constants/pi.js
diff --git a/src/docs/constants/tau.js b/lib/docs/constants/tau.js
similarity index 100%
rename from src/docs/constants/tau.js
rename to lib/docs/constants/tau.js
diff --git a/src/docs/constants/true.js b/lib/docs/constants/true.js
similarity index 100%
rename from src/docs/constants/true.js
rename to lib/docs/constants/true.js
diff --git a/src/docs/function/arithmetic/abs.js b/lib/docs/function/arithmetic/abs.js
similarity index 100%
rename from src/docs/function/arithmetic/abs.js
rename to lib/docs/function/arithmetic/abs.js
diff --git a/src/docs/function/arithmetic/add.js b/lib/docs/function/arithmetic/add.js
similarity index 100%
rename from src/docs/function/arithmetic/add.js
rename to lib/docs/function/arithmetic/add.js
diff --git a/src/docs/function/arithmetic/ceil.js b/lib/docs/function/arithmetic/ceil.js
similarity index 100%
rename from src/docs/function/arithmetic/ceil.js
rename to lib/docs/function/arithmetic/ceil.js
diff --git a/src/docs/function/arithmetic/cube.js b/lib/docs/function/arithmetic/cube.js
similarity index 100%
rename from src/docs/function/arithmetic/cube.js
rename to lib/docs/function/arithmetic/cube.js
diff --git a/src/docs/function/arithmetic/divide.js b/lib/docs/function/arithmetic/divide.js
similarity index 100%
rename from src/docs/function/arithmetic/divide.js
rename to lib/docs/function/arithmetic/divide.js
diff --git a/src/docs/function/arithmetic/edivide.js b/lib/docs/function/arithmetic/edivide.js
similarity index 100%
rename from src/docs/function/arithmetic/edivide.js
rename to lib/docs/function/arithmetic/edivide.js
diff --git a/src/docs/function/arithmetic/emultiply.js b/lib/docs/function/arithmetic/emultiply.js
similarity index 100%
rename from src/docs/function/arithmetic/emultiply.js
rename to lib/docs/function/arithmetic/emultiply.js
diff --git a/src/docs/function/arithmetic/epow.js b/lib/docs/function/arithmetic/epow.js
similarity index 100%
rename from src/docs/function/arithmetic/epow.js
rename to lib/docs/function/arithmetic/epow.js
diff --git a/src/docs/function/arithmetic/equal.js b/lib/docs/function/arithmetic/equal.js
similarity index 100%
rename from src/docs/function/arithmetic/equal.js
rename to lib/docs/function/arithmetic/equal.js
diff --git a/src/docs/function/arithmetic/exp.js b/lib/docs/function/arithmetic/exp.js
similarity index 100%
rename from src/docs/function/arithmetic/exp.js
rename to lib/docs/function/arithmetic/exp.js
diff --git a/src/docs/function/arithmetic/fix.js b/lib/docs/function/arithmetic/fix.js
similarity index 100%
rename from src/docs/function/arithmetic/fix.js
rename to lib/docs/function/arithmetic/fix.js
diff --git a/src/docs/function/arithmetic/floor.js b/lib/docs/function/arithmetic/floor.js
similarity index 100%
rename from src/docs/function/arithmetic/floor.js
rename to lib/docs/function/arithmetic/floor.js
diff --git a/src/docs/function/arithmetic/gcd.js b/lib/docs/function/arithmetic/gcd.js
similarity index 100%
rename from src/docs/function/arithmetic/gcd.js
rename to lib/docs/function/arithmetic/gcd.js
diff --git a/src/docs/function/arithmetic/larger.js b/lib/docs/function/arithmetic/larger.js
similarity index 100%
rename from src/docs/function/arithmetic/larger.js
rename to lib/docs/function/arithmetic/larger.js
diff --git a/src/docs/function/arithmetic/largereq.js b/lib/docs/function/arithmetic/largereq.js
similarity index 100%
rename from src/docs/function/arithmetic/largereq.js
rename to lib/docs/function/arithmetic/largereq.js
diff --git a/src/docs/function/arithmetic/lcm.js b/lib/docs/function/arithmetic/lcm.js
similarity index 100%
rename from src/docs/function/arithmetic/lcm.js
rename to lib/docs/function/arithmetic/lcm.js
diff --git a/src/docs/function/arithmetic/log.js b/lib/docs/function/arithmetic/log.js
similarity index 100%
rename from src/docs/function/arithmetic/log.js
rename to lib/docs/function/arithmetic/log.js
diff --git a/src/docs/function/arithmetic/log10.js b/lib/docs/function/arithmetic/log10.js
similarity index 100%
rename from src/docs/function/arithmetic/log10.js
rename to lib/docs/function/arithmetic/log10.js
diff --git a/src/docs/function/arithmetic/mod.js b/lib/docs/function/arithmetic/mod.js
similarity index 100%
rename from src/docs/function/arithmetic/mod.js
rename to lib/docs/function/arithmetic/mod.js
diff --git a/src/docs/function/arithmetic/multiply.js b/lib/docs/function/arithmetic/multiply.js
similarity index 100%
rename from src/docs/function/arithmetic/multiply.js
rename to lib/docs/function/arithmetic/multiply.js
diff --git a/src/docs/function/arithmetic/pow.js b/lib/docs/function/arithmetic/pow.js
similarity index 100%
rename from src/docs/function/arithmetic/pow.js
rename to lib/docs/function/arithmetic/pow.js
diff --git a/src/docs/function/arithmetic/round.js b/lib/docs/function/arithmetic/round.js
similarity index 100%
rename from src/docs/function/arithmetic/round.js
rename to lib/docs/function/arithmetic/round.js
diff --git a/src/docs/function/arithmetic/sign.js b/lib/docs/function/arithmetic/sign.js
similarity index 100%
rename from src/docs/function/arithmetic/sign.js
rename to lib/docs/function/arithmetic/sign.js
diff --git a/src/docs/function/arithmetic/smaller.js b/lib/docs/function/arithmetic/smaller.js
similarity index 100%
rename from src/docs/function/arithmetic/smaller.js
rename to lib/docs/function/arithmetic/smaller.js
diff --git a/src/docs/function/arithmetic/smallereq.js b/lib/docs/function/arithmetic/smallereq.js
similarity index 100%
rename from src/docs/function/arithmetic/smallereq.js
rename to lib/docs/function/arithmetic/smallereq.js
diff --git a/src/docs/function/arithmetic/sqrt.js b/lib/docs/function/arithmetic/sqrt.js
similarity index 100%
rename from src/docs/function/arithmetic/sqrt.js
rename to lib/docs/function/arithmetic/sqrt.js
diff --git a/src/docs/function/arithmetic/square.js b/lib/docs/function/arithmetic/square.js
similarity index 100%
rename from src/docs/function/arithmetic/square.js
rename to lib/docs/function/arithmetic/square.js
diff --git a/src/docs/function/arithmetic/subtract.js b/lib/docs/function/arithmetic/subtract.js
similarity index 100%
rename from src/docs/function/arithmetic/subtract.js
rename to lib/docs/function/arithmetic/subtract.js
diff --git a/src/docs/function/arithmetic/unary.js b/lib/docs/function/arithmetic/unary.js
similarity index 100%
rename from src/docs/function/arithmetic/unary.js
rename to lib/docs/function/arithmetic/unary.js
diff --git a/src/docs/function/arithmetic/unequal.js b/lib/docs/function/arithmetic/unequal.js
similarity index 100%
rename from src/docs/function/arithmetic/unequal.js
rename to lib/docs/function/arithmetic/unequal.js
diff --git a/src/docs/function/arithmetic/xgcd.js b/lib/docs/function/arithmetic/xgcd.js
similarity index 100%
rename from src/docs/function/arithmetic/xgcd.js
rename to lib/docs/function/arithmetic/xgcd.js
diff --git a/src/docs/function/complex/arg.js b/lib/docs/function/complex/arg.js
similarity index 100%
rename from src/docs/function/complex/arg.js
rename to lib/docs/function/complex/arg.js
diff --git a/src/docs/function/complex/conj.js b/lib/docs/function/complex/conj.js
similarity index 100%
rename from src/docs/function/complex/conj.js
rename to lib/docs/function/complex/conj.js
diff --git a/src/docs/function/complex/im.js b/lib/docs/function/complex/im.js
similarity index 100%
rename from src/docs/function/complex/im.js
rename to lib/docs/function/complex/im.js
diff --git a/src/docs/function/complex/re.js b/lib/docs/function/complex/re.js
similarity index 100%
rename from src/docs/function/complex/re.js
rename to lib/docs/function/complex/re.js
diff --git a/src/docs/function/construction/boolean.js b/lib/docs/function/construction/boolean.js
similarity index 100%
rename from src/docs/function/construction/boolean.js
rename to lib/docs/function/construction/boolean.js
diff --git a/src/docs/function/construction/complex.js b/lib/docs/function/construction/complex.js
similarity index 100%
rename from src/docs/function/construction/complex.js
rename to lib/docs/function/construction/complex.js
diff --git a/src/docs/function/construction/matrix.js b/lib/docs/function/construction/matrix.js
similarity index 100%
rename from src/docs/function/construction/matrix.js
rename to lib/docs/function/construction/matrix.js
diff --git a/src/docs/function/construction/number.js b/lib/docs/function/construction/number.js
similarity index 100%
rename from src/docs/function/construction/number.js
rename to lib/docs/function/construction/number.js
diff --git a/src/docs/function/construction/range.js b/lib/docs/function/construction/range.js
similarity index 100%
rename from src/docs/function/construction/range.js
rename to lib/docs/function/construction/range.js
diff --git a/src/docs/function/construction/string.js b/lib/docs/function/construction/string.js
similarity index 100%
rename from src/docs/function/construction/string.js
rename to lib/docs/function/construction/string.js
diff --git a/src/docs/function/construction/unit.js b/lib/docs/function/construction/unit.js
similarity index 100%
rename from src/docs/function/construction/unit.js
rename to lib/docs/function/construction/unit.js
diff --git a/src/docs/function/matrix/concat.js b/lib/docs/function/matrix/concat.js
similarity index 100%
rename from src/docs/function/matrix/concat.js
rename to lib/docs/function/matrix/concat.js
diff --git a/src/docs/function/matrix/det.js b/lib/docs/function/matrix/det.js
similarity index 100%
rename from src/docs/function/matrix/det.js
rename to lib/docs/function/matrix/det.js
diff --git a/src/docs/function/matrix/diag.js b/lib/docs/function/matrix/diag.js
similarity index 100%
rename from src/docs/function/matrix/diag.js
rename to lib/docs/function/matrix/diag.js
diff --git a/src/docs/function/matrix/eye.js b/lib/docs/function/matrix/eye.js
similarity index 100%
rename from src/docs/function/matrix/eye.js
rename to lib/docs/function/matrix/eye.js
diff --git a/src/docs/function/matrix/inv.js b/lib/docs/function/matrix/inv.js
similarity index 100%
rename from src/docs/function/matrix/inv.js
rename to lib/docs/function/matrix/inv.js
diff --git a/src/docs/function/matrix/ones.js b/lib/docs/function/matrix/ones.js
similarity index 100%
rename from src/docs/function/matrix/ones.js
rename to lib/docs/function/matrix/ones.js
diff --git a/src/docs/function/matrix/size.js b/lib/docs/function/matrix/size.js
similarity index 100%
rename from src/docs/function/matrix/size.js
rename to lib/docs/function/matrix/size.js
diff --git a/src/docs/function/matrix/squeeze.js b/lib/docs/function/matrix/squeeze.js
similarity index 100%
rename from src/docs/function/matrix/squeeze.js
rename to lib/docs/function/matrix/squeeze.js
diff --git a/src/docs/function/matrix/subset.js b/lib/docs/function/matrix/subset.js
similarity index 100%
rename from src/docs/function/matrix/subset.js
rename to lib/docs/function/matrix/subset.js
diff --git a/src/docs/function/matrix/transpose.js b/lib/docs/function/matrix/transpose.js
similarity index 100%
rename from src/docs/function/matrix/transpose.js
rename to lib/docs/function/matrix/transpose.js
diff --git a/src/docs/function/matrix/zeros.js b/lib/docs/function/matrix/zeros.js
similarity index 100%
rename from src/docs/function/matrix/zeros.js
rename to lib/docs/function/matrix/zeros.js
diff --git a/src/docs/function/probability/factorial.js b/lib/docs/function/probability/factorial.js
similarity index 100%
rename from src/docs/function/probability/factorial.js
rename to lib/docs/function/probability/factorial.js
diff --git a/src/docs/function/probability/random.js b/lib/docs/function/probability/random.js
similarity index 100%
rename from src/docs/function/probability/random.js
rename to lib/docs/function/probability/random.js
diff --git a/src/docs/function/probability/randomInt.js b/lib/docs/function/probability/randomInt.js
similarity index 100%
rename from src/docs/function/probability/randomInt.js
rename to lib/docs/function/probability/randomInt.js
diff --git a/src/docs/function/statistics/max.js b/lib/docs/function/statistics/max.js
similarity index 100%
rename from src/docs/function/statistics/max.js
rename to lib/docs/function/statistics/max.js
diff --git a/src/docs/function/statistics/min.js b/lib/docs/function/statistics/min.js
similarity index 100%
rename from src/docs/function/statistics/min.js
rename to lib/docs/function/statistics/min.js
diff --git a/src/docs/function/trigonometry/acos.js b/lib/docs/function/trigonometry/acos.js
similarity index 100%
rename from src/docs/function/trigonometry/acos.js
rename to lib/docs/function/trigonometry/acos.js
diff --git a/src/docs/function/trigonometry/asin.js b/lib/docs/function/trigonometry/asin.js
similarity index 100%
rename from src/docs/function/trigonometry/asin.js
rename to lib/docs/function/trigonometry/asin.js
diff --git a/src/docs/function/trigonometry/atan.js b/lib/docs/function/trigonometry/atan.js
similarity index 100%
rename from src/docs/function/trigonometry/atan.js
rename to lib/docs/function/trigonometry/atan.js
diff --git a/src/docs/function/trigonometry/atan2.js b/lib/docs/function/trigonometry/atan2.js
similarity index 100%
rename from src/docs/function/trigonometry/atan2.js
rename to lib/docs/function/trigonometry/atan2.js
diff --git a/src/docs/function/trigonometry/cos.js b/lib/docs/function/trigonometry/cos.js
similarity index 100%
rename from src/docs/function/trigonometry/cos.js
rename to lib/docs/function/trigonometry/cos.js
diff --git a/src/docs/function/trigonometry/cot.js b/lib/docs/function/trigonometry/cot.js
similarity index 100%
rename from src/docs/function/trigonometry/cot.js
rename to lib/docs/function/trigonometry/cot.js
diff --git a/src/docs/function/trigonometry/csc.js b/lib/docs/function/trigonometry/csc.js
similarity index 100%
rename from src/docs/function/trigonometry/csc.js
rename to lib/docs/function/trigonometry/csc.js
diff --git a/src/docs/function/trigonometry/sec.js b/lib/docs/function/trigonometry/sec.js
similarity index 100%
rename from src/docs/function/trigonometry/sec.js
rename to lib/docs/function/trigonometry/sec.js
diff --git a/src/docs/function/trigonometry/sin.js b/lib/docs/function/trigonometry/sin.js
similarity index 100%
rename from src/docs/function/trigonometry/sin.js
rename to lib/docs/function/trigonometry/sin.js
diff --git a/src/docs/function/trigonometry/tan.js b/lib/docs/function/trigonometry/tan.js
similarity index 100%
rename from src/docs/function/trigonometry/tan.js
rename to lib/docs/function/trigonometry/tan.js
diff --git a/src/docs/function/units/in.js b/lib/docs/function/units/in.js
similarity index 100%
rename from src/docs/function/units/in.js
rename to lib/docs/function/units/in.js
diff --git a/src/docs/function/utils/clone.js b/lib/docs/function/utils/clone.js
similarity index 100%
rename from src/docs/function/utils/clone.js
rename to lib/docs/function/utils/clone.js
diff --git a/src/docs/function/utils/eval.js b/lib/docs/function/utils/eval.js
similarity index 100%
rename from src/docs/function/utils/eval.js
rename to lib/docs/function/utils/eval.js
diff --git a/src/docs/function/utils/format.js b/lib/docs/function/utils/format.js
similarity index 100%
rename from src/docs/function/utils/format.js
rename to lib/docs/function/utils/format.js
diff --git a/src/docs/function/utils/help.js b/lib/docs/function/utils/help.js
similarity index 100%
rename from src/docs/function/utils/help.js
rename to lib/docs/function/utils/help.js
diff --git a/src/docs/function/utils/import.js b/lib/docs/function/utils/import.js
similarity index 100%
rename from src/docs/function/utils/import.js
rename to lib/docs/function/utils/import.js
diff --git a/src/docs/function/utils/typeof.js b/lib/docs/function/utils/typeof.js
similarity index 100%
rename from src/docs/function/utils/typeof.js
rename to lib/docs/function/utils/typeof.js
diff --git a/src/docs/index.js b/lib/docs/index.js
similarity index 100%
rename from src/docs/index.js
rename to lib/docs/index.js
diff --git a/src/exports.js b/lib/exports.js
similarity index 100%
rename from src/exports.js
rename to lib/exports.js
diff --git a/src/expr/Parser.js b/lib/expr/Parser.js
similarity index 100%
rename from src/expr/Parser.js
rename to lib/expr/Parser.js
diff --git a/src/expr/Scope.js b/lib/expr/Scope.js
similarity index 100%
rename from src/expr/Scope.js
rename to lib/expr/Scope.js
diff --git a/src/expr/Selector.js b/lib/expr/Selector.js
similarity index 100%
rename from src/expr/Selector.js
rename to lib/expr/Selector.js
diff --git a/src/expr/node/AssignmentNode.js b/lib/expr/node/AssignmentNode.js
similarity index 100%
rename from src/expr/node/AssignmentNode.js
rename to lib/expr/node/AssignmentNode.js
diff --git a/src/expr/node/BlockNode.js b/lib/expr/node/BlockNode.js
similarity index 100%
rename from src/expr/node/BlockNode.js
rename to lib/expr/node/BlockNode.js
diff --git a/src/expr/node/ConstantNode.js b/lib/expr/node/ConstantNode.js
similarity index 100%
rename from src/expr/node/ConstantNode.js
rename to lib/expr/node/ConstantNode.js
diff --git a/src/expr/node/FunctionNode.js b/lib/expr/node/FunctionNode.js
similarity index 100%
rename from src/expr/node/FunctionNode.js
rename to lib/expr/node/FunctionNode.js
diff --git a/src/expr/node/MatrixNode.js b/lib/expr/node/MatrixNode.js
similarity index 100%
rename from src/expr/node/MatrixNode.js
rename to lib/expr/node/MatrixNode.js
diff --git a/src/expr/node/Node.js b/lib/expr/node/Node.js
similarity index 100%
rename from src/expr/node/Node.js
rename to lib/expr/node/Node.js
diff --git a/src/expr/node/OperatorNode.js b/lib/expr/node/OperatorNode.js
similarity index 100%
rename from src/expr/node/OperatorNode.js
rename to lib/expr/node/OperatorNode.js
diff --git a/src/expr/node/ParamsNode.js b/lib/expr/node/ParamsNode.js
similarity index 100%
rename from src/expr/node/ParamsNode.js
rename to lib/expr/node/ParamsNode.js
diff --git a/src/expr/node/SymbolNode.js b/lib/expr/node/SymbolNode.js
similarity index 100%
rename from src/expr/node/SymbolNode.js
rename to lib/expr/node/SymbolNode.js
diff --git a/src/expr/node/UpdateNode.js b/lib/expr/node/UpdateNode.js
similarity index 100%
rename from src/expr/node/UpdateNode.js
rename to lib/expr/node/UpdateNode.js
diff --git a/src/expr/node/handlers.js b/lib/expr/node/handlers.js
similarity index 100%
rename from src/expr/node/handlers.js
rename to lib/expr/node/handlers.js
diff --git a/src/expr/node/index.js b/lib/expr/node/index.js
similarity index 100%
rename from src/expr/node/index.js
rename to lib/expr/node/index.js
diff --git a/src/function/arithmetic/abs.js b/lib/function/arithmetic/abs.js
similarity index 100%
rename from src/function/arithmetic/abs.js
rename to lib/function/arithmetic/abs.js
diff --git a/src/function/arithmetic/add.js b/lib/function/arithmetic/add.js
similarity index 100%
rename from src/function/arithmetic/add.js
rename to lib/function/arithmetic/add.js
diff --git a/src/function/arithmetic/ceil.js b/lib/function/arithmetic/ceil.js
similarity index 100%
rename from src/function/arithmetic/ceil.js
rename to lib/function/arithmetic/ceil.js
diff --git a/src/function/arithmetic/cube.js b/lib/function/arithmetic/cube.js
similarity index 100%
rename from src/function/arithmetic/cube.js
rename to lib/function/arithmetic/cube.js
diff --git a/src/function/arithmetic/divide.js b/lib/function/arithmetic/divide.js
similarity index 100%
rename from src/function/arithmetic/divide.js
rename to lib/function/arithmetic/divide.js
diff --git a/src/function/arithmetic/edivide.js b/lib/function/arithmetic/edivide.js
similarity index 100%
rename from src/function/arithmetic/edivide.js
rename to lib/function/arithmetic/edivide.js
diff --git a/src/function/arithmetic/emultiply.js b/lib/function/arithmetic/emultiply.js
similarity index 100%
rename from src/function/arithmetic/emultiply.js
rename to lib/function/arithmetic/emultiply.js
diff --git a/src/function/arithmetic/epow.js b/lib/function/arithmetic/epow.js
similarity index 100%
rename from src/function/arithmetic/epow.js
rename to lib/function/arithmetic/epow.js
diff --git a/src/function/arithmetic/equal.js b/lib/function/arithmetic/equal.js
similarity index 100%
rename from src/function/arithmetic/equal.js
rename to lib/function/arithmetic/equal.js
diff --git a/src/function/arithmetic/exp.js b/lib/function/arithmetic/exp.js
similarity index 100%
rename from src/function/arithmetic/exp.js
rename to lib/function/arithmetic/exp.js
diff --git a/src/function/arithmetic/fix.js b/lib/function/arithmetic/fix.js
similarity index 100%
rename from src/function/arithmetic/fix.js
rename to lib/function/arithmetic/fix.js
diff --git a/src/function/arithmetic/floor.js b/lib/function/arithmetic/floor.js
similarity index 100%
rename from src/function/arithmetic/floor.js
rename to lib/function/arithmetic/floor.js
diff --git a/src/function/arithmetic/gcd.js b/lib/function/arithmetic/gcd.js
similarity index 100%
rename from src/function/arithmetic/gcd.js
rename to lib/function/arithmetic/gcd.js
diff --git a/src/function/arithmetic/larger.js b/lib/function/arithmetic/larger.js
similarity index 100%
rename from src/function/arithmetic/larger.js
rename to lib/function/arithmetic/larger.js
diff --git a/src/function/arithmetic/largereq.js b/lib/function/arithmetic/largereq.js
similarity index 100%
rename from src/function/arithmetic/largereq.js
rename to lib/function/arithmetic/largereq.js
diff --git a/src/function/arithmetic/lcm.js b/lib/function/arithmetic/lcm.js
similarity index 100%
rename from src/function/arithmetic/lcm.js
rename to lib/function/arithmetic/lcm.js
diff --git a/src/function/arithmetic/log.js b/lib/function/arithmetic/log.js
similarity index 100%
rename from src/function/arithmetic/log.js
rename to lib/function/arithmetic/log.js
diff --git a/src/function/arithmetic/log10.js b/lib/function/arithmetic/log10.js
similarity index 100%
rename from src/function/arithmetic/log10.js
rename to lib/function/arithmetic/log10.js
diff --git a/src/function/arithmetic/mod.js b/lib/function/arithmetic/mod.js
similarity index 100%
rename from src/function/arithmetic/mod.js
rename to lib/function/arithmetic/mod.js
diff --git a/src/function/arithmetic/multiply.js b/lib/function/arithmetic/multiply.js
similarity index 100%
rename from src/function/arithmetic/multiply.js
rename to lib/function/arithmetic/multiply.js
diff --git a/src/function/arithmetic/pow.js b/lib/function/arithmetic/pow.js
similarity index 100%
rename from src/function/arithmetic/pow.js
rename to lib/function/arithmetic/pow.js
diff --git a/src/function/arithmetic/round.js b/lib/function/arithmetic/round.js
similarity index 100%
rename from src/function/arithmetic/round.js
rename to lib/function/arithmetic/round.js
diff --git a/src/function/arithmetic/sign.js b/lib/function/arithmetic/sign.js
similarity index 100%
rename from src/function/arithmetic/sign.js
rename to lib/function/arithmetic/sign.js
diff --git a/src/function/arithmetic/smaller.js b/lib/function/arithmetic/smaller.js
similarity index 100%
rename from src/function/arithmetic/smaller.js
rename to lib/function/arithmetic/smaller.js
diff --git a/src/function/arithmetic/smallereq.js b/lib/function/arithmetic/smallereq.js
similarity index 100%
rename from src/function/arithmetic/smallereq.js
rename to lib/function/arithmetic/smallereq.js
diff --git a/src/function/arithmetic/sqrt.js b/lib/function/arithmetic/sqrt.js
similarity index 100%
rename from src/function/arithmetic/sqrt.js
rename to lib/function/arithmetic/sqrt.js
diff --git a/src/function/arithmetic/square.js b/lib/function/arithmetic/square.js
similarity index 100%
rename from src/function/arithmetic/square.js
rename to lib/function/arithmetic/square.js
diff --git a/src/function/arithmetic/subtract.js b/lib/function/arithmetic/subtract.js
similarity index 100%
rename from src/function/arithmetic/subtract.js
rename to lib/function/arithmetic/subtract.js
diff --git a/src/function/arithmetic/unary.js b/lib/function/arithmetic/unary.js
similarity index 100%
rename from src/function/arithmetic/unary.js
rename to lib/function/arithmetic/unary.js
diff --git a/src/function/arithmetic/unequal.js b/lib/function/arithmetic/unequal.js
similarity index 100%
rename from src/function/arithmetic/unequal.js
rename to lib/function/arithmetic/unequal.js
diff --git a/src/function/arithmetic/xgcd.js b/lib/function/arithmetic/xgcd.js
similarity index 100%
rename from src/function/arithmetic/xgcd.js
rename to lib/function/arithmetic/xgcd.js
diff --git a/src/function/complex/arg.js b/lib/function/complex/arg.js
similarity index 100%
rename from src/function/complex/arg.js
rename to lib/function/complex/arg.js
diff --git a/src/function/complex/conj.js b/lib/function/complex/conj.js
similarity index 100%
rename from src/function/complex/conj.js
rename to lib/function/complex/conj.js
diff --git a/src/function/complex/im.js b/lib/function/complex/im.js
similarity index 100%
rename from src/function/complex/im.js
rename to lib/function/complex/im.js
diff --git a/src/function/complex/re.js b/lib/function/complex/re.js
similarity index 100%
rename from src/function/complex/re.js
rename to lib/function/complex/re.js
diff --git a/src/function/construction/boolean.js b/lib/function/construction/boolean.js
similarity index 100%
rename from src/function/construction/boolean.js
rename to lib/function/construction/boolean.js
diff --git a/src/function/construction/complex.js b/lib/function/construction/complex.js
similarity index 100%
rename from src/function/construction/complex.js
rename to lib/function/construction/complex.js
diff --git a/src/function/construction/matrix.js b/lib/function/construction/matrix.js
similarity index 100%
rename from src/function/construction/matrix.js
rename to lib/function/construction/matrix.js
diff --git a/src/function/construction/number.js b/lib/function/construction/number.js
similarity index 100%
rename from src/function/construction/number.js
rename to lib/function/construction/number.js
diff --git a/src/function/construction/parser.js b/lib/function/construction/parser.js
similarity index 100%
rename from src/function/construction/parser.js
rename to lib/function/construction/parser.js
diff --git a/src/function/construction/range.js b/lib/function/construction/range.js
similarity index 100%
rename from src/function/construction/range.js
rename to lib/function/construction/range.js
diff --git a/src/function/construction/string.js b/lib/function/construction/string.js
similarity index 100%
rename from src/function/construction/string.js
rename to lib/function/construction/string.js
diff --git a/src/function/construction/unit.js b/lib/function/construction/unit.js
similarity index 100%
rename from src/function/construction/unit.js
rename to lib/function/construction/unit.js
diff --git a/src/function/matrix/concat.js b/lib/function/matrix/concat.js
similarity index 100%
rename from src/function/matrix/concat.js
rename to lib/function/matrix/concat.js
diff --git a/src/function/matrix/det.js b/lib/function/matrix/det.js
similarity index 100%
rename from src/function/matrix/det.js
rename to lib/function/matrix/det.js
diff --git a/src/function/matrix/diag.js b/lib/function/matrix/diag.js
similarity index 100%
rename from src/function/matrix/diag.js
rename to lib/function/matrix/diag.js
diff --git a/src/function/matrix/eye.js b/lib/function/matrix/eye.js
similarity index 100%
rename from src/function/matrix/eye.js
rename to lib/function/matrix/eye.js
diff --git a/src/function/matrix/inv.js b/lib/function/matrix/inv.js
similarity index 100%
rename from src/function/matrix/inv.js
rename to lib/function/matrix/inv.js
diff --git a/src/function/matrix/ones.js b/lib/function/matrix/ones.js
similarity index 100%
rename from src/function/matrix/ones.js
rename to lib/function/matrix/ones.js
diff --git a/src/function/matrix/size.js b/lib/function/matrix/size.js
similarity index 100%
rename from src/function/matrix/size.js
rename to lib/function/matrix/size.js
diff --git a/src/function/matrix/squeeze.js b/lib/function/matrix/squeeze.js
similarity index 100%
rename from src/function/matrix/squeeze.js
rename to lib/function/matrix/squeeze.js
diff --git a/src/function/matrix/subset.js b/lib/function/matrix/subset.js
similarity index 100%
rename from src/function/matrix/subset.js
rename to lib/function/matrix/subset.js
diff --git a/src/function/matrix/transpose.js b/lib/function/matrix/transpose.js
similarity index 100%
rename from src/function/matrix/transpose.js
rename to lib/function/matrix/transpose.js
diff --git a/src/function/matrix/zeros.js b/lib/function/matrix/zeros.js
similarity index 100%
rename from src/function/matrix/zeros.js
rename to lib/function/matrix/zeros.js
diff --git a/src/function/probability/factorial.js b/lib/function/probability/factorial.js
similarity index 100%
rename from src/function/probability/factorial.js
rename to lib/function/probability/factorial.js
diff --git a/src/function/probability/random.js b/lib/function/probability/random.js
similarity index 100%
rename from src/function/probability/random.js
rename to lib/function/probability/random.js
diff --git a/src/function/statistics/max.js b/lib/function/statistics/max.js
similarity index 100%
rename from src/function/statistics/max.js
rename to lib/function/statistics/max.js
diff --git a/src/function/statistics/min.js b/lib/function/statistics/min.js
similarity index 100%
rename from src/function/statistics/min.js
rename to lib/function/statistics/min.js
diff --git a/src/function/trigonometry/acos.js b/lib/function/trigonometry/acos.js
similarity index 100%
rename from src/function/trigonometry/acos.js
rename to lib/function/trigonometry/acos.js
diff --git a/src/function/trigonometry/asin.js b/lib/function/trigonometry/asin.js
similarity index 100%
rename from src/function/trigonometry/asin.js
rename to lib/function/trigonometry/asin.js
diff --git a/src/function/trigonometry/atan.js b/lib/function/trigonometry/atan.js
similarity index 100%
rename from src/function/trigonometry/atan.js
rename to lib/function/trigonometry/atan.js
diff --git a/src/function/trigonometry/atan2.js b/lib/function/trigonometry/atan2.js
similarity index 100%
rename from src/function/trigonometry/atan2.js
rename to lib/function/trigonometry/atan2.js
diff --git a/src/function/trigonometry/cos.js b/lib/function/trigonometry/cos.js
similarity index 100%
rename from src/function/trigonometry/cos.js
rename to lib/function/trigonometry/cos.js
diff --git a/src/function/trigonometry/cot.js b/lib/function/trigonometry/cot.js
similarity index 100%
rename from src/function/trigonometry/cot.js
rename to lib/function/trigonometry/cot.js
diff --git a/src/function/trigonometry/csc.js b/lib/function/trigonometry/csc.js
similarity index 100%
rename from src/function/trigonometry/csc.js
rename to lib/function/trigonometry/csc.js
diff --git a/src/function/trigonometry/sec.js b/lib/function/trigonometry/sec.js
similarity index 100%
rename from src/function/trigonometry/sec.js
rename to lib/function/trigonometry/sec.js
diff --git a/src/function/trigonometry/sin.js b/lib/function/trigonometry/sin.js
similarity index 100%
rename from src/function/trigonometry/sin.js
rename to lib/function/trigonometry/sin.js
diff --git a/src/function/trigonometry/tan.js b/lib/function/trigonometry/tan.js
similarity index 100%
rename from src/function/trigonometry/tan.js
rename to lib/function/trigonometry/tan.js
diff --git a/src/function/units/in.js b/lib/function/units/in.js
similarity index 100%
rename from src/function/units/in.js
rename to lib/function/units/in.js
diff --git a/src/function/utils/clone.js b/lib/function/utils/clone.js
similarity index 100%
rename from src/function/utils/clone.js
rename to lib/function/utils/clone.js
diff --git a/src/function/utils/eval.js b/lib/function/utils/eval.js
similarity index 100%
rename from src/function/utils/eval.js
rename to lib/function/utils/eval.js
diff --git a/src/function/utils/format.js b/lib/function/utils/format.js
similarity index 100%
rename from src/function/utils/format.js
rename to lib/function/utils/format.js
diff --git a/src/function/utils/help.js b/lib/function/utils/help.js
similarity index 100%
rename from src/function/utils/help.js
rename to lib/function/utils/help.js
diff --git a/src/function/utils/import.js b/lib/function/utils/import.js
similarity index 100%
rename from src/function/utils/import.js
rename to lib/function/utils/import.js
diff --git a/src/function/utils/parse.js b/lib/function/utils/parse.js
similarity index 100%
rename from src/function/utils/parse.js
rename to lib/function/utils/parse.js
diff --git a/src/function/utils/select.js b/lib/function/utils/select.js
similarity index 100%
rename from src/function/utils/select.js
rename to lib/function/utils/select.js
diff --git a/src/function/utils/typeof.js b/lib/function/utils/typeof.js
similarity index 100%
rename from src/function/utils/typeof.js
rename to lib/function/utils/typeof.js
diff --git a/src/header.js b/lib/header.js
similarity index 100%
rename from src/header.js
rename to lib/header.js
diff --git a/src/options.js b/lib/options.js
similarity index 100%
rename from src/options.js
rename to lib/options.js
diff --git a/src/shim.js b/lib/shim.js
similarity index 100%
rename from src/shim.js
rename to lib/shim.js
diff --git a/src/type/Complex.js b/lib/type/Complex.js
similarity index 100%
rename from src/type/Complex.js
rename to lib/type/Complex.js
diff --git a/src/type/Help.js b/lib/type/Help.js
similarity index 100%
rename from src/type/Help.js
rename to lib/type/Help.js
diff --git a/src/type/Matrix.js b/lib/type/Matrix.js
similarity index 100%
rename from src/type/Matrix.js
rename to lib/type/Matrix.js
diff --git a/src/type/Range.js b/lib/type/Range.js
similarity index 100%
rename from src/type/Range.js
rename to lib/type/Range.js
diff --git a/src/type/Unit.js b/lib/type/Unit.js
similarity index 100%
rename from src/type/Unit.js
rename to lib/type/Unit.js
diff --git a/src/type/collection.js b/lib/type/collection.js
similarity index 100%
rename from src/type/collection.js
rename to lib/type/collection.js
diff --git a/src/type/index.js b/lib/type/index.js
similarity index 100%
rename from src/type/index.js
rename to lib/type/index.js
diff --git a/src/util/array.js b/lib/util/array.js
similarity index 100%
rename from src/util/array.js
rename to lib/util/array.js
diff --git a/src/util/boolean.js b/lib/util/boolean.js
similarity index 100%
rename from src/util/boolean.js
rename to lib/util/boolean.js
diff --git a/src/util/error.js b/lib/util/error.js
similarity index 100%
rename from src/util/error.js
rename to lib/util/error.js
diff --git a/src/util/index.js b/lib/util/index.js
similarity index 100%
rename from src/util/index.js
rename to lib/util/index.js
diff --git a/src/util/number.js b/lib/util/number.js
similarity index 100%
rename from src/util/number.js
rename to lib/util/number.js
diff --git a/src/util/object.js b/lib/util/object.js
similarity index 100%
rename from src/util/object.js
rename to lib/util/object.js
diff --git a/src/util/string.js b/lib/util/string.js
similarity index 100%
rename from src/util/string.js
rename to lib/util/string.js
diff --git a/src/util/types.js b/lib/util/types.js
similarity index 100%
rename from src/util/types.js
rename to lib/util/types.js
diff --git a/package.json b/package.json
index 13207e0c4..269a5fcdf 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
   "scripts": {
     "test": "mocha test --recursive --reporter spec"
   },
-  "main": "./dist/math.js",
   "bin": {
     "mathjs": "./bin/cli.js"
   },
diff --git a/src/index.js b/src/index.js
deleted file mode 100644
index 937e0ef40..000000000
--- a/src/index.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// options (global configuration settings)
-exports.options = require('./options');
-
-// expression (Parser, Scope, Nodes)
-exports.expr = {};
-exports.expr.node = require('./expr/node/index.js');
-exports.expr.Scope = require('./expr/Scope.js');
-exports.expr.Parser = require('./expr/Parser.js');
-
-// types (Matrix, Complex, Unit, ...)
-exports.type = require('./type/index.js');
-
-// docs
-exports.docs = require('./docs/index.js');
-
-// functions - arithmetic
-require('./function/arithmetic/abs.js')(exports);
-require('./function/arithmetic/add.js')(exports);
-require('./function/arithmetic/add.js')(exports);
-require('./function/arithmetic/ceil.js')(exports);
-require('./function/arithmetic/cube.js')(exports);
-require('./function/arithmetic/divide.js')(exports);
-require('./function/arithmetic/edivide.js')(exports);
-require('./function/arithmetic/emultiply.js')(exports);
-require('./function/arithmetic/epow.js')(exports);
-require('./function/arithmetic/equal.js')(exports);
-require('./function/arithmetic/exp.js')(exports);
-require('./function/arithmetic/fix.js')(exports);
-require('./function/arithmetic/floor.js')(exports);
-require('./function/arithmetic/gcd.js')(exports);
-require('./function/arithmetic/larger.js')(exports);
-require('./function/arithmetic/largereq.js')(exports);
-require('./function/arithmetic/lcm.js')(exports);
-require('./function/arithmetic/log.js')(exports);
-require('./function/arithmetic/log10.js')(exports);
-require('./function/arithmetic/mod.js')(exports);
-require('./function/arithmetic/multiply.js')(exports);
-require('./function/arithmetic/pow.js')(exports);
-require('./function/arithmetic/round.js')(exports);
-require('./function/arithmetic/sign.js')(exports);
-require('./function/arithmetic/smaller.js')(exports);
-require('./function/arithmetic/smallereq.js')(exports);
-require('./function/arithmetic/sqrt.js')(exports);
-require('./function/arithmetic/square.js')(exports);
-require('./function/arithmetic/subtract.js')(exports);
-require('./function/arithmetic/unary.js')(exports);
-require('./function/arithmetic/unequal.js')(exports);
-require('./function/arithmetic/xgcd.js')(exports);
-
-// functions - complex
-require('./function/complex/arg.js')(exports);
-require('./function/complex/conj.js')(exports);
-require('./function/complex/re.js')(exports);
-require('./function/complex/im.js')(exports);
-
-// functions - construction
-require('./function/construction/boolean.js')(exports);
-require('./function/construction/complex.js')(exports);
-require('./function/construction/matrix.js')(exports);
-require('./function/construction/number.js')(exports);
-require('./function/construction/parser.js')(exports);
-require('./function/construction/range.js')(exports);
-require('./function/construction/string.js')(exports);
-require('./function/construction/unit.js')(exports);
-
-// functions - matrix
-require('./function/matrix/concat.js')(exports);
-require('./function/matrix/det.js')(exports);
-require('./function/matrix/diag.js')(exports);
-require('./function/matrix/eye.js')(exports);
-require('./function/matrix/inv.js')(exports);
-require('./function/matrix/ones.js')(exports);
-require('./function/matrix/size.js')(exports);
-require('./function/matrix/squeeze.js')(exports);
-require('./function/matrix/subset.js')(exports);
-require('./function/matrix/transpose.js')(exports);
-require('./function/matrix/zeros.js')(exports);
-
-// functions - probability
-require('./function/probability/factorial.js')(exports);
-require('./function/probability/random.js')(exports);
-
-// functions - statistics
-require('./function/statistics/min.js')(exports);
-require('./function/statistics/max.js')(exports);
-
-// functions - trigonometry
-require('./function/trigonometry/acos.js')(exports);
-require('./function/trigonometry/asin.js')(exports);
-require('./function/trigonometry/atan.js')(exports);
-require('./function/trigonometry/atan2.js')(exports);
-require('./function/trigonometry/cos.js')(exports);
-require('./function/trigonometry/cot.js')(exports);
-require('./function/trigonometry/csc.js')(exports);
-require('./function/trigonometry/sec.js')(exports);
-require('./function/trigonometry/sin.js')(exports);
-require('./function/trigonometry/tan.js')(exports);
-
-// functions - units
-require('./function/units/in.js')(exports);
-
-// functions - utils
-require('./function/utils/clone.js')(exports);
-require('./function/utils/eval.js')(exports);
-require('./function/utils/format.js')(exports);
-require('./function/utils/help.js')(exports);
-require('./function/utils/import.js')(exports);
-require('./function/utils/parse.js')(exports);
-require('./function/utils/select.js')(exports);
-require('./function/utils/typeof.js')(exports);
-
-// constants
-require('./constants.js')(exports);
-
-// selector (we initialize after all functions are loaded)
-exports.expr.Selector = require('./expr/Selector.js')(exports);
diff --git a/test/contstants.test.js b/test/contstants.test.js
index 75b575788..11ebc06f3 100644
--- a/test/contstants.test.js
+++ b/test/contstants.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../src/index.js'),
+    math = require('../index.js'),
     approx = require('../tools/approx.js');
 
 // pi
diff --git a/test/expr/parser.test.js b/test/expr/parser.test.js
index c1e8d174d..557d7bae8 100644
--- a/test/expr/parser.test.js
+++ b/test/expr/parser.test.js
@@ -2,7 +2,7 @@
 
 var assert = require('assert'),
     approx = require('../../tools/approx.js'),
-    math = require('../../src/index.js'),
+    math = require('../../index.js'),
     matrix = math.matrix,
     range = math.range,
     round = math.round;
diff --git a/test/expr/scope.test.js b/test/expr/scope.test.js
index e4848f37d..395af71a9 100644
--- a/test/expr/scope.test.js
+++ b/test/expr/scope.test.js
@@ -1,7 +1,7 @@
 // test Scope
 var assert = require('assert'),
     approx = require('../../tools/approx.js'),
-    math = require('../../src/index.js'),
+    math = require('../../index.js'),
     Scope = math.expr.Scope;
 
 describe('Scope', function() {
diff --git a/test/function/arithmetic/abs.test.js b/test/function/arithmetic/abs.test.js
index 63688406c..2d539ff80 100644
--- a/test/function/arithmetic/abs.test.js
+++ b/test/function/arithmetic/abs.test.js
@@ -1,6 +1,6 @@
 // test abs
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('abs', function () {
 
diff --git a/test/function/arithmetic/add.test.js b/test/function/arithmetic/add.test.js
index 47d8551bd..28241b252 100644
--- a/test/function/arithmetic/add.test.js
+++ b/test/function/arithmetic/add.test.js
@@ -1,6 +1,6 @@
 // test add
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('add', function() {
 
diff --git a/test/function/arithmetic/ceil.test.js b/test/function/arithmetic/ceil.test.js
index 772b7dcca..1fa943f24 100644
--- a/test/function/arithmetic/ceil.test.js
+++ b/test/function/arithmetic/ceil.test.js
@@ -1,7 +1,7 @@
 // test ceil
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/cube.test.js b/test/function/arithmetic/cube.test.js
index 00600376f..ad15bca46 100644
--- a/test/function/arithmetic/cube.test.js
+++ b/test/function/arithmetic/cube.test.js
@@ -1,6 +1,6 @@
 // test cube
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     unit = math.unit,
     matrix = math.matrix,
     range = math.range,
diff --git a/test/function/arithmetic/divide.test.js b/test/function/arithmetic/divide.test.js
index b0dfca69f..edd95ad70 100644
--- a/test/function/arithmetic/divide.test.js
+++ b/test/function/arithmetic/divide.test.js
@@ -1,6 +1,6 @@
 // test divide
 var assert = require('assert');
-math = require('../../../src/index.js'),
+math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     divide = math.divide,
     complex = math.complex;
diff --git a/test/function/arithmetic/edivide.test.js b/test/function/arithmetic/edivide.test.js
index 2e037f389..7f053235e 100644
--- a/test/function/arithmetic/edivide.test.js
+++ b/test/function/arithmetic/edivide.test.js
@@ -1,6 +1,6 @@
 // test edivide (element-wise divide)
 var assert = require('assert');
-math = require('../../../src/index.js'),
+math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     edivide = math.edivide,
     complex = math.complex;
diff --git a/test/function/arithmetic/emultiply.test.js b/test/function/arithmetic/emultiply.test.js
index 2afeb0d6f..be5416c15 100644
--- a/test/function/arithmetic/emultiply.test.js
+++ b/test/function/arithmetic/emultiply.test.js
@@ -1,6 +1,6 @@
 // test emultiply (element-wise multiply)
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     emultiply = math.emultiply,
     divide = math.divide,
diff --git a/test/function/arithmetic/epow.test.js b/test/function/arithmetic/epow.test.js
index 0819ad2f7..c693999eb 100644
--- a/test/function/arithmetic/epow.test.js
+++ b/test/function/arithmetic/epow.test.js
@@ -1,7 +1,7 @@
 // test exp
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/equal.test.js b/test/function/arithmetic/equal.test.js
index d82c5e3b5..2b2ead1e9 100644
--- a/test/function/arithmetic/equal.test.js
+++ b/test/function/arithmetic/equal.test.js
@@ -1,6 +1,6 @@
 // test equal
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/exp.test.js b/test/function/arithmetic/exp.test.js
index 07c6c130e..3803ba101 100644
--- a/test/function/arithmetic/exp.test.js
+++ b/test/function/arithmetic/exp.test.js
@@ -1,7 +1,7 @@
 // test exp
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/fix.test.js b/test/function/arithmetic/fix.test.js
index d861e899d..270311f55 100644
--- a/test/function/arithmetic/fix.test.js
+++ b/test/function/arithmetic/fix.test.js
@@ -1,7 +1,7 @@
 // test fix
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/floor.test.js b/test/function/arithmetic/floor.test.js
index c0dc14344..fa4b2456e 100644
--- a/test/function/arithmetic/floor.test.js
+++ b/test/function/arithmetic/floor.test.js
@@ -1,7 +1,7 @@
 // test floor
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/gcd.test.js b/test/function/arithmetic/gcd.test.js
index 9eb9351a9..0c8d3254e 100644
--- a/test/function/arithmetic/gcd.test.js
+++ b/test/function/arithmetic/gcd.test.js
@@ -1,6 +1,6 @@
 // test gcd
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('gcd', function() {
 
diff --git a/test/function/arithmetic/larger.test.js b/test/function/arithmetic/larger.test.js
index 3004e8184..db555751f 100644
--- a/test/function/arithmetic/larger.test.js
+++ b/test/function/arithmetic/larger.test.js
@@ -1,6 +1,6 @@
 // test larger
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/largereq.test.js b/test/function/arithmetic/largereq.test.js
index 3cc6288f0..50df2fd0f 100644
--- a/test/function/arithmetic/largereq.test.js
+++ b/test/function/arithmetic/largereq.test.js
@@ -1,6 +1,6 @@
 // test largereq
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/lcm.test.js b/test/function/arithmetic/lcm.test.js
index 30879fd6f..ed47a85d4 100644
--- a/test/function/arithmetic/lcm.test.js
+++ b/test/function/arithmetic/lcm.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('lcm', function() {
 
diff --git a/test/function/arithmetic/log.test.js b/test/function/arithmetic/log.test.js
index ef1b56ac1..e94c70f0e 100644
--- a/test/function/arithmetic/log.test.js
+++ b/test/function/arithmetic/log.test.js
@@ -1,7 +1,7 @@
 // test exp
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/log10.test.js b/test/function/arithmetic/log10.test.js
index c5b41f468..6486e783e 100644
--- a/test/function/arithmetic/log10.test.js
+++ b/test/function/arithmetic/log10.test.js
@@ -1,7 +1,7 @@
 // test exp
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/mod.test.js b/test/function/arithmetic/mod.test.js
index e381f1211..bb96460ae 100644
--- a/test/function/arithmetic/mod.test.js
+++ b/test/function/arithmetic/mod.test.js
@@ -1,7 +1,7 @@
 // test mod
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     matrix = math.matrix,
     range = math.range,
     mod = math.mod;
diff --git a/test/function/arithmetic/multiply.test.js b/test/function/arithmetic/multiply.test.js
index c434f4441..3be1b0306 100644
--- a/test/function/arithmetic/multiply.test.js
+++ b/test/function/arithmetic/multiply.test.js
@@ -1,6 +1,6 @@
 // test multiply
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     multiply = math.multiply,
     divide = math.divide,
diff --git a/test/function/arithmetic/pow.test.js b/test/function/arithmetic/pow.test.js
index 431aa36b7..2b9df0f7f 100644
--- a/test/function/arithmetic/pow.test.js
+++ b/test/function/arithmetic/pow.test.js
@@ -1,7 +1,7 @@
 // test exp
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/round.test.js b/test/function/arithmetic/round.test.js
index 20f05dccf..ccfb78725 100644
--- a/test/function/arithmetic/round.test.js
+++ b/test/function/arithmetic/round.test.js
@@ -1,6 +1,6 @@
 // test round
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('round', function() {
 
diff --git a/test/function/arithmetic/sign.test.js b/test/function/arithmetic/sign.test.js
index 0140986c9..ea9fde895 100644
--- a/test/function/arithmetic/sign.test.js
+++ b/test/function/arithmetic/sign.test.js
@@ -1,6 +1,6 @@
 // test sign
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('sign', function() {
 
diff --git a/test/function/arithmetic/smaller.test.js b/test/function/arithmetic/smaller.test.js
index 3a7136a4f..842c68568 100644
--- a/test/function/arithmetic/smaller.test.js
+++ b/test/function/arithmetic/smaller.test.js
@@ -1,6 +1,6 @@
 // test smaller
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/smallereq.test.js b/test/function/arithmetic/smallereq.test.js
index 950954d09..a7f73ae2b 100644
--- a/test/function/arithmetic/smallereq.test.js
+++ b/test/function/arithmetic/smallereq.test.js
@@ -1,6 +1,6 @@
 // test smaller
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/sqrt.test.js b/test/function/arithmetic/sqrt.test.js
index 61d1e84c2..3c10bbe96 100644
--- a/test/function/arithmetic/sqrt.test.js
+++ b/test/function/arithmetic/sqrt.test.js
@@ -1,7 +1,7 @@
 // test sqrt
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js');
+    math = require('../../../index.js');
 
 describe('sqrt', function() {
 
diff --git a/test/function/arithmetic/square.test.js b/test/function/arithmetic/square.test.js
index 5ca68d0b8..9d511b422 100644
--- a/test/function/arithmetic/square.test.js
+++ b/test/function/arithmetic/square.test.js
@@ -1,6 +1,6 @@
 // test square
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     unit = math.unit,
     matrix = math.matrix,
     range = math.range,
diff --git a/test/function/arithmetic/subtract.test.js b/test/function/arithmetic/subtract.test.js
index 8a06755ab..8f7925715 100644
--- a/test/function/arithmetic/subtract.test.js
+++ b/test/function/arithmetic/subtract.test.js
@@ -1,6 +1,6 @@
 // test subtract
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('subtract', function() {
 
diff --git a/test/function/arithmetic/unary.js b/test/function/arithmetic/unary.js
index 200b11be6..f2b219bd7 100644
--- a/test/function/arithmetic/unary.js
+++ b/test/function/arithmetic/unary.js
@@ -1,6 +1,6 @@
 // test unary minus
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('unaryminus', function() {
 
diff --git a/test/function/arithmetic/unequal.test.js b/test/function/arithmetic/unequal.test.js
index 7790518cb..1b44f9db5 100644
--- a/test/function/arithmetic/unequal.test.js
+++ b/test/function/arithmetic/unequal.test.js
@@ -1,6 +1,6 @@
 // test equal
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/arithmetic/xgcd.test.js b/test/function/arithmetic/xgcd.test.js
index 43f7cddc2..f7e5d2fa8 100644
--- a/test/function/arithmetic/xgcd.test.js
+++ b/test/function/arithmetic/xgcd.test.js
@@ -1,6 +1,6 @@
 // test xgcd
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('xgcd', function() {
 
diff --git a/test/function/complex/arg.test.js b/test/function/complex/arg.test.js
index 1d3eb2dca..8d58b7e77 100644
--- a/test/function/complex/arg.test.js
+++ b/test/function/complex/arg.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('arg', function() {
 
diff --git a/test/function/complex/conj.test.js b/test/function/complex/conj.test.js
index 8343e928f..4c2d3f4fa 100644
--- a/test/function/complex/conj.test.js
+++ b/test/function/complex/conj.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('conj', function() {
 
diff --git a/test/function/complex/im.test.js b/test/function/complex/im.test.js
index e723c61b2..814232eb2 100644
--- a/test/function/complex/im.test.js
+++ b/test/function/complex/im.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('im', function() {
 
diff --git a/test/function/complex/re.test.js b/test/function/complex/re.test.js
index acbbb9199..5ac263a1d 100644
--- a/test/function/complex/re.test.js
+++ b/test/function/complex/re.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('re', function() {
 
diff --git a/test/function/construction/boolean.test.js b/test/function/construction/boolean.test.js
index 5a0f8e248..981c08fb6 100644
--- a/test/function/construction/boolean.test.js
+++ b/test/function/construction/boolean.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     bool = math.boolean;
 
 describe('boolean', function() {
diff --git a/test/function/construction/complex.test.js b/test/function/construction/complex.test.js
index 27e89b11e..5dbcea3dc 100644
--- a/test/function/construction/complex.test.js
+++ b/test/function/construction/complex.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     complex = math.complex;
 
 describe('complex', function() {
diff --git a/test/function/construction/matrix.test.js b/test/function/construction/matrix.test.js
index 6e07225b8..d8c0581a9 100644
--- a/test/function/construction/matrix.test.js
+++ b/test/function/construction/matrix.test.js
@@ -1,6 +1,6 @@
 // test matrix construction
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     matrix = math.matrix;
 
 describe('matrix', function() {
diff --git a/test/function/construction/number.test.js b/test/function/construction/number.test.js
index 2d81381ca..0e95e0c2d 100644
--- a/test/function/construction/number.test.js
+++ b/test/function/construction/number.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     number = math.number;
 
diff --git a/test/function/construction/range.test.js b/test/function/construction/range.test.js
index 815a6e4af..e95194957 100644
--- a/test/function/construction/range.test.js
+++ b/test/function/construction/range.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     range = math.range;
 
 describe('range', function() {
diff --git a/test/function/construction/string.test.js b/test/function/construction/string.test.js
index 0e6ea63fc..1a10e89da 100644
--- a/test/function/construction/string.test.js
+++ b/test/function/construction/string.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     string = math.string;
 
 describe('string', function() {
diff --git a/test/function/construction/unit.test.js b/test/function/construction/unit.test.js
index eaefe92bf..3bdde2183 100644
--- a/test/function/construction/unit.test.js
+++ b/test/function/construction/unit.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     unit = math.unit;
 
 describe('unit', function() {
diff --git a/test/function/example.test.js b/test/function/example.test.js
index cf008df30..a3dd692b7 100644
--- a/test/function/example.test.js
+++ b/test/function/example.test.js
@@ -3,7 +3,7 @@ return;
 
 var assert = require('assert'),
     approx = require('../../tools/approx.js'),
-    math = require('../../src/index.js'),
+    math = require('../../index.js'),
     complex = math.complex,
     matrix = math.matrix,
     unit = math.unit,
diff --git a/test/function/matrix/concat.test.js b/test/function/matrix/concat.test.js
index 026d7ee0a..1c77780c8 100644
--- a/test/function/matrix/concat.test.js
+++ b/test/function/matrix/concat.test.js
@@ -1,6 +1,6 @@
 // test concat
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.deepEqual(math.concat([1,2,3], [4]), [1,2,3,4]);
 assert.deepEqual(math.concat([[1],[2],[3]], [[4]], 0), [[1],[2],[3],[4]]);
diff --git a/test/function/matrix/det.test.js b/test/function/matrix/det.test.js
index d5b28a863..043eb9462 100644
--- a/test/function/matrix/det.test.js
+++ b/test/function/matrix/det.test.js
@@ -1,6 +1,6 @@
 // test det
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.det(3), 3);
 assert.equal(math.det([5]), 5);
diff --git a/test/function/matrix/diag.test.js b/test/function/matrix/diag.test.js
index e037c2f43..7c4850b8a 100644
--- a/test/function/matrix/diag.test.js
+++ b/test/function/matrix/diag.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 // test diag
 assert.deepEqual(math.diag([1,2,3]).valueOf(), [[1,0,0],[0,2,0],[0,0,3]]);
diff --git a/test/function/matrix/eye.test.js b/test/function/matrix/eye.test.js
index cb57810ef..b6856715a 100644
--- a/test/function/matrix/eye.test.js
+++ b/test/function/matrix/eye.test.js
@@ -1,6 +1,6 @@
 // test eye
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.deepEqual(math.eye().valueOf(), [[1]]);
 assert.deepEqual(math.eye([]).valueOf(), [[1]]);
diff --git a/test/function/matrix/inv.test.js b/test/function/matrix/inv.test.js
index d46540abf..9b9ca3585 100644
--- a/test/function/matrix/inv.test.js
+++ b/test/function/matrix/inv.test.js
@@ -1,6 +1,6 @@
 // test inv
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.deepEqual(math.inv(4), 1/4);
 assert.deepEqual(math.inv([4]), [1/4]);
diff --git a/test/function/matrix/ones.test.js b/test/function/matrix/ones.test.js
index 521c5824b..8fa304b7d 100644
--- a/test/function/matrix/ones.test.js
+++ b/test/function/matrix/ones.test.js
@@ -1,6 +1,6 @@
 // test ones
 var assert = require('assert');
-var math = require('../../../src/index.js'),
+var math = require('../../../index.js'),
     ones = math.ones;
 
 describe('ones', function() {
diff --git a/test/function/matrix/size.test.js b/test/function/matrix/size.test.js
index 2981fb25a..3e4da8189 100644
--- a/test/function/matrix/size.test.js
+++ b/test/function/matrix/size.test.js
@@ -1,6 +1,6 @@
 // test size
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('size', function() {
 
diff --git a/test/function/matrix/squeeze.test.js b/test/function/matrix/squeeze.test.js
index 5f1f54a70..621833f33 100644
--- a/test/function/matrix/squeeze.test.js
+++ b/test/function/matrix/squeeze.test.js
@@ -1,6 +1,6 @@
 // test squeeze
 var assert = require('assert');
-var math = require('../../../src/index.js'),
+var math = require('../../../index.js'),
     squeeze = math.squeeze,
     size = math.size,
     matrix = math.matrix;
diff --git a/test/function/matrix/subset.test.js b/test/function/matrix/subset.test.js
index 9a2fa2ca4..a55286501 100644
--- a/test/function/matrix/subset.test.js
+++ b/test/function/matrix/subset.test.js
@@ -1,6 +1,6 @@
 // test subset
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     subset = math.subset,
     matrix = math.matrix,
     range = math.range;
diff --git a/test/function/matrix/transpose.test.js b/test/function/matrix/transpose.test.js
index a3a54ad97..f220484d5 100644
--- a/test/function/matrix/transpose.test.js
+++ b/test/function/matrix/transpose.test.js
@@ -1,6 +1,6 @@
 // test transpose
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 describe('transpose', function() {
 
diff --git a/test/function/matrix/zeros.test.js b/test/function/matrix/zeros.test.js
index 30ffc8718..194282ffd 100644
--- a/test/function/matrix/zeros.test.js
+++ b/test/function/matrix/zeros.test.js
@@ -1,6 +1,6 @@
 // test zeros
 var assert = require('assert');
-var math = require('../../../src/index.js'),
+var math = require('../../../index.js'),
     zeros = math.zeros;
 
 describe('zeros', function() {
diff --git a/test/function/probability/factorial.test.js b/test/function/probability/factorial.test.js
index a4d9b3771..e81ce368b 100644
--- a/test/function/probability/factorial.test.js
+++ b/test/function/probability/factorial.test.js
@@ -1,6 +1,6 @@
 // test factorial
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.factorial(0), 1);
 assert.equal(math.factorial(1), 1);
diff --git a/test/function/probability/random.test.js b/test/function/probability/random.test.js
index c992f9c20..1eb9d328f 100644
--- a/test/function/probability/random.test.js
+++ b/test/function/probability/random.test.js
@@ -1,6 +1,6 @@
 var assert = require('assert'),
     _ = require('underscore'),
-    math = require('../../../src/index.js');
+    math = require('../../../index.js');
 
 var assertApproxEqual = function(testVal, val, tolerance) {
   var diff = Math.abs(val - testVal);
diff --git a/test/function/statistics/max.test.js b/test/function/statistics/max.test.js
index bb37f4795..1e7fe5280 100644
--- a/test/function/statistics/max.test.js
+++ b/test/function/statistics/max.test.js
@@ -1,6 +1,6 @@
 // test max
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.max(5), 5);
 assert.equal(math.max(3,1), 3);
diff --git a/test/function/statistics/min.test.js b/test/function/statistics/min.test.js
index 1c3554a40..0c65e0a1e 100644
--- a/test/function/statistics/min.test.js
+++ b/test/function/statistics/min.test.js
@@ -1,6 +1,6 @@
 // test min
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.min(5), 5);
 assert.equal(math.min(1,3), 1);
diff --git a/test/function/trigonometry/acos.test.js b/test/function/trigonometry/acos.test.js
index cef9a2903..2cbf2e9ec 100644
--- a/test/function/trigonometry/acos.test.js
+++ b/test/function/trigonometry/acos.test.js
@@ -1,6 +1,6 @@
 // test acos
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     acos = math.acos,
diff --git a/test/function/trigonometry/asin.test.js b/test/function/trigonometry/asin.test.js
index 61a1215be..a1bebae99 100644
--- a/test/function/trigonometry/asin.test.js
+++ b/test/function/trigonometry/asin.test.js
@@ -1,6 +1,6 @@
 // test asin
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/atan.test.js b/test/function/trigonometry/atan.test.js
index 9178068e2..d3289fc03 100644
--- a/test/function/trigonometry/atan.test.js
+++ b/test/function/trigonometry/atan.test.js
@@ -1,6 +1,6 @@
 // test atan
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/atan2.test.js b/test/function/trigonometry/atan2.test.js
index 9a151583a..bcf0f5f94 100644
--- a/test/function/trigonometry/atan2.test.js
+++ b/test/function/trigonometry/atan2.test.js
@@ -1,6 +1,6 @@
 // test atan2
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     acos = math.acos,
diff --git a/test/function/trigonometry/cos.test.js b/test/function/trigonometry/cos.test.js
index 70d0ae4de..0a118684d 100644
--- a/test/function/trigonometry/cos.test.js
+++ b/test/function/trigonometry/cos.test.js
@@ -1,6 +1,6 @@
 // test cos
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/cot.test.js b/test/function/trigonometry/cot.test.js
index 1931886b8..5b67072bf 100644
--- a/test/function/trigonometry/cot.test.js
+++ b/test/function/trigonometry/cot.test.js
@@ -1,6 +1,6 @@
 // test cot
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/csc.test.js b/test/function/trigonometry/csc.test.js
index 742f7b408..7b6dfeddb 100644
--- a/test/function/trigonometry/csc.test.js
+++ b/test/function/trigonometry/csc.test.js
@@ -1,6 +1,6 @@
 // test csc
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/sec.test.js b/test/function/trigonometry/sec.test.js
index deb3ddb30..1aa0a2b90 100644
--- a/test/function/trigonometry/sec.test.js
+++ b/test/function/trigonometry/sec.test.js
@@ -1,6 +1,6 @@
 // test sec
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/sin.test.js b/test/function/trigonometry/sin.test.js
index 72580af55..ed32edd2f 100644
--- a/test/function/trigonometry/sin.test.js
+++ b/test/function/trigonometry/sin.test.js
@@ -1,6 +1,6 @@
 // test sin
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/trigonometry/tan.test.js b/test/function/trigonometry/tan.test.js
index 49fa964fe..9a9f9e781 100644
--- a/test/function/trigonometry/tan.test.js
+++ b/test/function/trigonometry/tan.test.js
@@ -1,6 +1,6 @@
 // test tan
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js'),
     pi = math.pi,
     complex = math.complex,
diff --git a/test/function/units/in.test.js b/test/function/units/in.test.js
index f7276359c..b7fd2cd93 100644
--- a/test/function/units/in.test.js
+++ b/test/function/units/in.test.js
@@ -2,7 +2,7 @@
 
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     unit = math.unit;
 
 // test function in
diff --git a/test/function/utils/clone.test.js b/test/function/utils/clone.test.js
index 8a3e72a52..bca72d591 100644
--- a/test/function/utils/clone.test.js
+++ b/test/function/utils/clone.test.js
@@ -1,6 +1,6 @@
 // test clone
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 var a = 1;
 var b = math.clone(a);
diff --git a/test/function/utils/eval.test.js b/test/function/utils/eval.test.js
index d5006c6a3..8a758258b 100644
--- a/test/function/utils/eval.test.js
+++ b/test/function/utils/eval.test.js
@@ -1,6 +1,6 @@
 // test eval
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 // test some expressions
 assert.equal(math.eval('pi'), Math.PI);
diff --git a/test/function/utils/format.test.js b/test/function/utils/format.test.js
index b790205f3..a06755a89 100644
--- a/test/function/utils/format.test.js
+++ b/test/function/utils/format.test.js
@@ -1,6 +1,6 @@
 // test format
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.format(2/7), '0.28571');
 assert.equal(math.format(0.10400), '0.104');
diff --git a/test/function/utils/help.test.js b/test/function/utils/help.test.js
index e4eb5e42e..7f332c130 100644
--- a/test/function/utils/help.test.js
+++ b/test/function/utils/help.test.js
@@ -1,6 +1,6 @@
 // test help
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 var prop;
 
 var help = math.help('sin');
diff --git a/test/function/utils/import.test.js b/test/function/utils/import.test.js
index 8a5a1f8d0..cfffc1611 100644
--- a/test/function/utils/import.test.js
+++ b/test/function/utils/import.test.js
@@ -1,6 +1,6 @@
 // test import
 var assert = require('assert'),
-    math = require('../../../src/index.js'),
+    math = require('../../../index.js'),
     approx = require('../../../tools/approx.js');
 
 math.import({
diff --git a/test/function/utils/parse.test.js b/test/function/utils/parse.test.js
index 982782d11..f42cf30a6 100644
--- a/test/function/utils/parse.test.js
+++ b/test/function/utils/parse.test.js
@@ -1,6 +1,6 @@
 // test parse
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 // test some expressions
 assert.ok(math.parse('pi') instanceof math.expr.node.Node);
diff --git a/test/function/utils/select.test.js b/test/function/utils/select.test.js
index 686ec911b..39494c497 100644
--- a/test/function/utils/select.test.js
+++ b/test/function/utils/select.test.js
@@ -1,7 +1,7 @@
 // test select (chaining of operations)
 var assert = require('assert'),
     approx = require('../../../tools/approx.js'),
-    math = require('../../../src/index.js');
+    math = require('../../../index.js');
 
 assert.ok(math.select(45) instanceof math.expr.Selector);
 assert.equal(math.select(3).add(4).subtract(2).done(), 5);
diff --git a/test/function/utils/typeof.test.js b/test/function/utils/typeof.test.js
index 579a6cd43..4eb38591f 100644
--- a/test/function/utils/typeof.test.js
+++ b/test/function/utils/typeof.test.js
@@ -1,6 +1,6 @@
 // test typeof
 var assert = require('assert');
-var math = require('../../../src/index.js');
+var math = require('../../../index.js');
 
 assert.equal(math.typeof(2), 'number');
 assert.equal(math.typeof(new Number(2)), 'number');
diff --git a/test/type/complex.test.js b/test/type/complex.test.js
index 280d0238a..d59ad92ad 100644
--- a/test/type/complex.test.js
+++ b/test/type/complex.test.js
@@ -1,7 +1,7 @@
 // test data type Complex
 
 var assert = require('assert');
-var math = require('../../src/index.js');
+var math = require('../../index.js');
 
 describe('Complex', function () {
 
diff --git a/test/type/help.test.js b/test/type/help.test.js
index 34b777ac6..e8b45985d 100644
--- a/test/type/help.test.js
+++ b/test/type/help.test.js
@@ -1,6 +1,6 @@
 // test Help
 var assert = require('assert');
-var math = require('../../src/index.js');
+var math = require('../../index.js');
 
 var help = new math.type.Help(math, math.docs.sin);
 
diff --git a/test/type/matrix.test.js b/test/type/matrix.test.js
index d67f16039..184c1d608 100644
--- a/test/type/matrix.test.js
+++ b/test/type/matrix.test.js
@@ -1,7 +1,7 @@
 // test data type Matrix
 
 var assert = require('assert');
-var math = require('../../src/index.js');
+var math = require('../../index.js');
 
 var m = math.matrix();
 assert.equal(m.isScalar(), true);
diff --git a/test/type/range.test.js b/test/type/range.test.js
index e15da10d3..5e877faac 100644
--- a/test/type/range.test.js
+++ b/test/type/range.test.js
@@ -1,7 +1,7 @@
 // test data type Range
 
 var assert = require('assert');
-var math = require('../../src/index.js');
+var math = require('../../index.js');
 
 var r = math.range(2,6);
 assert.deepEqual(r.toArray(), [2,3,4,5]);
diff --git a/test/type/unit.test.js b/test/type/unit.test.js
index 8a70dfcb3..1b0a78bc3 100644
--- a/test/type/unit.test.js
+++ b/test/type/unit.test.js
@@ -1,7 +1,7 @@
 // test data type Unit
 
 var assert = require('assert');
-var math = require('../../src/index.js');
+var math = require('../../index.js');
 
 
 var unit1 = math.unit(5000, 'cm');
diff --git a/test/util/array.test.js b/test/util/array.test.js
index 86170a583..0439389df 100644
--- a/test/util/array.test.js
+++ b/test/util/array.test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    array = require('../../src/util/array.js'),
+    array = require('../../lib/util/array.js'),
     resize = array.resize;
     size = array.size;
 
diff --git a/tools/jake-utils.js b/tools/jake-utils.js
index ac30eb979..71a125fd9 100644
--- a/tools/jake-utils.js
+++ b/tools/jake-utils.js
@@ -133,9 +133,9 @@ function replace (params) {
  * Example:
  *     var result = concat({
  *         src: [
- *             './src/main.js',
- *             './src/extra.js',
- *             './src/functions/**',
+ *             './lib/main.js',
+ *             './lib/extra.js',
+ *             './lib/functions/**',
  *         ],
  *         dest: './lib/mylibrary.js',           // optional
  *         header: '// license information...',  // optional