diff --git a/Rakefile b/Rakefile
index a98dc6f33..c53b639ea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -49,7 +49,7 @@ end
 GEM_NAME = "#{name}"
 task :default => :test
 
-require "fog/rake/test_task"
+require "tasks/test_task"
 Fog::Rake::TestTask.new
 
 namespace :test do
@@ -151,9 +151,9 @@ YARD::Rake::YardocTask.new do |t|
   t.options = ["--output-dir", YARDOC_LOCATION, "--title", "#{name} #{version}"]
 end
 
-require "fog/rake/changelog_task"
+require "tasks/changelog_task"
 Fog::Rake::ChangelogTask.new
 
-require "fog/rake/documentation_task"
+require "tasks/documentation_task"
 Fog::Rake::DocumentationTask.new
 
diff --git a/lib/fog/rake/changelog_task.rb b/lib/tasks/changelog_task.rb
similarity index 100%
rename from lib/fog/rake/changelog_task.rb
rename to lib/tasks/changelog_task.rb
diff --git a/lib/fog/rake/documentation_task.rb b/lib/tasks/documentation_task.rb
similarity index 100%
rename from lib/fog/rake/documentation_task.rb
rename to lib/tasks/documentation_task.rb
diff --git a/lib/fog/rake/test_task.rb b/lib/tasks/test_task.rb
similarity index 100%
rename from lib/fog/rake/test_task.rb
rename to lib/tasks/test_task.rb