diff --git a/app/overrides/issues.rb b/app/overrides/issues.rb
deleted file mode 100644
index 867b0a1..0000000
--- a/app/overrides/issues.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Issues
-  Deface::Override.new(
-    :virtual_path => "issues/show",
-    :name => "deface_replace_render_half_width_custom_fields_rows",
-    :replace => "erb[loud]:contains('render_half_width_custom_fields_rows(@issue)')",
-    :original => "<%= render_half_width_custom_fields_rows(@issue) %>",
-    :text => "<%= render_custom_fields_rows_by_groups(@issue) %>"
-  )
-
-  Deface::Override.new(
-    :virtual_path => "issues/show",
-    :name => "deface_remove_render_full_width_custom_fields_rows",
-    :remove => "erb[loud]:contains('render_full_width_custom_fields_rows(@issue)')",
-    :original => "<%= render_full_width_custom_fields_rows(@issue) %>"
-  )
-end
diff --git a/app/overrides/issues/show.rb b/app/overrides/issues/show.rb
new file mode 100644
index 0000000..fbfc5ee
--- /dev/null
+++ b/app/overrides/issues/show.rb
@@ -0,0 +1,14 @@
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_replace_render_half_width_custom_fields_rows",
+  :replace => "erb[loud]:contains('render_half_width_custom_fields_rows(@issue)')",
+  :original => "<%= render_half_width_custom_fields_rows(@issue) %>",
+  :text => "<%= render_custom_fields_rows_by_groups(@issue) %>"
+)
+
+Deface::Override.new(
+  :virtual_path => "issues/show",
+  :name => "deface_remove_render_full_width_custom_fields_rows",
+  :remove => "erb[loud]:contains('render_full_width_custom_fields_rows(@issue)')",
+  :original => "<%= render_full_width_custom_fields_rows(@issue) %>"
+)
diff --git a/init.rb b/init.rb
index 65956cc..f2236ea 100644
--- a/init.rb
+++ b/init.rb
@@ -26,7 +26,10 @@
 end
 
 if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
-  require_relative 'app/overrides/issues'
+  Dir.glob("#{Rails.root}/plugins/redmine_custom_fields_groups/app/overrides/**/*.rb").each do |path|
+    Rails.autoloaders.main.ignore(path)
+    require path
+  end
   Rails.application.config.after_initialize do
     RedmineCustomFieldsGroups.setup
   end