diff --git a/ext/legacydedupefinder/Civi/LegacyFinder/Finder.php b/ext/legacydedupefinder/CRM/Dedupe/BAO/Finder.php
similarity index 78%
rename from ext/legacydedupefinder/Civi/LegacyFinder/Finder.php
rename to ext/legacydedupefinder/CRM/Dedupe/BAO/Finder.php
index 5c0d8210372..d6ca9b9ab40 100644
--- a/ext/legacydedupefinder/Civi/LegacyFinder/Finder.php
+++ b/ext/legacydedupefinder/CRM/Dedupe/BAO/Finder.php
@@ -1,10 +1,15 @@
 <?php
 
-namespace Civi\LegacyFinder;
-
 use Civi\Core\Event\GenericHookEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class CRM_Dedupe_BAO_Finder implements EventSubscriberInterface {
 
-class Finder {
+  public static function getSubscribedEvents(): array {
+    return [
+      'hook_civicrm_findExistingDuplicates' => ['findExistingDuplicates', -5],
+    ];
+  }
 
   /**
    * This function exists to provide legacy hook support for finding duplicates.
diff --git a/ext/legacydedupefinder/info.xml b/ext/legacydedupefinder/info.xml
index 2b316c2b7b5..73ad1ad8d4a 100644
--- a/ext/legacydedupefinder/info.xml
+++ b/ext/legacydedupefinder/info.xml
@@ -20,10 +20,10 @@
   <compatibility>
     <ver>[civicrm.majorVersion]</ver>
   </compatibility>
-  <tags>
-    <tag>mgmt:hidden</tag>
-  </tags>
   <comments>This adds backwards compatibility for dedupe hooks. If you do not need them you can improve dedupe performance by disabling this</comments>
+  <mixins>
+    <mixin>scan-classes@1.0.0</mixin>
+  </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
     <psr4 prefix="Civi\" path="Civi"/>
diff --git a/ext/legacydedupefinder/legacydedupefinder.php b/ext/legacydedupefinder/legacydedupefinder.php
index ea913bb054b..573de71db5c 100644
--- a/ext/legacydedupefinder/legacydedupefinder.php
+++ b/ext/legacydedupefinder/legacydedupefinder.php
@@ -11,7 +11,6 @@
  */
 function legacydedupefinder_civicrm_config(&$config): void {
   _legacydedupefinder_civix_civicrm_config($config);
-  \Civi::dispatcher()->addListener('hook_civicrm_findExistingDuplicates', ['\Civi\LegacyFinder\Finder', 'findExistingDuplicates'], -5);
 }
 
 /**