diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 3eba05777..5cc006eda 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -1,5 +1,4 @@
 class EppController < ApplicationController
-  include Iptable
   layout false
   protect_from_forgery with: :null_session
   skip_before_action :verify_authenticity_token
@@ -407,4 +406,20 @@ class EppController < ApplicationController
     timeout = 5.minutes
     epp_session.updated_at < (Time.zone.now - timeout)
   end
+
+  def counter_update(registrar_code, ip)
+    counter_proc = "/proc/net/xt_recent/#{registrar_code}"
+
+    begin
+      File.open(counter_proc, 'a') do |f|
+        f.puts "+#{ip}"
+      end
+    rescue Errno::ENOENT => e
+      logger.error "IPTABLES COUNTER UPDATE: cannot open #{counter_proc}: #{e}"
+    rescue Errno::EACCES => e
+      logger.error "IPTABLES COUNTER UPDATE: no permission #{counter_proc}: #{e}"
+    rescue IOError => e
+      logger.error "IPTABLES COUNTER UPDATE: cannot write #{ip} to #{counter_proc}: #{e}"
+    end
+  end
 end
diff --git a/lib/sorted_country.rb b/app/models/sorted_country.rb
similarity index 96%
rename from lib/sorted_country.rb
rename to app/models/sorted_country.rb
index 8b69d951a..4eb5750f5 100644
--- a/lib/sorted_country.rb
+++ b/app/models/sorted_country.rb
@@ -1,6 +1,3 @@
-require 'countries'
-require 'action_view'
-
 class SortedCountry
   class << self
     include ActionView::Helpers
diff --git a/config/application.rb b/config/application.rb
index 0d043fa5e..400e72124 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -40,8 +40,8 @@ module DomainNameRegistry
 
     # Autoload all model subdirs
     config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')]
-    config.autoload_paths << Rails.root.join('lib')
     config.eager_load_paths << config.root.join('lib', 'validators')
+    config.watchable_dirs['lib'] = %i[rb]
 
     # Add the fonts path
     config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3fe74cba6..eceb6d5f2 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,5 @@
+require 'devise_custom_failure'
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
diff --git a/config/initializers/ext.rb b/config/initializers/ext.rb
new file mode 100644
index 000000000..50b8b2791
--- /dev/null
+++ b/config/initializers/ext.rb
@@ -0,0 +1,4 @@
+require 'core_ext/array'
+require 'gem_ext/builder'
+require 'gem_ext/i18n'
+require 'gem_ext/paper_trail'
\ No newline at end of file
diff --git a/config/initializers/load_class_extensions.rb b/config/initializers/load_class_extensions.rb
deleted file mode 100644
index f9fb4625c..000000000
--- a/config/initializers/load_class_extensions.rb
+++ /dev/null
@@ -1 +0,0 @@
-Dir[File.join(Rails.root, 'lib', 'ext', '*.rb')].each { |x| require x }
diff --git a/config/routes.rb b/config/routes.rb
index 5ef26a195..ab6369775 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-require 'epp_constraint'
+require_dependency 'epp_constraint'
 
 Rails.application.routes.draw do
   namespace(:epp, defaults: { format: :xml }) do
diff --git a/config/initializers/array.rb b/lib/core_ext/array.rb
similarity index 100%
rename from config/initializers/array.rb
rename to lib/core_ext/array.rb
diff --git a/lib/ext/xml_builder.rb b/lib/gem_ext/builder.rb
similarity index 100%
rename from lib/ext/xml_builder.rb
rename to lib/gem_ext/builder.rb
diff --git a/config/initializers/relaxed_i18n.rb b/lib/gem_ext/i18n.rb
similarity index 86%
rename from config/initializers/relaxed_i18n.rb
rename to lib/gem_ext/i18n.rb
index fc9b94983..2f7fceff7 100644
--- a/config/initializers/relaxed_i18n.rb
+++ b/lib/gem_ext/i18n.rb
@@ -1,5 +1,5 @@
 # Don't raise error when nil
-# http://stackoverflow.com/questions/9467034/rails-i18n-how-to-handle-case-of-a-nil-date-being-passed-ie-lnil 
+# http://stackoverflow.com/questions/9467034/rails-i18n-how-to-handle-case-of-a-nil-date-being-passed-ie-lnil
 module I18n
   class << self
     alias_method :original_localize, :localize
diff --git a/config/initializers/001_paper_trail.rb b/lib/gem_ext/paper_trail.rb
similarity index 100%
rename from config/initializers/001_paper_trail.rb
rename to lib/gem_ext/paper_trail.rb
diff --git a/lib/iptable.rb b/lib/iptable.rb
deleted file mode 100644
index c41bc37f4..000000000
--- a/lib/iptable.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Iptable
-  def counter_update(registrar_code, ip)
-    counter_proc = "/proc/net/xt_recent/#{registrar_code}"
-
-    begin
-      File.open(counter_proc, 'a') do |f|
-        f.puts "+#{ip}"
-      end
-    rescue Errno::ENOENT => e
-      logger.error "IPTABLES COUNTER UPDATE: cannot open #{counter_proc}: #{e}"
-    rescue Errno::EACCES => e
-      logger.error "IPTABLES COUNTER UPDATE: no permission #{counter_proc}: #{e}"
-    rescue IOError => e
-      logger.error "IPTABLES COUNTER UPDATE: cannot write #{ip} to #{counter_proc}: #{e}"
-    end
-  end
-end