diff --git a/Rakefile b/Rakefile
index 8432add6..405e7cba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,11 +28,11 @@ def remove_exports(string)
   match ? match[1] : string
 end
 
-minimal_deps = %w(compiler/parser base ast visitor utils compiler/compiler vm).map do |file|
+minimal_deps = %w(compiler/parser base compiler/ast visitor utils compiler/compiler vm).map do |file|
   "lib/handlebars/#{file}.js"
 end
 
-debug_deps = %w(compiler/parser base ast visitor compiler/printer utils compiler/compiler vm debug).map do |file|
+debug_deps = %w(compiler/parser base compiler/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 d8712a09..79d600cc 100644
--- a/lib/handlebars.js
+++ b/lib/handlebars.js
@@ -3,7 +3,7 @@ module.exports = Handlebars;
 
 require("handlebars/utils");
 
-require("handlebars/ast");
+require("handlebars/compiler/ast");
 require("handlebars/compiler/printer");
 require("handlebars/visitor");
 
diff --git a/lib/handlebars/ast.js b/lib/handlebars/compiler/ast.js
similarity index 100%
rename from lib/handlebars/ast.js
rename to lib/handlebars/compiler/ast.js
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cc3799d1..59c32aa2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -74,7 +74,7 @@ module Handlebars
 
       Handlebars::Spec.js_load('lib/handlebars/compiler/parser.js')
       Handlebars::Spec.js_load('lib/handlebars/base.js');
-      Handlebars::Spec.js_load('lib/handlebars/ast.js');
+      Handlebars::Spec.js_load('lib/handlebars/compiler/ast.js');
       Handlebars::Spec.js_load('lib/handlebars/visitor.js');
       Handlebars::Spec.js_load('lib/handlebars/compiler/printer.js')
       Handlebars::Spec.js_load('lib/handlebars/utils.js')