diff --git a/config/application.rb b/config/application.rb
index aba314082..6e2895390 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,15 +22,9 @@ def credentials
       Rails.application.secrets
     end
 
-    require 'constants'
-    require 'page_location'
-    require 'hours_request'
-    require 'holdings'
-    require 'purl_embed'
-    require 'search_query_modifier'
-
     # load all marc fields
-    config.autoload_paths += %W(#{config.root}/app/models/marc_fields)
+    config.autoload_paths << "#{root}/app/models/marc_fields"
+    config.autoload_lib(ignore: %w(assets tasks))
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
index 907fa1cd1..ea431022e 100644
--- a/config/initializers/zeitwerk.rb
+++ b/config/initializers/zeitwerk.rb
@@ -1,4 +1,11 @@
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'CJK'
   inflect.acronym 'IP'
+  inflect.acronym 'MHLD'
+end
+
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    "purl_embed" => "PURLEmbed"
+  )
 end
diff --git a/lib/holdings.rb b/lib/holdings.rb
index c85022228..3b2003520 100644
--- a/lib/holdings.rb
+++ b/lib/holdings.rb
@@ -1,9 +1,3 @@
-require 'holdings/item'
-require 'holdings/library'
-require 'holdings/location'
-require 'holdings/mhld'
-require 'holdings/status'
-
 class Holdings
   attr_reader :items, :mhld