lib/reform.rb in reform-1.1.1 vs lib/reform.rb in reform-1.2.0.beta1

@@ -1,15 +1,17 @@
 module Reform
-  autoload :Contract, 'reform/contract'
-
   def self.rails3_0?
     ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 0
   end
 end
 
+require 'reform/contract'
 require 'reform/form'
 require 'reform/form/composition'
 require 'reform/form/active_model'
+require 'reform/form/module'
+require 'reform/composition'
+
 
 if defined?(Rails) # DISCUSS: is everyone ok with this?
   require 'reform/rails'
 end