diff --git a/msgphp/eav-bundle/0.2/config/packages/msgphp_eav.php b/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php
similarity index 55%
rename from msgphp/eav-bundle/0.2/config/packages/msgphp_eav.php
rename to msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php
index 7af6ad69..7ff6ab19 100644
--- a/msgphp/eav-bundle/0.2/config/packages/msgphp_eav.php
+++ b/msgphp/eav-bundle/0.10/config/packages/msgphp_eav.php
@@ -1,13 +1,14 @@
 <?php
 
-use MsgPhp\Eav\Entity\{Attribute, AttributeValue};
+use MsgPhp\Eav\Attribute;
+use MsgPhp\Eav\AttributeValue;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container) {
     $container->extension('msgphp_eav', [
         'class_mapping' => [
-            Attribute::class => \App\Entity\Eav\Attribute::class,
-            AttributeValue::class => \App\Entity\Eav\AttributeValue::class,
+            Attribute::class => \App\Entity\Attribute::class,
+            AttributeValue::class => \App\Entity\AttributeValue::class,
         ],
     ]);
 };
diff --git a/msgphp/eav-bundle/0.2/manifest.json b/msgphp/eav-bundle/0.10/manifest.json
similarity index 100%
rename from msgphp/eav-bundle/0.2/manifest.json
rename to msgphp/eav-bundle/0.10/manifest.json
diff --git a/msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php b/msgphp/eav-bundle/0.10/src/Entity/Attribute.php
similarity index 57%
rename from msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php
rename to msgphp/eav-bundle/0.10/src/Entity/Attribute.php
index 6fd4a6e7..11520cfb 100644
--- a/msgphp/eav-bundle/0.2/src/Entity/Eav/Attribute.php
+++ b/msgphp/eav-bundle/0.10/src/Entity/Attribute.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Entity\Eav;
+namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use MsgPhp\Eav\AttributeIdInterface;
-use MsgPhp\Eav\Entity\Attribute as BaseAttribute;
+use MsgPhp\Eav\Attribute as BaseAttribute;
+use MsgPhp\Eav\AttributeId;
 
 /**
  * @ORM\Entity()
@@ -14,12 +14,12 @@ class Attribute extends BaseAttribute
     /** @ORM\Id() @ORM\GeneratedValue() @ORM\Column(type="msgphp_attribute_id", length=191) */
     private $id;
 
-    public function __construct(AttributeIdInterface $id)
+    public function __construct(AttributeId $id)
     {
         $this->id = $id;
     }
 
-    public function getId(): AttributeIdInterface
+    public function getId(): AttributeId
     {
         return $this->id;
     }
diff --git a/msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php b/msgphp/eav-bundle/0.10/src/Entity/AttributeValue.php
similarity index 56%
rename from msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php
rename to msgphp/eav-bundle/0.10/src/Entity/AttributeValue.php
index 2534e028..4ab70f8b 100644
--- a/msgphp/eav-bundle/0.2/src/Entity/Eav/AttributeValue.php
+++ b/msgphp/eav-bundle/0.10/src/Entity/AttributeValue.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Entity\Eav;
+namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use MsgPhp\Eav\AttributeValueIdInterface;
-use MsgPhp\Eav\Entity\AttributeValue as BaseAttributeValue;
+use MsgPhp\Eav\AttributeValue as BaseAttributeValue;
+use MsgPhp\Eav\AttributeValueId;
 
 /**
  * @ORM\Entity()
@@ -14,14 +14,14 @@ class AttributeValue extends BaseAttributeValue
     /** @ORM\Id() @ORM\GeneratedValue() @ORM\Column(type="msgphp_attribute_value_id", length=191) */
     private $id;
 
-    public function __construct(AttributeValueIdInterface $id, Attribute $attribute, $value)
+    public function __construct(AttributeValueId $id, Attribute $attribute, $value)
     {
         parent::__construct($attribute, $value);
 
         $this->id = $id;
     }
 
-    public function getId(): AttributeValueIdInterface
+    public function getId(): AttributeValueId
     {
         return $this->id;
     }
diff --git a/msgphp/user-bundle/0.6/config/packages/msgphp_user.php b/msgphp/user-bundle/0.10/config/packages/msgphp_user.php
similarity index 91%
rename from msgphp/user-bundle/0.6/config/packages/msgphp_user.php
rename to msgphp/user-bundle/0.10/config/packages/msgphp_user.php
index e1f3f0bc..5fc58ec8 100644
--- a/msgphp/user-bundle/0.6/config/packages/msgphp_user.php
+++ b/msgphp/user-bundle/0.10/config/packages/msgphp_user.php
@@ -1,6 +1,6 @@
 <?php
 
-use MsgPhp\User\Entity\User;
+use MsgPhp\User\User;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return function (ContainerConfigurator $container) {
diff --git a/msgphp/user-bundle/0.6/manifest.json b/msgphp/user-bundle/0.10/manifest.json
similarity index 100%
rename from msgphp/user-bundle/0.6/manifest.json
rename to msgphp/user-bundle/0.10/manifest.json
diff --git a/msgphp/user-bundle/0.6/post-install.txt b/msgphp/user-bundle/0.10/post-install.txt
similarity index 100%
rename from msgphp/user-bundle/0.6/post-install.txt
rename to msgphp/user-bundle/0.10/post-install.txt
diff --git a/msgphp/user-bundle/0.6/src/Entity/User/User.php b/msgphp/user-bundle/0.10/src/Entity/User.php
similarity index 64%
rename from msgphp/user-bundle/0.6/src/Entity/User/User.php
rename to msgphp/user-bundle/0.10/src/Entity/User.php
index bf8b4951..21ed3941 100644
--- a/msgphp/user-bundle/0.6/src/Entity/User/User.php
+++ b/msgphp/user-bundle/0.10/src/Entity/User.php
@@ -3,8 +3,8 @@
 namespace App\Entity\User;
 
 use Doctrine\ORM\Mapping as ORM;
-use MsgPhp\User\Entity\User as BaseUser;
-use MsgPhp\User\UserIdInterface;
+use MsgPhp\User\User as BaseUser;
+use MsgPhp\User\UserId;
 
 /**
  * @ORM\Entity()
@@ -14,12 +14,12 @@ class User extends BaseUser
     /** @ORM\Id() @ORM\GeneratedValue() @ORM\Column(type="msgphp_user_id", length=191) */
     private $id;
 
-    public function __construct(UserIdInterface $id)
+    public function __construct(UserId $id)
     {
         $this->id = $id;
     }
 
-    public function getId(): UserIdInterface
+    public function getId(): UserId
     {
         return $this->id;
     }