0
@@ -9,15 +9,20 @@ module Waves
0
 
0
       def self.included( app )
0
 
0
+        require 'layers/simple'
0
+        require 'layers/mvc'
0
+        require 'layers/default_errors'
0
+        
0
         app.instance_eval do
0
 
0
           include Waves::Layers::Inflect::English
0
-          include Waves::Renderers::Markaby
0
-          include Waves::Renderers::Erubis
0
           include Waves::Layers::Simple
0
           include Waves::Layers::MVC
0
           include Waves::Layers::DefaultErrors
0
           
0
+          include Waves::Renderers::Markaby
0
+          include Waves::Renderers::Erubis   
0
+          
0
         end
0
         
0
         Waves << app

0
@@ -17,10 +17,13 @@ module Waves
0
       # On inclusion in a module, the Simple foundation includes Waves::Layers::Simple and 
0
       # registers the module as a Waves application.
0
       def self.included( app )
0
+        require 'layers/simple'
0
+        require 'layers/simple_errors'
0
 
0
         app.instance_eval do
0
           include Waves::Layers::Inflect::English
0
           include Waves::Layers::Simple
0
+          include Waves::Layers::SimpleErrors
0
         end
0
         
0
         Waves << app

0
@@ -1,7 +1,3 @@
0
-gem 'dm-core', '=0.9.0'
0
-
0
-require 'data_mapper'
0
-
0
 module Waves
0
   module Layers
0
     module ORM
0
@@ -10,6 +6,9 @@ module Waves
0
       module DataMapper
0
         
0
         def self.included(app)
0
+          gem 'dm-core', '=0.9.0'
0
+
0
+          require 'data_mapper'
0
           
0
           def app.database
0
             @adapter ||= ::DataMapper.setup(:main_repository, config.database[:database])

0
@@ -88,16 +88,11 @@ require 'helpers/built_in'
0
 require 'views/mixin'
0
 require 'views/errors'
0
 
0
-
0
 require 'renderers/mixin'
0
 
0
 require 'foundations/default'
0
 require 'foundations/simple'
0
 
0
-require 'layers/simple'
0
-require 'layers/simple_errors'
0
-require 'layers/mvc'
0
-require 'layers/default_errors'
0
 require 'layers/inflect/english'
0
 require 'layers/renderers/markaby'
0
 require 'layers/renderers/erubis'