diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
index 04edade32..a8f57e022 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
index 69cb05882..f0ae90f12 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
index fc8da07da..1e0a7082b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Entity\Person;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
index 312416367..b8c9ba166 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/ActionTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/ActionTypeAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
index df6a9f98f..2567ea378 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/ActionTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/GoalAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/GoalAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
index bc26a113d..d3b277a16 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/GoalAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/ResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Aggregator/ResultAggregator.php
rename to src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
index ef5740a00..476b6f840 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/ResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php
index 787bf46d6..373312e2f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-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/AccompanyingPeriodFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php
index 1c658527f..260956db9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-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/AccompanyingPeriodOpeningFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php
index 7d00060f4..f737dfaab 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-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/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ActiveOnDateFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index 0d83bce13..fff38318c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.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/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ActiveOneDayBetweenDatesFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index 0054018d1..91732e83d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.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/ActivityTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ActivityTypeFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php
index f019394d4..7d916a148 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AdministrativeLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AdministrativeLocationFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
index b52a2abe1..d3fde5b91 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AdministrativeLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ClosingMotiveFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index 7ff78d41b..23fce3f40 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.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/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ConfidentialFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index 7e043c131..23286f941 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.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/Export/Filter/EmergencyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/EmergencyFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
index f09d117f4..fc1f3d002 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.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/Export/Filter/IntensityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/IntensityFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
index b55e7f399..c433c724f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/IntensityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.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/Export/Filter/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/OpenBetweenDatesFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index 2c3514f92..20e020784 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.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/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/OriginFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index 936767009..3cda93577 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.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/SocialActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/SocialActionFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
index d421044a2..bf0e5a7a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.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/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/SocialIssueFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index 092982d41..c2f9b1a06 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.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/StepFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/StepFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
index e3fbc19d5..1985031de 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/StepFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AgeFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index 3a6e6861a..386b4f8b0 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -6,10 +6,10 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
+ 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
index d7235a5c2..24ea14d01 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/DeadOrAliveFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index 6f65038bd..aaef76436 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/DeathdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/DeathdateFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
index 2197a93c6..e955a33b9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/DeathdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EntrustedChildFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/EntrustedChildFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/EntrustedChildFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/EntrustedChildFilter.php
index 9d2c81b3c..8d886f146 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EntrustedChildFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/EntrustedChildFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/FamilySituationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php
similarity index 95%
rename from src/Bundle/ChillPersonBundle/Export/Filter/FamilySituationFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php
index 30d67aff5..e1a6c7529 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/FamilySituationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index edc2e3bb5..26c7be868 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
similarity index 97%
rename from src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index 602457024..be7496d7c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/NomadicFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NomadicFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/NomadicFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NomadicFilter.php
index b4ef13c36..19808baab 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/NomadicFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NomadicFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Export/Filter/ResidentialAddressAtUserFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index 14369c7f0..a05e8ef7d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
index 62ad99b97..dbfd01140 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
@@ -2,17 +2,17 @@ services:
 
     ##
     chill.person.export.filter_accompanying_period:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodFilter
         tags:
             - { name: chill.export_filter, alias: person_accc_period_filter }
             
     chill.person.export.filter_accompanying_period_opening:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodOpeningFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodOpeningFilter
         tags:
             - { name: chill.export_filter, alias: person_acc_pe_op_filter }
             
     chill.person.export.filter_accompanying_period_closing:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodClosingFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodClosingFilter
         tags:
             - { name: chill.export_filter, alias: person_acc_pe_cl_filter }
 
@@ -47,21 +47,21 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_current_userjob_filter }
 
     chill.person.export.filter_socialissue:
-        class: Chill\PersonBundle\Export\Filter\SocialIssueFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter }
 
     chill.person.export.filter_step:
-        class: Chill\PersonBundle\Export\Filter\StepFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
 
     chill.person.export.filter_socialaction:
-        class: Chill\PersonBundle\Export\Filter\SocialActionFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -75,63 +75,63 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_evaluation_filter }
 
     chill.person.export.filter_activitytype:
-        class: Chill\PersonBundle\Export\Filter\ActivityTypeFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActivityTypeFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_activitytype_filter }
 
     chill.person.export.filter_origin:
-        class: Chill\PersonBundle\Export\Filter\OriginFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_origin_filter }
 
     chill.person.export.filter_closingmotive:
-        class: Chill\PersonBundle\Export\Filter\ClosingMotiveFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_closingmotive_filter }
 
     chill.person.export.filter_administrative_location:
-        class: Chill\PersonBundle\Export\Filter\AdministrativeLocationFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_administrative_location_filter }
 
     chill.person.export.filter_confidential:
-        class: Chill\PersonBundle\Export\Filter\ConfidentialFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_confidential_filter }
 
     chill.person.export.filter_emergency:
-        class: Chill\PersonBundle\Export\Filter\EmergencyFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EmergencyFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_emergency_filter }
 
     chill.person.export.filter_intensity:
-        class: Chill\PersonBundle\Export\Filter\IntensityFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_intensity_filter }
 
     chill.person.export.filter_activeondate:
-        class: Chill\PersonBundle\Export\Filter\ActiveOnDateFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_activeondate_filter }
 
     chill.person.export.filter_activeonedaybetweendates:
-        class: Chill\PersonBundle\Export\Filter\ActiveOneDayBetweenDatesFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -145,7 +145,7 @@ services:
             - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter }
 
     chill.person.export.filter_openbetweendates:
-        class: Chill\PersonBundle\Export\Filter\OpenBetweenDatesFilter
+        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter
         autowire: true
         autoconfigure: true
         tags:
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
index 47fb89770..7a68bceba 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
@@ -26,57 +26,57 @@ services:
 
 # FILTERS
     chill.person.export.filter_gender:
-        class: Chill\PersonBundle\Export\Filter\GenderFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_gender_filter }
     
     chill.person.export.filter_age:
-        class: Chill\PersonBundle\Export\Filter\AgeFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\AgeFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_age_filter }
             
     chill.person.export.filter_birthdate:
-        class: Chill\PersonBundle\Export\Filter\BirthdateFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter
         tags:
             - { name: chill.export_filter, alias: person_birthdate_filter }
     
     chill.person.export.filter_deathdate:
-        class: Chill\PersonBundle\Export\Filter\DeathdateFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\DeathdateFilter
         tags:
             - { name: chill.export_filter, alias: person_deathdate_filter }
     
     chill.person.export.filter_dead_or_alive:
-        class: Chill\PersonBundle\Export\Filter\DeadOrAliveFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\DeadOrAliveFilter
         tags:
             - { name: chill.export_filter, alias: person_dead_or_alive_filter }
 
     chill.person.export.filter_nationality:
-        class: Chill\PersonBundle\Export\Filter\NationalityFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\NationalityFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_nationality_filter }
         
     chill.person.export.filter_residential_address_at_user:
-        class: Chill\PersonBundle\Export\Filter\ResidentialAddressAtUserFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtUserFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_residential_address_at_user_filter }
     
     chill.person.export.filter_entrusted_child:
-        class: Chill\PersonBundle\Export\Filter\EntrustedChildFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\EntrustedChildFilter
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_entrusted_child_filter }
     
     chill.person.export.filter_nomadic:
-        class: Chill\PersonBundle\Export\Filter\NomadicFilter
+        class: Chill\PersonBundle\Export\Filter\PersonFilters\NomadicFilter
         autowire: true
         autoconfigure: true
         tags:
@@ -84,28 +84,28 @@ services:
 
 # AGGREGATORS
     chill.person.export.aggregator_nationality:
-        class: Chill\PersonBundle\Export\Aggregator\NationalityAggregator
+        class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_nationality_aggregator }
             
     chill.person.export.aggregator_country_of_birth:
-        class: Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator
+        class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\CountryOfBirthAggregator
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_country_of_birth_aggregator }
             
     chill.person.export.aggregator_gender:
-        class: Chill\PersonBundle\Export\Aggregator\GenderAggregator
+        class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\GenderAggregator
         autowire: true
         autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: person_gender_aggregator }
     
     chill.person.export.aggregator_age:
-        class: Chill\PersonBundle\Export\Aggregator\AgeAggregator
+        class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator
         autowire: true
         autoconfigure: true
         tags:
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
index a274f7ca1..9761302e2 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
@@ -59,21 +59,21 @@ services:
         - { name: chill.export_aggregator, alias: social_work_actions_scope_aggregator }
   
   chill.person.export.aggregator_action_type:
-    class: Chill\PersonBundle\Export\Aggregator\ActionTypeAggregator
+    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator
     autowire: true
     autoconfigure: true
     tags:
         - { name: chill.export_aggregator, alias: social_work_actions_action_type_aggregator }
   
   chill.person.export.aggregator_goal:
-    class: Chill\PersonBundle\Export\Aggregator\GoalAggregator
+    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator
     autowire: true
     autoconfigure: true
     tags:
         - { name: chill.export_aggregator, alias: social_work_actions_goal_aggregator }
   
   chill.person.export.aggregator_result:
-    class: Chill\PersonBundle\Export\Aggregator\ResultAggregator
+    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator
     autowire: true
     autoconfigure: true
     tags: