diff --git a/config/application.rb b/config/application.rb
index 75d571c..1cc6379 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -25,6 +25,9 @@ module Noosfero
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W( #{Rails.root}/app/sweepers )
+    config.autoload_paths += Dir["#{config.root}/lib/**/"]
+    config.autoload_paths += Dir["#{config.root}/app/controllers/**/"]
+
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -103,8 +106,6 @@ module Noosfero
       :key    => '_noosfero_session',
     }
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/**/"]
-
     Noosfero::Plugin.setup(config)
 
   end
--
libgit2 0.21.2