diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/config/services.yml b/src/Skobkin/Bundle/PointToolsBundle/Resources/config/services.yml
index 1ea58a6..931fb16 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Resources/config/services.yml
+++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/config/services.yml
@@ -30,13 +30,13 @@ services:
         arguments: [ @doctrine.orm.entity_manager ]
 
     skobkin__point_tools.service_factory.comment_factory:
-        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\CommentFactory
+        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs\CommentFactory
         arguments: [ @doctrine.orm.entity_manager, @skobkin__point_tools.service_factory.user_factory ]
 
     skobkin__point_tools.service_factory.tag_factory:
-        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\TagFactory
+        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs\TagFactory
         arguments: [ @doctrine.orm.entity_manager ]
 
     skobkin__point_tools.service_factory.post_factory:
-        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\PostFactory
+        class: Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs\PostFactory
         arguments: [ @doctrine.orm.entity_manager, @skobkin__point_tools.service_factory.user_factory, @skobkin__point_tools.service_factory.comment_factory, @skobkin__point_tools.service_factory.tag_factory ]
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/CommentFactory.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/CommentFactory.php
similarity index 96%
rename from src/Skobkin/Bundle/PointToolsBundle/Service/Factory/CommentFactory.php
rename to src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/CommentFactory.php
index be52247..b86b104 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/CommentFactory.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/CommentFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Service\Factory;
+namespace Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -9,6 +9,7 @@ use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Comment;
 use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Post;
 use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\ApiException;
 use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\InvalidResponseException;
+use Skobkin\Bundle\PointToolsBundle\Service\Factory\UserFactory;
 
 
 class CommentFactory
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/PostFactory.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/PostFactory.php
similarity index 96%
rename from src/Skobkin/Bundle/PointToolsBundle/Service/Factory/PostFactory.php
rename to src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/PostFactory.php
index 3ed1732..d0e5e45 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/PostFactory.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/PostFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Service\Factory;
+namespace Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -8,6 +8,7 @@ use Doctrine\ORM\EntityRepository;
 use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Post;
 use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\ApiException;
 use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\InvalidResponseException;
+use Skobkin\Bundle\PointToolsBundle\Service\Factory\UserFactory;
 
 
 class PostFactory
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/TagFactory.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/TagFactory.php
similarity index 97%
rename from src/Skobkin/Bundle/PointToolsBundle/Service/Factory/TagFactory.php
rename to src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/TagFactory.php
index ce49a24..2d74cbc 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/TagFactory.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Factory/Blogs/TagFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Skobkin\Bundle\PointToolsBundle\Service\Factory;
+namespace Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/PostApi.php b/src/Skobkin/Bundle/PointToolsBundle/Service/PostApi.php
index 7eb214b..ca088e2 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Service/PostApi.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/PostApi.php
@@ -4,7 +4,7 @@ namespace Skobkin\Bundle\PointToolsBundle\Service;
 
 use Guzzle\Service\Client;
 use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Post;
-use Skobkin\Bundle\PointToolsBundle\Service\Factory\PostFactory;
+use Skobkin\Bundle\PointToolsBundle\Service\Factory\Blogs\PostFactory;
 
 /**
  * Basic Point.im user API functions from /api/post