diff --git a/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php b/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php
index 4a78cc9..e622303 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Controller/UserController.php
@@ -3,7 +3,7 @@
 namespace Skobkin\Bundle\PointToolsBundle\Controller;
 
 use Doctrine\ORM\EntityManager;
-use Skobkin\Bundle\PointToolsBundle\Entity\TopUserDTO;
+use Skobkin\Bundle\PointToolsBundle\DTO\TopUserDTO;
 use Skobkin\Bundle\PointToolsBundle\Entity\User;
 use Skobkin\Bundle\PointToolsBundle\Service\UserApi;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/TopUserDTO.php b/src/Skobkin/Bundle/PointToolsBundle/DTO/TopUserDTO.php
similarity index 87%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/TopUserDTO.php
rename to src/Skobkin/Bundle/PointToolsBundle/DTO/TopUserDTO.php
index 5e2545c..ca1f126 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/TopUserDTO.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/DTO/TopUserDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity;
+namespace Skobkin\Bundle\PointToolsBundle\DTO;
 
 /**
  * Data Transfer Object for top users list
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Post.php b/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Post.php
index 8c98d97..e61eb48 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Post.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Post.php
@@ -14,7 +14,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  *      @ORM\Index(name="idx_post_created_at", columns={"created_at"}),
  *      @ORM\Index(name="idx_post_private", columns={"private"}),
  * })
- * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Entity\Blogs\PostRepository")
+ * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Repository\Blogs\PostRepository")
  */
 class Post
 {
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Tag.php b/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Tag.php
index 0cd1b56..3757ffb 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Tag.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/Tag.php
@@ -11,7 +11,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Table(name="posts.tags", schema="posts", indexes={
  *      @ORM\Index(name="idx_tag_text", columns={"text"})
  * })
- * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Entity\Blogs\TagRepository")
+ * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Repository\Blogs\TagRepository")
  */
 class Tag
 {
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/Subscription.php b/src/Skobkin/Bundle/PointToolsBundle/Entity/Subscription.php
index dfd4c31..19ea360 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/Subscription.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Entity/Subscription.php
@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(name="subscriptions.subscriptions", schema="subscriptions", uniqueConstraints={
  *      @ORM\UniqueConstraint(name="subscription_unique", columns={"author_id", "subscriber_id"})}
  * )
- * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Entity\SubscriptionRepository")
+ * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Repository\SubscriptionRepository")
  */
 class Subscription
 {
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEvent.php b/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEvent.php
index 22c4a4e..c04e55a 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEvent.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEvent.php
@@ -12,7 +12,7 @@ use Doctrine\ORM\Mapping as ORM;
  *      @ORM\Index(name="subscriber_idx", columns={"subscriber_id"}),
  *      @ORM\Index(name="date_idx", columns={"date"})
  * })
- * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Entity\SubscriptionEventRepository")
+ * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Repository\SubscriptionEventRepository")
  * @ORM\HasLifecycleCallbacks
  */
 class SubscriptionEvent
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/User.php b/src/Skobkin/Bundle/PointToolsBundle/Entity/User.php
index 038dee0..20f3dd6 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/User.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Entity/User.php
@@ -9,7 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
  * User
  *
  * @ORM\Table(name="users.users", schema="users")
- * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Entity\UserRepository")
+ * @ORM\Entity(repositoryClass="Skobkin\Bundle\PointToolsBundle\Repository\UserRepository")
  * @ORM\HasLifecycleCallbacks
  */
 class User
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/PostRepository.php b/src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/PostRepository.php
similarity index 61%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/PostRepository.php
rename to src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/PostRepository.php
index 14429bc..83ca10a 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/PostRepository.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/PostRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity\Blogs;
+namespace Skobkin\Bundle\PointToolsBundle\Repository\Blogs;
 
 use Doctrine\ORM\EntityRepository;
 
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/TagRepository.php b/src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/TagRepository.php
similarity index 83%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/TagRepository.php
rename to src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/TagRepository.php
index 232ee13..a264046 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/Blogs/TagRepository.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Repository/Blogs/TagRepository.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity\Blogs;
+namespace Skobkin\Bundle\PointToolsBundle\Repository\Blogs;
 
 use Doctrine\ORM\EntityRepository;
+use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Tag;
 
 class TagRepository extends EntityRepository
 {
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEventRepository.php b/src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionEventRepository.php
similarity index 92%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEventRepository.php
rename to src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionEventRepository.php
index b12332c..7f88194 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionEventRepository.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionEventRepository.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity;
+namespace Skobkin\Bundle\PointToolsBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Skobkin\Bundle\PointToolsBundle\Entity\SubscriptionEvent;
+use Skobkin\Bundle\PointToolsBundle\Entity\User;
 
 class SubscriptionEventRepository extends EntityRepository
 {
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionRepository.php b/src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionRepository.php
similarity index 91%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionRepository.php
rename to src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionRepository.php
index 3bc7064..bc3ca99 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/SubscriptionRepository.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Repository/SubscriptionRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity;
+namespace Skobkin\Bundle\PointToolsBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Entity/UserRepository.php b/src/Skobkin/Bundle/PointToolsBundle/Repository/UserRepository.php
similarity index 89%
rename from src/Skobkin/Bundle/PointToolsBundle/Entity/UserRepository.php
rename to src/Skobkin/Bundle/PointToolsBundle/Repository/UserRepository.php
index 3c9db8d..2565fff 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Entity/UserRepository.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Repository/UserRepository.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Entity;
+namespace Skobkin\Bundle\PointToolsBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Skobkin\Bundle\PointToolsBundle\DTO\TopUserDTO;
+use Skobkin\Bundle\PointToolsBundle\Entity\User;
 
 class UserRepository extends EntityRepository
 {
@@ -71,7 +73,7 @@ class UserRepository extends EntityRepository
         $qb = $this->getEntityManager()->getRepository('SkobkinPointToolsBundle:Subscription')->createQueryBuilder('s');
 
         return $qb
-            ->select(['COUNT(s.subscriber) as cnt', 'NEW SkobkinPointToolsBundle:TopUserDTO(a.login, COUNT(s.subscriber))'])
+            ->select(['COUNT(s.subscriber) as cnt', 'NEW Skobkin\Bundle\PointToolsBundle\DTO\TopUserDTO(a.login, COUNT(s.subscriber))'])
             ->innerJoin('s.author', 'a')
             ->orderBy('cnt', 'desc')
             ->groupBy('a.id')