diff --git a/src/MapperFactory.php b/src/MapperFactory/MapperFactory.php
similarity index 99%
rename from src/MapperFactory.php
rename to src/MapperFactory/MapperFactory.php
index 4d55ab2..ad2c9f6 100644
--- a/src/MapperFactory.php
+++ b/src/MapperFactory/MapperFactory.php
@@ -11,16 +11,18 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper;
+namespace Rekalogika\Mapper\MapperFactory;
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Container\ContainerInterface;
 use Rekalogika\Mapper\Command\MappingCommand;
 use Rekalogika\Mapper\Command\TryCommand;
 use Rekalogika\Mapper\Contracts\TransformerInterface;
+use Rekalogika\Mapper\MainTransformer;
+use Rekalogika\Mapper\Mapper;
+use Rekalogika\Mapper\MapperInterface;
 use Rekalogika\Mapper\Mapping\MappingFactory;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
-use Rekalogika\Mapper\Model\ServiceLocator;
 use Rekalogika\Mapper\ObjectCache\ObjectCacheFactory;
 use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface;
 use Rekalogika\Mapper\Transformer\ArrayToObjectTransformer;
diff --git a/src/Model/ServiceLocator.php b/src/MapperFactory/ServiceLocator.php
similarity index 95%
rename from src/Model/ServiceLocator.php
rename to src/MapperFactory/ServiceLocator.php
index 40df1eb..e894095 100644
--- a/src/Model/ServiceLocator.php
+++ b/src/MapperFactory/ServiceLocator.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Model;
+namespace Rekalogika\Mapper\MapperFactory;
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
diff --git a/tests/Common/MapperTestFactory.php b/tests/Common/MapperTestFactory.php
index a9a5868..914a474 100644
--- a/tests/Common/MapperTestFactory.php
+++ b/tests/Common/MapperTestFactory.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Tests\Common;
 
 use Rekalogika\Mapper\MainTransformer;
-use Rekalogika\Mapper\MapperFactory;
+use Rekalogika\Mapper\MapperFactory\MapperFactory;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;