digging a directory and moving files into it makes me feel like being Lode Runner...

lib/kaminari/railtie.rb

@@ -2,20 +2,20 @@ require 'rails'
 # ensure ORMs are loaded *before* initializing Kaminari
 begin; require 'mongoid'; rescue LoadError; end
 
-require File.join(File.dirname(__FILE__), 'helpers')
-require File.join(File.dirname(__FILE__), 'page_scope_methods')
-require File.join(File.dirname(__FILE__), 'configuration_methods')
+require File.join(File.dirname(__FILE__), 'helpers/helpers')
+require File.join(File.dirname(__FILE__), 'models/page_scope_methods')
+require File.join(File.dirname(__FILE__), 'models/configuration_methods')
 
 module Kaminari
   DEFAULT_PER_PAGE = 25 unless defined? ::Kaminari::DEFAULT_PER_PAGE
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'kaminari' do |app|
       ActiveSupport.on_load(:active_record) do 
-        require File.join(File.dirname(__FILE__), 'active_record_extension')
+        require File.join(File.dirname(__FILE__), 'models/active_record_extension')
         ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
       end
       if defined? ::Mongoid
-        require File.join(File.dirname(__FILE__), 'mongoid_extension')
+        require File.join(File.dirname(__FILE__), 'models/mongoid_extension')
         ::Mongoid::Document.send :include, Kaminari::MongoidExtension::Document
         ::Mongoid::Criteria.send :include, Kaminari::MongoidExtension::Criteria
       end

spec/models/mongoid_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 require 'mongoid'
-require File.expand_path('../../lib/kaminari/mongoid_extension', File.dirname(__FILE__))
+require File.expand_path('../../lib/kaminari/models/mongoid_extension', File.dirname(__FILE__))
 
 describe Kaminari::MongoidExtension do
   before :all do