diff --git a/rakefile b/rakefile
index 20101a14db..3fcd16f995 100644
--- a/rakefile
+++ b/rakefile
@@ -1,10 +1,6 @@
 require 'json'
 require 'rake/clean'
-require './rakefiles/helpers.rb'
-
-Dir['rakefiles/*.rake'].each do |rakefile|
-    import rakefile
-end
+require './rakelib/helpers.rb'
 
 # Build Constants
 REPO_ROOT = File.dirname(__FILE__)
diff --git a/rakefiles/assets.rake b/rakelib/assets.rake
similarity index 100%
rename from rakefiles/assets.rake
rename to rakelib/assets.rake
diff --git a/rakefiles/deploy.rake b/rakelib/deploy.rake
similarity index 100%
rename from rakefiles/deploy.rake
rename to rakelib/deploy.rake
diff --git a/rakefiles/deprecated.rake b/rakelib/deprecated.rake
similarity index 100%
rename from rakefiles/deprecated.rake
rename to rakelib/deprecated.rake
diff --git a/rakefiles/django.rake b/rakelib/django.rake
similarity index 100%
rename from rakefiles/django.rake
rename to rakelib/django.rake
diff --git a/rakefiles/docs.rake b/rakelib/docs.rake
similarity index 100%
rename from rakefiles/docs.rake
rename to rakelib/docs.rake
diff --git a/rakefiles/helpers.rb b/rakelib/helpers.rb
similarity index 100%
rename from rakefiles/helpers.rb
rename to rakelib/helpers.rb
diff --git a/rakefiles/i18n.rake b/rakelib/i18n.rake
similarity index 100%
rename from rakefiles/i18n.rake
rename to rakelib/i18n.rake
diff --git a/rakefiles/jasmine.rake b/rakelib/jasmine.rake
similarity index 100%
rename from rakefiles/jasmine.rake
rename to rakelib/jasmine.rake
diff --git a/rakefiles/prereqs.rake b/rakelib/prereqs.rake
similarity index 98%
rename from rakefiles/prereqs.rake
rename to rakelib/prereqs.rake
index ff8b4b8784..e06d411435 100644
--- a/rakefiles/prereqs.rake
+++ b/rakelib/prereqs.rake
@@ -1,5 +1,3 @@
-require './rakefiles/helpers.rb'
-
 PREREQS_MD5_DIR = ENV["PREREQ_CACHE_DIR"] || File.join(REPO_ROOT, '.prereqs_cache')
 
 CLOBBER.include(PREREQS_MD5_DIR)
diff --git a/rakefiles/quality.rake b/rakelib/quality.rake
similarity index 100%
rename from rakefiles/quality.rake
rename to rakelib/quality.rake
diff --git a/rakefiles/tests.rake b/rakelib/tests.rake
similarity index 100%
rename from rakefiles/tests.rake
rename to rakelib/tests.rake
diff --git a/rakefiles/workspace.rake b/rakelib/workspace.rake
similarity index 100%
rename from rakefiles/workspace.rake
rename to rakelib/workspace.rake