diff --git a/lib/more.rb b/lib/less/more.rb
similarity index 99%
rename from lib/more.rb
rename to lib/less/more.rb
index 0d2f2e5..b0e6eac 100644
--- a/lib/more.rb
+++ b/lib/less/more.rb
@@ -109,7 +109,7 @@ def exists?(path_as_array)
     end
     
     def cache_path
-      File.join(RAILS_ROOT, 'tmp', 'less-cache')
+      File.join(Rails.root, 'tmp', 'less-cache')
     end
             
     # Generates the .css from a .less or .lss file in Less::More.source_path matching
diff --git a/rails/init.rb b/rails/init.rb
index f629daa..43786b2 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,2 +1 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'more')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'controller_extension') if RAILS_ENV == 'development'
\ No newline at end of file
diff --git a/tasks/more_tasks.rake b/tasks/more_tasks.rake
index 55fb4bf..101eb1e 100644
--- a/tasks/more_tasks.rake
+++ b/tasks/more_tasks.rake
@@ -1,6 +1,3 @@
-require 'less'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'more')
-
 namespace :more do
   desc "Generate CSS files from LESS files"
   task :parse => :environment do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f0037f3..e40fb14 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -33,6 +33,4 @@ class ApplicationController < ActionController::Base
   raise e
 end
 
-RAILS_ROOT = Rails.root
-
-require 'more'
\ No newline at end of file
+require 'less/more'
\ No newline at end of file