diff --git a/config/services.php b/config/services.php
index 8bf37de..1d33603 100644
--- a/config/services.php
+++ b/config/services.php
@@ -65,7 +65,7 @@
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\CachingObjectToObjectMetadataFactory;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\ObjectToObjectMetadataFactory;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\ProxyResolvingObjectToObjectMetadataFactory;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessor\DefaultObjectProcessorFactory;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessor\DefaultObjectProcessorFactory;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\CachingTransformerRegistry;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
 use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
diff --git a/src/MapperFactory.php b/src/MapperFactory.php
index d8e894b..c87a7cc 100644
--- a/src/MapperFactory.php
+++ b/src/MapperFactory.php
@@ -66,9 +66,9 @@
 use Rekalogika\Mapper\Transformer\Implementation\TraversableToTraversableTransformer;
 use Rekalogika\Mapper\Transformer\MetadataUtil\MetadataUtilLocator;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadataFactoryInterface;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessor\DefaultObjectProcessorFactory;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessorFactoryInterface;
 use Rekalogika\Mapper\Transformer\TransformerInterface;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessor\DefaultObjectProcessorFactory;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorFactoryInterface;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
 use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface;
 use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
diff --git a/src/Transformer/Implementation/ObjectToObjectTransformer.php b/src/Transformer/Implementation/ObjectToObjectTransformer.php
index 04ce5bf..9aef8c8 100644
--- a/src/Transformer/Implementation/ObjectToObjectTransformer.php
+++ b/src/Transformer/Implementation/ObjectToObjectTransformer.php
@@ -22,9 +22,9 @@
 use Rekalogika\Mapper\Transformer\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\MainTransformerAwareTrait;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadataFactoryInterface;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessorFactoryInterface;
 use Rekalogika\Mapper\Transformer\TransformerInterface;
 use Rekalogika\Mapper\Transformer\TypeMapping;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorFactoryInterface;
 use Rekalogika\Mapper\Util\TypeFactory;
 use Symfony\Component\PropertyInfo\Type;
 
diff --git a/src/TransformerProcessor/ObjectProcessor/DefaultObjectProcessorFactory.php b/src/Transformer/Processor/ObjectProcessor/DefaultObjectProcessorFactory.php
similarity index 88%
rename from src/TransformerProcessor/ObjectProcessor/DefaultObjectProcessorFactory.php
rename to src/Transformer/Processor/ObjectProcessor/DefaultObjectProcessorFactory.php
index 427e6aa..5253407 100644
--- a/src/TransformerProcessor/ObjectProcessor/DefaultObjectProcessorFactory.php
+++ b/src/Transformer/Processor/ObjectProcessor/DefaultObjectProcessorFactory.php
@@ -11,15 +11,15 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerProcessor\ObjectProcessor;
+namespace Rekalogika\Mapper\Transformer\Processor\ObjectProcessor;
 
 use Psr\Container\ContainerInterface;
 use Rekalogika\Mapper\Proxy\ProxyFactoryInterface;
 use Rekalogika\Mapper\SubMapper\SubMapperFactoryInterface;
 use Rekalogika\Mapper\Transformer\MainTransformerAwareTrait;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadata;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorFactoryInterface;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorInterface;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessorFactoryInterface;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessorInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 
 /**
diff --git a/src/TransformerProcessor/ObjectProcessor/ObjectProcessor.php b/src/Transformer/Processor/ObjectProcessor/ObjectProcessor.php
similarity index 99%
rename from src/TransformerProcessor/ObjectProcessor/ObjectProcessor.php
rename to src/Transformer/Processor/ObjectProcessor/ObjectProcessor.php
index c04b63c..c009732 100644
--- a/src/TransformerProcessor/ObjectProcessor/ObjectProcessor.php
+++ b/src/Transformer/Processor/ObjectProcessor/ObjectProcessor.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerProcessor\ObjectProcessor;
+namespace Rekalogika\Mapper\Transformer\Processor\ObjectProcessor;
 
 use Psr\Container\ContainerInterface;
 use Rekalogika\Mapper\Context\Context;
@@ -38,7 +38,7 @@
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ReadMode;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Visibility;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\WriteMode;
-use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorInterface;
+use Rekalogika\Mapper\Transformer\Processor\ObjectProcessorInterface;
 use Rekalogika\Mapper\Util\TypeFactory;
 use Rekalogika\Mapper\Util\TypeGuesser;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
diff --git a/src/TransformerProcessor/ObjectProcessorFactoryInterface.php b/src/Transformer/Processor/ObjectProcessorFactoryInterface.php
similarity index 92%
rename from src/TransformerProcessor/ObjectProcessorFactoryInterface.php
rename to src/Transformer/Processor/ObjectProcessorFactoryInterface.php
index 13a2fd8..f28093c 100644
--- a/src/TransformerProcessor/ObjectProcessorFactoryInterface.php
+++ b/src/Transformer/Processor/ObjectProcessorFactoryInterface.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerProcessor;
+namespace Rekalogika\Mapper\Transformer\Processor;
 
 use Rekalogika\Mapper\Transformer\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadata;
diff --git a/src/TransformerProcessor/ObjectProcessorInterface.php b/src/Transformer/Processor/ObjectProcessorInterface.php
similarity index 91%
rename from src/TransformerProcessor/ObjectProcessorInterface.php
rename to src/Transformer/Processor/ObjectProcessorInterface.php
index 382894c..70fb0f1 100644
--- a/src/TransformerProcessor/ObjectProcessorInterface.php
+++ b/src/Transformer/Processor/ObjectProcessorInterface.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerProcessor;
+namespace Rekalogika\Mapper\Transformer\Processor;
 
 use Rekalogika\Mapper\Context\Context;
 use Symfony\Component\PropertyInfo\Type;