diff --git a/src/Domain/Invoice/Aggregate/ValueObject/Address.php b/src/Domain/Invoice/Aggregate/Invoice/Address.php
similarity index 93%
rename from src/Domain/Invoice/Aggregate/ValueObject/Address.php
rename to src/Domain/Invoice/Aggregate/Invoice/Address.php
index 12ba75c..8f6af38 100644
--- a/src/Domain/Invoice/Aggregate/ValueObject/Address.php
+++ b/src/Domain/Invoice/Aggregate/Invoice/Address.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject;
+namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
 
 final readonly class Address {
     public function __construct(
diff --git a/src/Domain/Invoice/Aggregate/Invoice.php b/src/Domain/Invoice/Aggregate/Invoice/Invoice.php
similarity index 92%
rename from src/Domain/Invoice/Aggregate/Invoice.php
rename to src/Domain/Invoice/Aggregate/Invoice/Invoice.php
index c325f3c..d095923 100644
--- a/src/Domain/Invoice/Aggregate/Invoice.php
+++ b/src/Domain/Invoice/Aggregate/Invoice/Invoice.php
@@ -9,10 +9,9 @@
  */
 declare(strict_types=1);
 
-namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate;
+namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
 
 use Singularity\HDK\Pay\Domain\AggregateRoot;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject\Address;
 
 final class Invoice extends AggregateRoot
 {
diff --git a/src/Domain/Invoice/Aggregate/ValueObject/InvoiceProduct.php b/src/Domain/Invoice/Aggregate/Invoice/InvoiceProduct.php
similarity index 85%
rename from src/Domain/Invoice/Aggregate/ValueObject/InvoiceProduct.php
rename to src/Domain/Invoice/Aggregate/Invoice/InvoiceProduct.php
index b0a7997..4409dbf 100644
--- a/src/Domain/Invoice/Aggregate/ValueObject/InvoiceProduct.php
+++ b/src/Domain/Invoice/Aggregate/Invoice/InvoiceProduct.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject;
+namespace Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
 
 final readonly class InvoiceProduct {
     public function __construct(
diff --git a/src/Domain/Invoice/Repository/InvoiceProductRepoInterface.php b/src/Domain/Invoice/Repository/InvoiceProductRepoInterface.php
index d013dbc..4d2b5b4 100644
--- a/src/Domain/Invoice/Repository/InvoiceProductRepoInterface.php
+++ b/src/Domain/Invoice/Repository/InvoiceProductRepoInterface.php
@@ -9,7 +9,7 @@
 
 namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
 
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject\InvoiceProduct;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
 
 interface InvoiceProductRepoInterface
 {
diff --git a/src/Domain/Invoice/Repository/InvoiceRepoInterface.php b/src/Domain/Invoice/Repository/InvoiceRepoInterface.php
index ef2d26a..ce1df28 100644
--- a/src/Domain/Invoice/Repository/InvoiceRepoInterface.php
+++ b/src/Domain/Invoice/Repository/InvoiceRepoInterface.php
@@ -10,7 +10,7 @@
 namespace Singularity\HDK\Pay\Domain\Invoice\Repository;
 
 use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
 
 interface InvoiceRepoInterface
 {
diff --git a/src/Infrastructure/Repository/InvoiceProductRepo.php b/src/Infrastructure/Repository/InvoiceProductRepo.php
index 443c826..dc6f634 100644
--- a/src/Infrastructure/Repository/InvoiceProductRepo.php
+++ b/src/Infrastructure/Repository/InvoiceProductRepo.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Singularity\HDK\Pay\Infrastructure\Repository;
 
 use Hyperf\Codec\Json;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject\InvoiceProduct;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
 use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceProductRepoInterface;
 
 final class InvoiceProductRepo extends AbstractRepo implements InvoiceProductRepoInterface
diff --git a/src/Infrastructure/Repository/InvoiceRepo.php b/src/Infrastructure/Repository/InvoiceRepo.php
index 111b928..e0105d1 100644
--- a/src/Infrastructure/Repository/InvoiceRepo.php
+++ b/src/Infrastructure/Repository/InvoiceRepo.php
@@ -13,8 +13,8 @@ namespace Singularity\HDK\Pay\Infrastructure\Repository;
 
 use Hyperf\Codec\Json;
 use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject\Address;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Address;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
 use Singularity\HDK\Pay\Domain\Invoice\Repository\InvoiceRepoInterface;
 
 final class InvoiceRepo extends AbstractRepo implements InvoiceRepoInterface
diff --git a/tests/Feature/Invoice/CreateInvoiceTest.php b/tests/Feature/Invoice/CreateInvoiceTest.php
index 678b7b8..0d78bb5 100644
--- a/tests/Feature/Invoice/CreateInvoiceTest.php
+++ b/tests/Feature/Invoice/CreateInvoiceTest.php
@@ -9,7 +9,7 @@
  */
 
 use Singularity\HDK\Pay\Application\Command\CreateInvoiceCmd;
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\Invoice;
 use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceRepo;
 
 use function Hyperf\Support\make;
diff --git a/tests/Feature/Invoice/QueryCaseInvoiceProductTest.php b/tests/Feature/Invoice/QueryCaseInvoiceProductTest.php
index fae13ba..16e1caf 100644
--- a/tests/Feature/Invoice/QueryCaseInvoiceProductTest.php
+++ b/tests/Feature/Invoice/QueryCaseInvoiceProductTest.php
@@ -9,7 +9,7 @@
  */
 
 
-use Singularity\HDK\Pay\Domain\Invoice\Aggregate\ValueObject\InvoiceProduct;
+use Singularity\HDK\Pay\Domain\Invoice\Aggregate\Invoice\InvoiceProduct;
 use Singularity\HDK\Pay\Infrastructure\Repository\InvoiceProductRepo;
 
 use function Hyperf\Support\make;