diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 5c4523b72..1cb864b50 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -30,10 +30,10 @@
 use OCA\Photos\Listener\AlbumsManagementEventListener;
 use OCA\Photos\Listener\SabrePluginAuthInitListener;
 use OCA\Photos\Listener\TagListener;
-use OCA\Photos\MetadataProvider\ExifMetadataProvider;
-use OCA\Photos\MetadataProvider\OriginalDateTimeMetadataProvider;
-use OCA\Photos\MetadataProvider\PlaceMetadataProvider;
-use OCA\Photos\MetadataProvider\SizeMetadataProvider;
+use OCA\Photos\Listener\ExifMetadataProvider;
+use OCA\Photos\Listener\OriginalDateTimeMetadataProvider;
+use OCA\Photos\Listener\PlaceMetadataProvider;
+use OCA\Photos\Listener\SizeMetadataProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
diff --git a/lib/MetadataProvider/ExifMetadataProvider.php b/lib/Listener/ExifMetadataProvider.php
similarity index 98%
rename from lib/MetadataProvider/ExifMetadataProvider.php
rename to lib/Listener/ExifMetadataProvider.php
index b28440a38..d829ec331 100644
--- a/lib/MetadataProvider/ExifMetadataProvider.php
+++ b/lib/Listener/ExifMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCP\EventDispatcher\Event;
@@ -33,7 +33,7 @@
  * Extract EXIF, IFD0, and GPS data from a picture file.
  * EXIF data reference: https://web.archive.org/web/20220428165430/exif.org/Exif2-2.PDF
  *
- * @template-implements IEventListener
+ * @template-implements IEventListener<Event>
  */
 class ExifMetadataProvider implements IEventListener {
 	public function __construct(
diff --git a/lib/MetadataProvider/OriginalDateTimeMetadataProvider.php b/lib/Listener/OriginalDateTimeMetadataProvider.php
similarity index 97%
rename from lib/MetadataProvider/OriginalDateTimeMetadataProvider.php
rename to lib/Listener/OriginalDateTimeMetadataProvider.php
index 592c75576..23dadd82c 100644
--- a/lib/MetadataProvider/OriginalDateTimeMetadataProvider.php
+++ b/lib/Listener/OriginalDateTimeMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use DateTime;
 use OCA\Photos\AppInfo\Application;
@@ -30,7 +30,7 @@
 use OCP\FilesMetadata\Event\MetadataLiveEvent;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<Event>
  */
 class OriginalDateTimeMetadataProvider implements IEventListener {
 	public function __construct() {
diff --git a/lib/MetadataProvider/PlaceMetadataProvider.php b/lib/Listener/PlaceMetadataProvider.php
similarity index 95%
rename from lib/MetadataProvider/PlaceMetadataProvider.php
rename to lib/Listener/PlaceMetadataProvider.php
index 7501b8d20..5c6da5802 100644
--- a/lib/MetadataProvider/PlaceMetadataProvider.php
+++ b/lib/Listener/PlaceMetadataProvider.php
@@ -20,7 +20,7 @@
  */
 
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCA\Photos\Service\MediaPlaceManager;
@@ -31,7 +31,7 @@
 use OCP\FilesMetadata\Event\MetadataLiveEvent;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<Event>
  */
 class PlaceMetadataProvider implements IEventListener {
 	public function __construct(
diff --git a/lib/MetadataProvider/SizeMetadataProvider.php b/lib/Listener/SizeMetadataProvider.php
similarity index 95%
rename from lib/MetadataProvider/SizeMetadataProvider.php
rename to lib/Listener/SizeMetadataProvider.php
index f57546a31..a4fc1bc70 100644
--- a/lib/MetadataProvider/SizeMetadataProvider.php
+++ b/lib/Listener/SizeMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCP\EventDispatcher\Event;
@@ -30,7 +30,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<Event>
  */
 class SizeMetadataProvider implements IEventListener {
 	public function __construct(