diff --git a/app/models/application_model.rb b/app/models/application_model.rb
index ef8509653..c8601c1d2 100644
--- a/app/models/application_model.rb
+++ b/app/models/application_model.rb
@@ -1,9 +1,5 @@
 # Copyright (C) 2013-2013 Zammad Foundation, http://zammad-foundation.org/
 
-require 'cache'
-require 'user_info'
-require 'sessions'
-
 class ApplicationModel < ActiveRecord::Base
   self.abstract_class = true
 
diff --git a/app/models/sla.rb b/app/models/sla.rb
index af26476e0..455589f78 100644
--- a/app/models/sla.rb
+++ b/app/models/sla.rb
@@ -1,7 +1,5 @@
 # Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/
 
-require 'cache'
-
 class Sla < ApplicationModel
   store     :condition
   store     :data
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index 3669c13ac..b27c4211c 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -1,8 +1,5 @@
 # Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/
 
-require 'time_calculation'
-require 'sla'
-
 class Ticket < ApplicationModel
   before_create   :check_generate, :check_defaults
   before_update   :check_defaults
diff --git a/app/models/user.rb b/app/models/user.rb
index b89a2aa88..d25505e69 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,9 +1,5 @@
 # Copyright (C) 2012-2013 Zammad Foundation, http://zammad-foundation.org/
 
-require 'sso'
-require 'digest/sha2'
-require 'organization'
-
 class User < ApplicationModel
   include User::Assets
   extend User::Search
diff --git a/config/application.rb b/config/application.rb
index dcbe54f32..9655249a6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,7 +16,7 @@ module Zammad
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += Dir["#{config.root}/lib/**/"]
+    config.autoload_paths += Dir["#{config.root}/lib/*", "#{config.root}/lib/**/"]
 #    config.autoload_paths += %W(#{config.root}/lib)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
@@ -74,4 +74,4 @@ module Zammad
     config.api_path = '/api/v1'
 
   end
-end
\ No newline at end of file
+end