diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommand.cs b/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommand.cs
index e0728b6bd..821b6d9f7 100644
--- a/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommand.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommand.cs
@@ -6,10 +6,15 @@
     using System.Collections;
     using System.Collections.Generic;
 
+    //(CDLTLL) TO DO: This is wrong, we must NOT use a child-entity class within a Command class!!
+    //Need to create a different DTO class, like OrderLineDTO or similar...
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
+
     public class NewOrderCommand
         :IAsyncRequest<bool>
     {
-
+        //(CDLTLL) TO DO: This is wrong, we must NOT use a child-entity class within a Command class!!
+        //Need to create a different DTO class, like OrderLineDTO or similar...
         private readonly List<OrderItem> _orderItems;
         public string City { get; set; }
 
diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommandHandler.cs b/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommandHandler.cs
index 4a55f7acd..0ea029c93 100644
--- a/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommandHandler.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Commands/NewOrderCommandHandler.cs
@@ -1,6 +1,8 @@
 namespace Microsoft.eShopOnContainers.Services.Ordering.Api.Application.Commands
 {
-    using Domain.Repositories;
+    using Domain.RepositoryContracts;
+    using Domain.AggregatesModel.OrderAggregate;
+    using Domain.AggregatesModel.BuyerAggregate;
     using MediatR;
     using System.Linq;
     using System;
@@ -84,7 +86,7 @@
 
         }
 
-        Payment PaymentAlreadyExist(Domain.Buyer buyer, NewOrderCommand message)
+        Payment PaymentAlreadyExist(Buyer buyer, NewOrderCommand message)
         {
             return buyer.Payments
                 .SingleOrDefault(p =>
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/ApplicationModule.cs b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/ApplicationModule.cs
index 327651329..0d72b11c0 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/ApplicationModule.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/ApplicationModule.cs
@@ -4,7 +4,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Autof
 {
     using Api.Application.Queries;
     using Autofac;
-    using Domain.Repositories;
+    using Domain.RepositoryContracts;
     using Ordering.Infrastructure.Repositories;
 
     public class ApplicationModule
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs b/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
index 017bb2aaa..de3294df7 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/OrderingContextSeed.cs
@@ -6,6 +6,8 @@
     using Ordering.Infrastructure;
     using System.Linq;
     using System.Threading.Tasks;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 
     public class OrderingContextSeed
     {
diff --git a/src/Services/Ordering/Ordering.Domain/Buyer.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
similarity index 95%
rename from src/Services/Ordering/Ordering.Domain/Buyer.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
index 58634f342..543fb2755 100644
--- a/src/Services/Ordering/Ordering.Domain/Buyer.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
     using System;
diff --git a/src/Services/Ordering/Ordering.Domain/CardType.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
similarity index 94%
rename from src/Services/Ordering/Ordering.Domain/CardType.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
index b05357292..dc5cfe6f6 100644
--- a/src/Services/Ordering/Ordering.Domain/CardType.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
@@ -1,6 +1,6 @@
 
 
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
     using System;
diff --git a/src/Services/Ordering/Ordering.Domain/Payment.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Payment.cs
similarity index 98%
rename from src/Services/Ordering/Ordering.Domain/Payment.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Payment.cs
index 546b3482f..83a71bb9a 100644
--- a/src/Services/Ordering/Ordering.Domain/Payment.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Payment.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
     using System;
diff --git a/src/Services/Ordering/Ordering.Domain/Address.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
similarity index 94%
rename from src/Services/Ordering/Ordering.Domain/Address.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
index 17812a0b0..9d36bcc17 100644
--- a/src/Services/Ordering/Ordering.Domain/Address.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Address.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
     using System;
diff --git a/src/Services/Ordering/Ordering.Domain/Order.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
similarity index 93%
rename from src/Services/Ordering/Ordering.Domain/Order.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
index c62f5cc9b..b86ff9e57 100644
--- a/src/Services/Ordering/Ordering.Domain/Order.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
@@ -1,6 +1,7 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
     using System;
     using System.Collections.Generic;
 
diff --git a/src/Services/Ordering/Ordering.Domain/OrderItem.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderItem.cs
similarity index 94%
rename from src/Services/Ordering/Ordering.Domain/OrderItem.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderItem.cs
index c305f0e03..53f31a16a 100644
--- a/src/Services/Ordering/Ordering.Domain/OrderItem.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderItem.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
 
diff --git a/src/Services/Ordering/Ordering.Domain/OrderStatus.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
similarity index 98%
rename from src/Services/Ordering/Ordering.Domain/OrderStatus.cs
rename to src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
index e337da6f7..011984e62 100644
--- a/src/Services/Ordering/Ordering.Domain/OrderStatus.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate
 {
     using SeedWork;
     using System;
diff --git a/src/Services/Ordering/Ordering.Domain/Repositories/IBuyerRepository.cs b/src/Services/Ordering/Ordering.Domain/RepositoryContracts/IBuyerRepository.cs
similarity index 74%
rename from src/Services/Ordering/Ordering.Domain/Repositories/IBuyerRepository.cs
rename to src/Services/Ordering/Ordering.Domain/RepositoryContracts/IBuyerRepository.cs
index 5e41b7af6..027f26f0c 100644
--- a/src/Services/Ordering/Ordering.Domain/Repositories/IBuyerRepository.cs
+++ b/src/Services/Ordering/Ordering.Domain/RepositoryContracts/IBuyerRepository.cs
@@ -1,7 +1,8 @@
 using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
+using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.Repositories
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.RepositoryContracts
 {
     public interface IBuyerRepository
         :IRepository
diff --git a/src/Services/Ordering/Ordering.Domain/Repositories/IOrderRepository.cs b/src/Services/Ordering/Ordering.Domain/RepositoryContracts/IOrderRepository.cs
similarity index 67%
rename from src/Services/Ordering/Ordering.Domain/Repositories/IOrderRepository.cs
rename to src/Services/Ordering/Ordering.Domain/RepositoryContracts/IOrderRepository.cs
index 0648b00c5..f77ee094e 100644
--- a/src/Services/Ordering/Ordering.Domain/Repositories/IOrderRepository.cs
+++ b/src/Services/Ordering/Ordering.Domain/RepositoryContracts/IOrderRepository.cs
@@ -1,6 +1,7 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.Repositories
+namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.RepositoryContracts
 {
     using Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 
     public interface IOrderRepository
         :IRepository
diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
index 67929d4b0..2a3c39dbb 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
@@ -7,6 +7,8 @@
     using Microsoft.EntityFrameworkCore;
     using Microsoft.EntityFrameworkCore.Metadata.Builders;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
 
     public class OrderingContext
        : DbContext,IUnitOfWork
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
index 3a1f75c0d..9428bc96b 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs
@@ -3,7 +3,8 @@
     using Domain.SeedWork;
     using Microsoft.EntityFrameworkCore;
     using Microsoft.eShopOnContainers.Services.Ordering.Domain;
-    using Microsoft.eShopOnContainers.Services.Ordering.Domain.Repositories;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.RepositoryContracts;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.BuyerAggregate;
     using System;
     using System.Linq;
     using System.Threading.Tasks;
diff --git a/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs b/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
index 94f48d9aa..3a684b693 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs
@@ -2,7 +2,8 @@
 {
     using Domain;
     using Domain.SeedWork;
-    using Microsoft.eShopOnContainers.Services.Ordering.Domain.Repositories;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.RepositoryContracts;
+    using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
     using System;
 
     public class OrderRepository