diff --git a/Rakefile b/Rakefile
index 806e1c04dfb..46b311f977d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,27 +1,9 @@
-# Rakefile for Puppet -*- ruby -*-
-RAKE_ROOT = File.dirname(__FILE__)
+# frozen_string_literal: true
 
-# We need access to the Puppet.version method
-$LOAD_PATH.unshift(File.expand_path("lib"))
-require 'puppet/version'
-
-$LOAD_PATH << File.join(RAKE_ROOT, 'tasks')
-
-begin
-  require 'rubygems'
-  require 'rubygems/package_task'
-rescue LoadError
-  # Users of older versions of Rake (0.8.7 for example) will not necessarily
-  # have rubygems installed, or the newer rubygems package_task for that
-  # matter.
-  require 'rake/packagetask'
-  require 'rake/gempackagetask'
-end
-
-require 'rake'
 require 'open3'
-
-Dir['tasks/**/*.rake'].each { |t| load t }
+require 'rake'
+require 'rubygems'
+require 'rubygems/package_task'
 
 if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin
diff --git a/tasks/benchmark.rake b/rakelib/benchmark.rake
similarity index 100%
rename from tasks/benchmark.rake
rename to rakelib/benchmark.rake
diff --git a/tasks/cfpropertylist.rake b/rakelib/cfpropertylist.rake
similarity index 100%
rename from tasks/cfpropertylist.rake
rename to rakelib/cfpropertylist.rake
diff --git a/tasks/ci.rake b/rakelib/ci.rake
similarity index 100%
rename from tasks/ci.rake
rename to rakelib/ci.rake
diff --git a/tasks/generate_ast_model.rake b/rakelib/generate_ast_model.rake
similarity index 100%
rename from tasks/generate_ast_model.rake
rename to rakelib/generate_ast_model.rake
diff --git a/tasks/generate_cert_fixtures.rake b/rakelib/generate_cert_fixtures.rake
similarity index 100%
rename from tasks/generate_cert_fixtures.rake
rename to rakelib/generate_cert_fixtures.rake
diff --git a/tasks/manpages.rake b/rakelib/manpages.rake
similarity index 100%
rename from tasks/manpages.rake
rename to rakelib/manpages.rake
diff --git a/tasks/memwalk.rake b/rakelib/memwalk.rake
similarity index 100%
rename from tasks/memwalk.rake
rename to rakelib/memwalk.rake
diff --git a/tasks/parallel.rake b/rakelib/parallel.rake
similarity index 100%
rename from tasks/parallel.rake
rename to rakelib/parallel.rake
diff --git a/tasks/parser.rake b/rakelib/parser.rake
similarity index 100%
rename from tasks/parser.rake
rename to rakelib/parser.rake
diff --git a/tasks/yard.rake b/rakelib/yard.rake
similarity index 100%
rename from tasks/yard.rake
rename to rakelib/yard.rake