diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 92279be2d..6983f6c0e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index 406e99152..ec371d6c2 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Goal;
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
-use App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 1fd6c8734..9e6dcbaa6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Entity\SocialWork;
 
-use App\Repository\Chill\PersonBundle\Entity\SocialWork\EvaluationRepository;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index adf59d203..c92e9a736 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Entity\SocialWork;
 
-use App\Repository\Chill\PersonBundle\Entity\SocialWork\GoalRepository;
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index 5eb3224bc..be38b1757 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Entity\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
-use App\Repository\Chill\PersonBundle\Entity\SocialWork\ResultRepository;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index 690764f39..64413d987 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Entity\SocialWork;
 
-use App\Repository\Chill\PersonBundle\Entity\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index d7817de16..cfec01751 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -1,8 +1,8 @@
 <?php
+namespace Chill\PersonBundle\Entity\SocialWork;
 
-namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use App\Repository\Chill\PersonBundle\Entity\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
index 52119cc55..fc8233d23 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
-use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 52ecb8620..f879e97d7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
-use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index 241f8e7e9..b030e1617 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Repository\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index 87100d0de..031c31764 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Repository\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 11c436da3..511823d61 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Repository\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index 32affaa50..f0f2e81b4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Repository\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 3349f6d00..e64b057f4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
+namespace Chill\PersonBundle\Repository\SocialWork;
 
-use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;