diff --git a/lib/danbooru/has_bit_flags.rb b/app/logical/danbooru/has_bit_flags.rb
similarity index 100%
rename from lib/danbooru/has_bit_flags.rb
rename to app/logical/danbooru/has_bit_flags.rb
diff --git a/lib/danbooru/paginator/active_record_extension.rb b/app/logical/danbooru/paginator/active_record_extension.rb
similarity index 100%
rename from lib/danbooru/paginator/active_record_extension.rb
rename to app/logical/danbooru/paginator/active_record_extension.rb
diff --git a/lib/danbooru/paginator/numbered_collection_extension.rb b/app/logical/danbooru/paginator/numbered_collection_extension.rb
similarity index 100%
rename from lib/danbooru/paginator/numbered_collection_extension.rb
rename to app/logical/danbooru/paginator/numbered_collection_extension.rb
diff --git a/lib/danbooru/paginator/pagination_error.rb b/app/logical/danbooru/paginator/pagination_error.rb
similarity index 100%
rename from lib/danbooru/paginator/pagination_error.rb
rename to app/logical/danbooru/paginator/pagination_error.rb
diff --git a/lib/danbooru/paginator/sequential_collection_extension.rb b/app/logical/danbooru/paginator/sequential_collection_extension.rb
similarity index 100%
rename from lib/danbooru/paginator/sequential_collection_extension.rb
rename to app/logical/danbooru/paginator/sequential_collection_extension.rb
diff --git a/lib/danbooru_image_resizer/danbooru_image_resizer.rb b/app/logical/danbooru_image_resizer.rb
similarity index 98%
rename from lib/danbooru_image_resizer/danbooru_image_resizer.rb
rename to app/logical/danbooru_image_resizer.rb
index 93858a83d..3871acc94 100644
--- a/lib/danbooru_image_resizer/danbooru_image_resizer.rb
+++ b/app/logical/danbooru_image_resizer.rb
@@ -1,4 +1,4 @@
-module Danbooru
+module DanbooruImageResizer
   def resize(read_path, write_path, width, height, resize_quality = 90)
     image = Magick::Image.read(read_path).first
     geometry = "#{width}x>"
diff --git a/app/logical/pixiv_ugoira_converter.rb b/app/logical/pixiv_ugoira_converter.rb
index 07b72ee45..abe619656 100644
--- a/app/logical/pixiv_ugoira_converter.rb
+++ b/app/logical/pixiv_ugoira_converter.rb
@@ -71,7 +71,7 @@ class PixivUgoiraConverter
       file = folder.first
       temp_path = File.join(tmpdir, file.name)
       file.extract(temp_path)
-      Danbooru.resize(temp_path, path, Danbooru.config.small_image_width, Danbooru.config.small_image_width, 85)
+      DanbooruImageResizer.resize(temp_path, path, Danbooru.config.small_image_width, Danbooru.config.small_image_width, 85)
     end
   end
 end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 31ebfcbe2..e36fca0c4 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,6 +1,8 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
+  include Danbooru::Paginator::ActiveRecordExtension
+
   concerning :SearchMethods do
     class_methods do
       # range: "5", ">5", "<5", ">=5", "<=5", "5..10", "5,6,7"
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 08f020f5b..2d43e0180 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -1,4 +1,3 @@
-require "danbooru_image_resizer/danbooru_image_resizer"
 require "tmpdir"
 
 class Upload < ApplicationRecord
@@ -273,7 +272,7 @@ class Upload < ApplicationRecord
 
       output_path = resized_file_path_for(width)
       if is_image?
-        Danbooru.resize(source_path, output_path, width, height, quality)
+        DanbooruImageResizer.resize(source_path, output_path, width, height, quality)
       elsif is_ugoira?
         if Delayed::Worker.delay_jobs
           # by the time this runs we'll have moved source_path to md5_file_path
diff --git a/config/initializers/delayed_jobs.rb b/config/initializers/delayed_jobs.rb
index 59a6f9c1a..c73f78c14 100644
--- a/config/initializers/delayed_jobs.rb
+++ b/config/initializers/delayed_jobs.rb
@@ -11,3 +11,4 @@ end
 Delayed::Worker.default_queue_name = "default"
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.plugins << DelayedJobTimeoutPlugin
+Delayed::Job.include(Danbooru::Paginator::ActiveRecordExtension)
diff --git a/config/initializers/lib.rb b/config/initializers/lib.rb
deleted file mode 100644
index cb7f8b7bb..000000000
--- a/config/initializers/lib.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'danbooru/paginator'
-require 'danbooru_image_resizer/danbooru_image_resizer'
-
diff --git a/lib/danbooru/paginator.rb b/lib/danbooru/paginator.rb
deleted file mode 100644
index 1fccaa665..000000000
--- a/lib/danbooru/paginator.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "danbooru/paginator/active_record_extension"
-require "danbooru/paginator/numbered_collection_extension"
-require "danbooru/paginator/sequential_collection_extension"
-require "danbooru/paginator/pagination_error"
-
-ApplicationRecord.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)
-Delayed::Job.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)