Commit 5d596af

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), '../lib'))
-require 'application'
+require_relative '../lib/application.rb'
 
 Application.new.run(ARGV)

@@ -1,8 +1,9 @@
-Dir["**/**/*.rb"].each { |file| $:.unshift(File.dirname(file)) }
+require 'rubygems'
 
-require 'application_shell_presenter'
-require 'application_shell'
-require 'event_aggregator'
+Dir["lib/**/*.rb"].each do |file|
+  $:.unshift(File.dirname(file)) unless $:.include?(File.dirname(file))
+  require File.basename(file)
+end
 
 class ShutdownCommand
   def halt(*message)