diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserJobFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
index 72dd39a0f..e3b63ff67 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserScopeFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
index aaa38f420..939a1368e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/CurrentUserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
 use Chill\MainBundle\Entity\Scope;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 7dd2a683d..4756f06c2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/GeographicalUnitStatFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index c06325265..f47cc2ee1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/RequestorFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index ca2173e5a..180775f01 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
index 76de0258f..5a7b6c8d5 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
@@ -17,14 +17,14 @@ services:
 
     ## Filters
     chill.person.export.filter_current_userscope:
-        class: Chill\PersonBundle\Export\Filter\CurrentUserScopeFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\CurrentUserScopeFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_current_userscope_filter }
 
     chill.person.export.filter_current_userjob:
-        class: Chill\PersonBundle\Export\Filter\CurrentUserJobFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\CurrentUserJobFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -45,7 +45,7 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
 
     chill.person.export.filter_geographicalunitstat:
-        class: Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -59,7 +59,7 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_socialaction_filter }
 
     chill.person.export.filter_evaluation:
-        class: Chill\PersonBundle\Export\Filter\EvaluationFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EvaluationFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -94,7 +94,7 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_administrative_location_filter }
 
     chill.person.export.filter_requestor:
-        class: Chill\PersonBundle\Export\Filter\RequestorFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\RequestorFilter
         autowire: true
         autoconfigure: true
         tags: