diff --git a/Rakefile b/Rakefile
index 675ed1ca..8432add6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,7 +32,7 @@ minimal_deps = %w(compiler/parser base ast visitor utils compiler/compiler vm).m
   "lib/handlebars/#{file}.js"
 end
 
-debug_deps = %w(compiler/parser base ast visitor printer utils compiler/compiler vm debug).map do |file|
+debug_deps = %w(compiler/parser base ast visitor compiler/printer utils compiler/compiler vm debug).map do |file|
   "lib/handlebars/#{file}.js"
 end
 
diff --git a/lib/handlebars.js b/lib/handlebars.js
index 97d22774..d8712a09 100644
--- a/lib/handlebars.js
+++ b/lib/handlebars.js
@@ -4,7 +4,7 @@ module.exports = Handlebars;
 require("handlebars/utils");
 
 require("handlebars/ast");
-require("handlebars/printer");
+require("handlebars/compiler/printer");
 require("handlebars/visitor");
 
 require("handlebars/compiler/compiler");
diff --git a/lib/handlebars/printer.js b/lib/handlebars/compiler/printer.js
similarity index 100%
rename from lib/handlebars/printer.js
rename to lib/handlebars/compiler/printer.js
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a3f44f7f..cc3799d1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -76,7 +76,7 @@ module Handlebars
       Handlebars::Spec.js_load('lib/handlebars/base.js');
       Handlebars::Spec.js_load('lib/handlebars/ast.js');
       Handlebars::Spec.js_load('lib/handlebars/visitor.js');
-      Handlebars::Spec.js_load('lib/handlebars/printer.js')
+      Handlebars::Spec.js_load('lib/handlebars/compiler/printer.js')
       Handlebars::Spec.js_load('lib/handlebars/utils.js')
       Handlebars::Spec.js_load('lib/handlebars/compiler/compiler.js')
       Handlebars::Spec.js_load('lib/handlebars/vm.js')