diff --git a/modules/opd_presentations/opd_presentations.services.yml b/modules/opd_presentations/opd_presentations.services.yml
index d2528f660..6f3c91500 100644
--- a/modules/opd_presentations/opd_presentations.services.yml
+++ b/modules/opd_presentations/opd_presentations.services.yml
@@ -1,5 +1,5 @@
 services:
-  Drupal\opd_presentations\CountGivenPresentations:
+  Drupal\opd_presentations\Action\CountGivenPresentations:
     autowire: true
   Drupal\opd_presentations\Repository\PresentationNodeRepository:
     autowire: true
diff --git a/modules/opd_presentations/src/CountGivenPresentations.php b/modules/opd_presentations/src/Action/CountGivenPresentations.php
similarity index 86%
rename from modules/opd_presentations/src/CountGivenPresentations.php
rename to modules/opd_presentations/src/Action/CountGivenPresentations.php
index 9b47a4445..1c3b14257 100644
--- a/modules/opd_presentations/src/CountGivenPresentations.php
+++ b/modules/opd_presentations/src/Action/CountGivenPresentations.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Drupal\opd_presentations;
+namespace Drupal\opd_presentations\Action;
 
+use Drupal\opd_presentations\Presentation;
 use Drupal\opd_presentations\Repository\PresentationRepositoryInterface;
 
 final class CountGivenPresentations {
diff --git a/modules/opd_presentations/tests/src/Functional/CountGivenPresentationsTest.php b/modules/opd_presentations/tests/src/Functional/Action/CountGivenPresentationsTest.php
similarity index 94%
rename from modules/opd_presentations/tests/src/Functional/CountGivenPresentationsTest.php
rename to modules/opd_presentations/tests/src/Functional/Action/CountGivenPresentationsTest.php
index 116c55724..8e2814136 100644
--- a/modules/opd_presentations/tests/src/Functional/CountGivenPresentationsTest.php
+++ b/modules/opd_presentations/tests/src/Functional/Action/CountGivenPresentationsTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\opd_presentations;
+namespace Drupal\Tests\opd_presentations\Action;
 
 use Drupal\Tests\RandomGeneratorTrait;
 use Drupal\Tests\opd_presentations\Traits\PresentationCreationTrait;
-use Drupal\opd_presentations\CountGivenPresentations;
+use Drupal\opd_presentations\Action\CountGivenPresentations;
 use Drupal\opd_presentations\Events;
 use weitzman\DrupalTestTraits\ExistingSiteBase;