9 files changed, 20 insertions, 16 deletions
diff --git a/lib/handlebars.js b/lib/handlebars.js
index aab2d55..222fcaf 100644
--- a/lib/handlebars.js
+++ b/lib/handlebars.js
@@ -1,14 +1,12 @@
-var Handlebars = require("handlebars/base");
+var Handlebars = require("./handlebars/base");
 module.exports = Handlebars;
 
-require("handlebars/utils");
+// Each of these augment the Handlebars object. No need to setup here.
+// (This is done to easily share code between commonjs and browse envs)
+require("./handlebars/utils");
 
-require("handlebars/compiler/ast");
-require("handlebars/compiler/printer");
-require("handlebars/compiler/visitor");
-
-require("handlebars/compiler/compiler");
-require("handlebars/vm");
+require("./handlebars/compiler");
+require("./handlebars/vm");
 
 // BEGIN(BROWSER)
 
diff --git a/lib/handlebars/compiler/ast.js b/lib/handlebars/compiler/ast.js
index 6c3711b..cb238c0 100644
--- a/lib/handlebars/compiler/ast.js
+++ b/lib/handlebars/compiler/ast.js
@@ -1,4 +1,4 @@
-var Handlebars = require("handlebars");
+var Handlebars = require('./base');
 
 // BEGIN(BROWSER)
 (function() {
diff --git a/lib/handlebars/compiler/base.js b/lib/handlebars/compiler/base.js
index c5caf7a..4bb8735 100644
--- a/lib/handlebars/compiler/base.js
+++ b/lib/handlebars/compiler/base.js
@@ -1,4 +1,4 @@
-var handlebars = require("handlebars/compiler/parser").parser;
+var handlebars = require("./parser").parser;
 var Handlebars = require("../base");
 
 // BEGIN(BROWSER)
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
index 7739f9d..c9fb7f8 100644
--- a/lib/handlebars/compiler/compiler.js
+++ b/lib/handlebars/compiler/compiler.js
@@ -1,4 +1,4 @@
-var Handlebars = require("handlebars");
+var Handlebars = require("./base");
 
 // BEGIN(BROWSER)
 Handlebars.Compiler = function() {};
diff --git a/lib/handlebars/compiler/index.js b/lib/handlebars/compiler/index.js
new file mode 100644
index 0000000..e62c768
--- /dev/null
+++ b/lib/handlebars/compiler/index.js
@@ -0,0 +1,7 @@
+// Each of these module will augment the Handlebars object as it loads. No need to perform addition operations
+module.exports = require("./base");
+require("./visitor");
+require("./printer");
+
+require("./ast");
+require("./compiler");
diff --git a/lib/handlebars/compiler/printer.js b/lib/handlebars/compiler/printer.js
index 1866830..b7485b7 100644
--- a/lib/handlebars/compiler/printer.js
+++ b/lib/handlebars/compiler/printer.js
@@ -1,5 +1,4 @@
-var Handlebars = require("handlebars");
-require("./visitor");
+var Handlebars = require("./base");
 
 // BEGIN(BROWSER)
 Handlebars.PrintVisitor = function() { this.padding = 0; };
diff --git a/lib/handlebars/compiler/visitor.js b/lib/handlebars/compiler/visitor.js
index a713bcc..a557dd3 100644
--- a/lib/handlebars/compiler/visitor.js
+++ b/lib/handlebars/compiler/visitor.js
@@ -1,4 +1,4 @@
-var Handlebars = require("handlebars");
+var Handlebars = require("./base");
 
 // BEGIN(BROWSER)
 
diff --git a/lib/handlebars/utils.js b/lib/handlebars/utils.js
index b814b66..9b2717c 100644
--- a/lib/handlebars/utils.js
+++ b/lib/handlebars/utils.js
@@ -1,4 +1,4 @@
-var Handlebars = require("handlebars");
+var Handlebars = require("./base");
 
 // BEGIN(BROWSER)
 Handlebars.Exception = function(message) {
diff --git a/lib/handlebars/vm.js b/lib/handlebars/vm.js
index 4f251f6..fa09243 100644
--- a/lib/handlebars/vm.js
+++ b/lib/handlebars/vm.js
@@ -1,4 +1,4 @@
-var Handlebars = require("handlebars");
+var Handlebars = require("./base");
 
 // BEGIN(BROWSER)
 Handlebars.VM = {