diff --git a/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
similarity index 95%
rename from src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php
rename to src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index 91a2dd285..35e52dbd5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
@@ -23,7 +23,7 @@ use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
-class CountActivityLinkedToACP implements ExportInterface, GroupedExportInterface
+class CountActivity implements ExportInterface, GroupedExportInterface
 {
     protected ActivityRepository $activityRepository;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
similarity index 97%
rename from src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
rename to src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
index 3834bc819..425e15dea 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
similarity index 99%
rename from src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
rename to src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index 773c4bee1..b0112b24c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityRepository;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
similarity index 98%
rename from src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
rename to src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
index 5f02928c6..be1e9d318 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml
index 366c9c1b1..7d6570e07 100644
--- a/src/Bundle/ChillActivityBundle/config/services/export.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml
@@ -4,26 +4,26 @@ services:
         autoconfigure: true
 
     ## Indicators
-    chill.activity.export.count_activity:
-        class: Chill\ActivityBundle\Export\Export\CountActivity
+    chill.activity.export.count_activity_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity
         tags:
-            - { name: chill.export, alias: 'count_activity' }
-    
+            - { name: chill.export, alias: 'count_activity_linked_to_person' }
+
+    chill.activity.export.sum_activity_duration_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration
+        tags:
+            - { name: chill.export, alias: 'sum_activity_duration_linked_to_person' }
+
+    chill.activity.export.list_activity_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity
+        tags:
+            - { name: chill.export, alias: 'list_activity_linked_to_person' }
+
     chill.activity.export.count_activity_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\CountActivityLinkedToACP
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\CountActivity
         tags:
             - { name: chill.export, alias: 'count_activity_linked_to_acp' }
 
-    chill.activity.export.sum_activity_duration:
-        class: Chill\ActivityBundle\Export\Export\StatActivityDuration
-        tags:
-            - { name: chill.export, alias: 'sum_activity_duration' }
-
-    chill.activity.export.list_activity:
-        class: Chill\ActivityBundle\Export\Export\ListActivity
-        tags:
-            - { name: chill.export, alias: 'list_activity' }
-
     ## Filters
     chill.activity.export.reason_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter