diff --git a/bin/pry b/bin/pry
index b231b009..22207c47 100644
--- a/bin/pry
+++ b/bin/pry
@@ -51,7 +51,7 @@ See: `https://github.com/banister` for more information.
     puts opts
     exit
   end
-end.permute!
+end.parse!
 
 rcpath = File.expand_path("~/.pryrc")
 
diff --git a/lib/pry.rb b/lib/pry.rb
index 65c4a240..41019745 100644
--- a/lib/pry.rb
+++ b/lib/pry.rb
@@ -5,7 +5,13 @@ direc = File.dirname(__FILE__)
 
 require "method_source"
 require "readline"
-
-Dir["#{direc}/pry/*.rb"].each do |file|
-  require file
-end
+require "#{direc}/pry/version"
+require "#{direc}/pry/hooks"
+require "#{direc}/pry/print"
+require "#{direc}/pry/command_base"
+require "#{direc}/pry/commands"
+require "#{direc}/pry/prompts"
+require "#{direc}/pry/completion"
+require "#{direc}/pry/core_extensions"
+require "#{direc}/pry/pry_class"
+require "#{direc}/pry/pry_instance"
diff --git a/lib/pry/version.rb b/lib/pry/version.rb
index e61ce197..e2a91756 100644
--- a/lib/pry/version.rb
+++ b/lib/pry/version.rb
@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end