diff --git a/accounting-service/pom.xml b/accounting-service/pom.xml
index b201d32..c0d56bc 100644
--- a/accounting-service/pom.xml
+++ b/accounting-service/pom.xml
@@ -8,7 +8,7 @@
         <version>2.7.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.microsoft.gbb.rasa</groupId>
+    <groupId>com.microsoft.gbb.reddog</groupId>
     <artifactId>accounting-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>accounting-service</name>
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/AccountingServiceApplication.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/AccountingServiceApplication.java
similarity index 91%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/AccountingServiceApplication.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/AccountingServiceApplication.java
index 835d2c9..2bb336d 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/AccountingServiceApplication.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/AccountingServiceApplication.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice;
+package com.microsoft.gbb.reddog.accountingservice;
 
 import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories;
 import org.springframework.boot.SpringApplication;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosDbConfig.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosDbConfig.java
similarity index 97%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosDbConfig.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosDbConfig.java
index 8c05af8..028671f 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosDbConfig.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosDbConfig.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.config;
+package com.microsoft.gbb.reddog.accountingservice.config;
 
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.DirectConnectionConfig;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosProperties.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosProperties.java
similarity index 92%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosProperties.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosProperties.java
index 3fc5a85..1942b8a 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/CosmosProperties.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/CosmosProperties.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.gbb.rasa.makelineservice.config;
+package com.microsoft.gbb.reddog.accountingservice.config;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/KafkaTopicConfiguration.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/KafkaTopicConfiguration.java
similarity index 96%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/KafkaTopicConfiguration.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/KafkaTopicConfiguration.java
index debe114..5e34eef 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/KafkaTopicConfiguration.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/KafkaTopicConfiguration.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.config;
+package com.microsoft.gbb.reddog.accountingservice.config;
 
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/SwaggerConfig.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/SwaggerConfig.java
similarity index 88%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/SwaggerConfig.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/SwaggerConfig.java
index c49d7df..8850352 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/SwaggerConfig.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.config;
+package com.microsoft.gbb.reddog.accountingservice.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingController.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingController.java
similarity index 86%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingController.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingController.java
index 2dca259..c3d699e 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingController.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingController.java
@@ -1,9 +1,9 @@
-package com.microsoft.gbb.rasa.accountingservice.controller;
+package com.microsoft.gbb.reddog.accountingservice.controller;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.ChartKeyValue;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrdersTimeSeries;
-import com.microsoft.gbb.rasa.accountingservice.service.AccountingService;
+import com.microsoft.gbb.reddog.accountingservice.dto.ChartKeyValue;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrdersTimeSeries;
+import com.microsoft.gbb.reddog.accountingservice.service.AccountingService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/AbstractDto.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/AbstractDto.java
similarity index 86%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/AbstractDto.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/AbstractDto.java
index 094e104..5d0030c 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/AbstractDto.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/AbstractDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/ChartKeyValue.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/ChartKeyValue.java
similarity index 84%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/ChartKeyValue.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/ChartKeyValue.java
index e2a44a2..2a2871f 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/ChartKeyValue.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/ChartKeyValue.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderItemSummaryDto.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderItemSummaryDto.java
similarity index 90%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderItemSummaryDto.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderItemSummaryDto.java
index 855492a..304cb65 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderItemSummaryDto.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderItemSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderSummaryDto.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderSummaryDto.java
similarity index 96%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderSummaryDto.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderSummaryDto.java
index 20ec228..10efb8c 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderSummaryDto.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrderSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.azure.spring.data.cosmos.core.mapping.Container;
 import com.azure.spring.data.cosmos.core.mapping.PartitionKey;
@@ -7,7 +7,6 @@
 import lombok.*;
 import org.springframework.data.annotation.Id;
 
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrdersTimeSeries.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrdersTimeSeries.java
similarity index 85%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrdersTimeSeries.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrdersTimeSeries.java
index 624854e..01792d4 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrdersTimeSeries.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/OrdersTimeSeries.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/TimeSeries.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/TimeSeries.java
similarity index 84%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/TimeSeries.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/TimeSeries.java
index 840348c..26667aa 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/TimeSeries.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/dto/TimeSeries.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.accountingservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/exception/OrdersNotFoundException.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/exception/OrdersNotFoundException.java
similarity index 87%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/exception/OrdersNotFoundException.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/exception/OrdersNotFoundException.java
index 7751d1d..a0efcb8 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/exception/OrdersNotFoundException.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/exception/OrdersNotFoundException.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.exception;
+package com.microsoft.gbb.reddog.accountingservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/EntityMapper.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/EntityMapper.java
similarity index 81%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/EntityMapper.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/EntityMapper.java
index b869e13..2b8d2d5 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/EntityMapper.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/EntityMapper.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.mapper;
+package com.microsoft.gbb.reddog.accountingservice.mapper;
 
 import java.util.List;
 import java.util.Set;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderItemSummaryMapper.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderItemSummaryMapper.java
new file mode 100644
index 0000000..6fbca25
--- /dev/null
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderItemSummaryMapper.java
@@ -0,0 +1,9 @@
+package com.microsoft.gbb.reddog.accountingservice.mapper;
+
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderItemSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.model.OrderItemSummary;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface OrderItemSummaryMapper extends EntityMapper<OrderItemSummaryDto, OrderItemSummary> {
+}
\ No newline at end of file
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderSummaryMapper.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderSummaryMapper.java
similarity index 65%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderSummaryMapper.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderSummaryMapper.java
index 0a6f256..2343f76 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderSummaryMapper.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/mapper/OrderSummaryMapper.java
@@ -1,7 +1,7 @@
-package com.microsoft.gbb.rasa.orderservice.mapper;
+package com.microsoft.gbb.reddog.accountingservice.mapper;
 
-import com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.orderservice.entities.OrderSummary;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.model.OrderSummary;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/messaging/TopicProducer.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/messaging/TopicProducer.java
similarity index 83%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/messaging/TopicProducer.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/messaging/TopicProducer.java
index 95ab972..05946b5 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/messaging/TopicProducer.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/messaging/TopicProducer.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.accountingservice.messaging;
+package com.microsoft.gbb.reddog.accountingservice.messaging;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderItemSummary.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderItemSummary.java
similarity index 94%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderItemSummary.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderItemSummary.java
index a421d96..a8f5835 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderItemSummary.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderItemSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.model;
+package com.microsoft.gbb.reddog.accountingservice.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderSummary.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderSummary.java
similarity index 96%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderSummary.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderSummary.java
index c6d2c91..cc2f2c6 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/model/OrderSummary.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/model/OrderSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.model;
+package com.microsoft.gbb.reddog.accountingservice.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/repositories/OrderSummaryRepository.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/repositories/OrderSummaryRepository.java
similarity index 91%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/repositories/OrderSummaryRepository.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/repositories/OrderSummaryRepository.java
index 6c9b33a..4ada220 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/repositories/OrderSummaryRepository.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/repositories/OrderSummaryRepository.java
@@ -1,10 +1,10 @@
-package com.microsoft.gbb.rasa.accountingservice.repositories;
+package com.microsoft.gbb.reddog.accountingservice.repositories;
 
 import com.azure.spring.data.cosmos.repository.CosmosRepository;
 import com.azure.spring.data.cosmos.repository.Query;
-import com.microsoft.gbb.rasa.accountingservice.dto.ChartKeyValue;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrdersTimeSeries;
+import com.microsoft.gbb.reddog.accountingservice.dto.ChartKeyValue;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrdersTimeSeries;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingService.java b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingService.java
similarity index 86%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingService.java
rename to accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingService.java
index 5c67a04..cd87d64 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingService.java
+++ b/accounting-service/src/main/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingService.java
@@ -1,9 +1,9 @@
-package com.microsoft.gbb.rasa.accountingservice.service;
+package com.microsoft.gbb.reddog.accountingservice.service;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.ChartKeyValue;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrdersTimeSeries;
-import com.microsoft.gbb.rasa.accountingservice.repositories.OrderSummaryRepository;
+import com.microsoft.gbb.reddog.accountingservice.dto.ChartKeyValue;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrdersTimeSeries;
+import com.microsoft.gbb.reddog.accountingservice.repositories.OrderSummaryRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/accounting-service/src/main/resources/application.yaml b/accounting-service/src/main/resources/application.yaml
index a9e9407..b7d6f5c 100644
--- a/accounting-service/src/main/resources/application.yaml
+++ b/accounting-service/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto
         sasl:
           mechanism: ${KAFKASASLMECHANISM:PLAIN}
           jaas:
@@ -28,9 +28,9 @@ cosmos:
   uri: ${AZURECOSMOSDBURI}
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 server:
   port: '8087'
 topic:
diff --git a/accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingControllerTest.java b/accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingControllerTest.java
similarity index 90%
rename from accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingControllerTest.java
rename to accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingControllerTest.java
index 74722e5..caca61a 100644
--- a/accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/controller/AccountingControllerTest.java
+++ b/accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/controller/AccountingControllerTest.java
@@ -1,7 +1,7 @@
-package com.microsoft.gbb.rasa.accountingservice.controller;
+package com.microsoft.gbb.reddog.accountingservice.controller;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.service.AccountingService;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.service.AccountingService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingServiceTest.java b/accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingServiceTest.java
similarity index 86%
rename from accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingServiceTest.java
rename to accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingServiceTest.java
index b5c7515..64920ef 100644
--- a/accounting-service/src/test/java/com/microsoft/gbb/rasa/accountingservice/service/AccountingServiceTest.java
+++ b/accounting-service/src/test/java/com/microsoft/gbb/reddog/accountingservice/service/AccountingServiceTest.java
@@ -1,12 +1,11 @@
-package com.microsoft.gbb.rasa.accountingservice.service;
+package com.microsoft.gbb.reddog.accountingservice.service;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.dto.OrdersTimeSeries;
-import com.microsoft.gbb.rasa.accountingservice.dto.TimeSeries;
-import com.microsoft.gbb.rasa.accountingservice.repositories.OrderSummaryRepository;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.accountingservice.dto.OrdersTimeSeries;
+import com.microsoft.gbb.reddog.accountingservice.dto.TimeSeries;
+import com.microsoft.gbb.reddog.accountingservice.repositories.OrderSummaryRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
diff --git a/ancillary/local-config-service/src/main/resources/config/accounting-service.yaml b/ancillary/local-config-service/src/main/resources/config/accounting-service.yaml
index f634ab1..efeeef3 100644
--- a/ancillary/local-config-service/src/main/resources/config/accounting-service.yaml
+++ b/ancillary/local-config-service/src/main/resources/config/accounting-service.yaml
@@ -6,7 +6,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.accountingservice.dto.OrderSummaryDto
         sasl:
           mechanism: ${KAFKASASLMECHANISM:PLAIN}
           jaas:
diff --git a/ancillary/local-config-service/src/main/resources/config/makeline-service.yaml b/ancillary/local-config-service/src/main/resources/config/makeline-service.yaml
index a9d6c24..a59e826 100644
--- a/ancillary/local-config-service/src/main/resources/config/makeline-service.yaml
+++ b/ancillary/local-config-service/src/main/resources/config/makeline-service.yaml
@@ -32,7 +32,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto
     consumer:
       group-id: ${KAFKA_CONSUMER_GROUP_ID:makelineservice}
       auto-offset-reset: latest
@@ -40,7 +40,7 @@ spring:
         spring:
           json:
             trusted.packages: "*"
-            type.mapping: ordersummary:com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto
+            type.mapping: ordersummary:com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto
         sasl:
           jaas:
             config: ${KAFKASASLJAASCONFIG}
diff --git a/ancillary/local-config-service/src/main/resources/config/order-service.yaml b/ancillary/local-config-service/src/main/resources/config/order-service.yaml
index adf8f41..1e471a3 100644
--- a/ancillary/local-config-service/src/main/resources/config/order-service.yaml
+++ b/ancillary/local-config-service/src/main/resources/config/order-service.yaml
@@ -13,7 +13,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto
       bootstrap-servers: ${KAFKABOOTSTRAPSERVERS:localhost:9092}
     security:
       protocol: ${KAFKASECURITYPROTOCOL:PLAINTEXT}
diff --git a/ancillary/local-eureka-server/pom.xml b/ancillary/local-eureka-server/pom.xml
index 3efb173..979c85c 100644
--- a/ancillary/local-eureka-server/pom.xml
+++ b/ancillary/local-eureka-server/pom.xml
@@ -8,7 +8,7 @@
 		<version>2.7.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.microsoft.gbb.rasa</groupId>
+	<groupId>com.microsoft.gbb.reddog</groupId>
 	<artifactId>local-eureka-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>local-eureka-server</name>
diff --git a/ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplication.java b/ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplication.java
similarity index 88%
rename from ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplication.java
rename to ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplication.java
index 384a41f..1fd2e50 100644
--- a/ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplication.java
+++ b/ancillary/local-eureka-server/src/main/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplication.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.localeurekaserver;
+package com.microsoft.gbb.reddog.localeurekaserver;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplicationTests.java b/ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplicationTests.java
similarity index 78%
rename from ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplicationTests.java
rename to ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplicationTests.java
index 41c9071..76a28d2 100644
--- a/ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/rasa/localeurekaserver/LocalEurekaServerApplicationTests.java
+++ b/ancillary/local-eureka-server/src/test/java/com/microsoft/gbb/reddog/localeurekaserver/LocalEurekaServerApplicationTests.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.localeurekaserver;
+package com.microsoft.gbb.reddog.localeurekaserver;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/loyalty-service/src/main/resources/application.yaml b/loyalty-service/src/main/resources/application.yaml
index 3c2f3b4..2b1b5cb 100644
--- a/loyalty-service/src/main/resources/application.yaml
+++ b/loyalty-service/src/main/resources/application.yaml
@@ -32,9 +32,9 @@ spring:
       value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 management:
   endpoints:
     web:
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderItemSummaryMapper.java b/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderItemSummaryMapper.java
deleted file mode 100644
index a6e649d..0000000
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderItemSummaryMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.microsoft.gbb.rasa.makelineservice.mapper;
-
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderItemSummaryDto;
-import com.microsoft.gbb.rasa.makelineservice.model.OrderItemSummary;
-import org.mapstruct.Mapper;
-
-@Mapper(componentModel = "spring")
-public interface OrderItemSummaryMapper extends EntityMapper<OrderItemSummaryDto, OrderItemSummary> {
-}
\ No newline at end of file
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplication.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplication.java
similarity index 82%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplication.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplication.java
index 1895f5c..c425495 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplication.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplication.java
@@ -1,9 +1,8 @@
-package com.microsoft.gbb.rasa.makelineservice;
+package com.microsoft.gbb.reddog.makelineservice;
 
 import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 
 @SpringBootApplication
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosDbConfig.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosDbConfig.java
similarity index 97%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosDbConfig.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosDbConfig.java
index e0ca388..ec5cb56 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosDbConfig.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosDbConfig.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.config;
+package com.microsoft.gbb.reddog.makelineservice.config;
 
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.DirectConnectionConfig;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosProperties.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosProperties.java
similarity index 92%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosProperties.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosProperties.java
index a2f3820..a009076 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/config/CosmosProperties.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/CosmosProperties.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.gbb.rasa.accountingservice.config;
+package com.microsoft.gbb.reddog.makelineservice.config;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/KafkaTopicConfiguration.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/KafkaTopicConfiguration.java
similarity index 96%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/KafkaTopicConfiguration.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/KafkaTopicConfiguration.java
index b002ade..7bbe2e2 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/KafkaTopicConfiguration.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/KafkaTopicConfiguration.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.config;
+package com.microsoft.gbb.reddog.makelineservice.config;
 
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/RedisConfig.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/RedisConfig.java
similarity index 95%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/RedisConfig.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/RedisConfig.java
index 3c7da4c..69d827a 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/RedisConfig.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/RedisConfig.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.makelineservice.config;
+package com.microsoft.gbb.reddog.makelineservice.config;
 
-import com.microsoft.gbb.rasa.makelineservice.model.OrderSummary;
+import com.microsoft.gbb.reddog.makelineservice.model.OrderSummary;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/SwaggerConfig.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/SwaggerConfig.java
similarity index 89%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/SwaggerConfig.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/SwaggerConfig.java
index f1634d9..545a1c5 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/config/SwaggerConfig.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.config;
+package com.microsoft.gbb.reddog.makelineservice.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/controller/MakelineController.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/controller/MakelineController.java
similarity index 90%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/controller/MakelineController.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/controller/MakelineController.java
index d0a5e46..8839fd5 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/controller/MakelineController.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/controller/MakelineController.java
@@ -1,8 +1,8 @@
-package com.microsoft.gbb.rasa.makelineservice.controller;
+package com.microsoft.gbb.reddog.makelineservice.controller;
 
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.makelineservice.exception.SaveOrderException;
-import com.microsoft.gbb.rasa.makelineservice.service.MakelineService;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.exception.SaveOrderException;
+import com.microsoft.gbb.reddog.makelineservice.service.MakelineService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/AbstractDto.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/AbstractDto.java
similarity index 86%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/AbstractDto.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/AbstractDto.java
index cfefd0d..0245b89 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/AbstractDto.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/AbstractDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.makelineservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderItemSummaryDto.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderItemSummaryDto.java
similarity index 90%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderItemSummaryDto.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderItemSummaryDto.java
index 68f2599..b4ef2b6 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/dto/OrderItemSummaryDto.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderItemSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.dto;
+package com.microsoft.gbb.reddog.makelineservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderSummaryDto.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderSummaryDto.java
similarity index 97%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderSummaryDto.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderSummaryDto.java
index 46cacdf..73d6943 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/dto/OrderSummaryDto.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/dto/OrderSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.dto;
+package com.microsoft.gbb.reddog.makelineservice.dto;
 
 import com.azure.spring.data.cosmos.core.mapping.Container;
 import com.azure.spring.data.cosmos.core.mapping.PartitionKey;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/exception/SaveOrderException.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/exception/SaveOrderException.java
similarity index 87%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/exception/SaveOrderException.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/exception/SaveOrderException.java
index 5832dce..c422953 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/exception/SaveOrderException.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/exception/SaveOrderException.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.makelineservice.exception;
+package com.microsoft.gbb.reddog.makelineservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/EntityMapper.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/EntityMapper.java
similarity index 81%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/EntityMapper.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/EntityMapper.java
index b83ce69..97dffc6 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/EntityMapper.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/EntityMapper.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.mapper;
+package com.microsoft.gbb.reddog.makelineservice.mapper;
 
 import java.util.List;
 import java.util.Set;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderItemSummaryMapper.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderItemSummaryMapper.java
similarity index 50%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderItemSummaryMapper.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderItemSummaryMapper.java
index 9d00829..31a4e16 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderItemSummaryMapper.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderItemSummaryMapper.java
@@ -1,7 +1,7 @@
-package com.microsoft.gbb.rasa.accountingservice.mapper;
+package com.microsoft.gbb.reddog.makelineservice.mapper;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderItemSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.model.OrderItemSummary;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderItemSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.model.OrderItemSummary;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "spring")
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderSummaryMapper.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderSummaryMapper.java
similarity index 67%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderSummaryMapper.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderSummaryMapper.java
index c8dd07e..9d42f21 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/mapper/OrderSummaryMapper.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/mapper/OrderSummaryMapper.java
@@ -1,7 +1,7 @@
-package com.microsoft.gbb.rasa.accountingservice.mapper;
+package com.microsoft.gbb.reddog.makelineservice.mapper;
 
-import com.microsoft.gbb.rasa.accountingservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.accountingservice.model.OrderSummary;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.model.OrderSummary;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/messaging/TopicProducer.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/messaging/TopicProducer.java
similarity index 84%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/messaging/TopicProducer.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/messaging/TopicProducer.java
index 0db73f2..31bab96 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/messaging/TopicProducer.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/messaging/TopicProducer.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.makelineservice.messaging;
+package com.microsoft.gbb.reddog.makelineservice.messaging;
 
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderItemSummary.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderItemSummary.java
similarity index 94%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderItemSummary.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderItemSummary.java
index cc4a5ea..7dcbdbe 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderItemSummary.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderItemSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.model;
+package com.microsoft.gbb.reddog.makelineservice.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
diff --git a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderSummary.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderSummary.java
similarity index 96%
rename from accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderSummary.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderSummary.java
index 3cd6f98..6b02b94 100644
--- a/accounting-service/src/main/java/com/microsoft/gbb/rasa/accountingservice/model/OrderSummary.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/model/OrderSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.accountingservice.model;
+package com.microsoft.gbb.reddog.makelineservice.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Builder;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRedisRepository.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRedisRepository.java
similarity index 89%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRedisRepository.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRedisRepository.java
index 2eba785..4e8a9b1 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRedisRepository.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRedisRepository.java
@@ -1,7 +1,7 @@
 /*
-package com.microsoft.gbb.rasa.makelineservice.repository;
+package com.microsoft.gbb.reddog.makelineservice.repository;
 
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
+import dto.com.microsoft.gbb.reddog.makelineservice.OrderSummaryDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.ReactiveRedisOperations;
 import org.springframework.stereotype.Repository;
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRepository.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRepository.java
similarity index 88%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRepository.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRepository.java
index 4062b90..7236158 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/repository/OrderSummaryRepository.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/repository/OrderSummaryRepository.java
@@ -1,8 +1,8 @@
-package com.microsoft.gbb.rasa.makelineservice.repository;
+package com.microsoft.gbb.reddog.makelineservice.repository;
 
 import com.azure.spring.data.cosmos.repository.CosmosRepository;
 import com.azure.spring.data.cosmos.repository.Query;
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/service/MakelineService.java b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/service/MakelineService.java
similarity index 87%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/service/MakelineService.java
rename to makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/service/MakelineService.java
index 9a08055..e73d08f 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/service/MakelineService.java
+++ b/makeline-service/src/main/java/com/microsoft/gbb/reddog/makelineservice/service/MakelineService.java
@@ -1,8 +1,8 @@
-package com.microsoft.gbb.rasa.makelineservice.service;
+package com.microsoft.gbb.reddog.makelineservice.service;
 
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.makelineservice.messaging.TopicProducer;
-import com.microsoft.gbb.rasa.makelineservice.repository.OrderSummaryRepository;
+import com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.makelineservice.messaging.TopicProducer;
+import com.microsoft.gbb.reddog.makelineservice.repository.OrderSummaryRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/makeline-service/src/main/resources/application.yaml b/makeline-service/src/main/resources/application.yaml
index 19f243f..1023922 100644
--- a/makeline-service/src/main/resources/application.yaml
+++ b/makeline-service/src/main/resources/application.yaml
@@ -32,7 +32,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto
     consumer:
       group-id: ${KAFKA_CONSUMER_GROUP_ID:makelineservice}
       auto-offset-reset: latest
@@ -40,7 +40,7 @@ spring:
         spring:
           json:
             trusted.packages: "*"
-            type.mapping: ordersummary:com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto
+            type.mapping: ordersummary:com.microsoft.gbb.reddog.makelineservice.dto.OrderSummaryDto
         sasl:
           jaas:
             config: ${KAFKASASLJAASCONFIG}
@@ -53,9 +53,9 @@ messaging:
     SUB_NAME: pubsub
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 cosmos:
   uri: ${AZURECOSMOSDBURI}
   key: ${AZURECOSMOSDBKEY}
diff --git a/makeline-service/src/test/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplicationTests.java b/makeline-service/src/test/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplicationTests.java
similarity index 81%
rename from makeline-service/src/test/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplicationTests.java
rename to makeline-service/src/test/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplicationTests.java
index c44a624..e6d3df5 100644
--- a/makeline-service/src/test/java/com/microsoft/gbb/rasa/makelineservice/MakelineServiceApplicationTests.java
+++ b/makeline-service/src/test/java/com/microsoft/gbb/reddog/makelineservice/MakelineServiceApplicationTests.java
@@ -1,4 +1,4 @@
-//package com.microsoft.gbb.rasa.makelineservice;
+//package com.microsoft.gbb.reddog.makelineservice;
 //
 //import org.junit.jupiter.api.Test;
 //import org.springframework.boot.test.context.SpringBootTest;
diff --git a/order-service/.jpb/persistence-units.xml b/order-service/.jpb/persistence-units.xml
index 7252560..0dc0fa1 100644
--- a/order-service/.jpb/persistence-units.xml
+++ b/order-service/.jpb/persistence-units.xml
@@ -4,7 +4,7 @@
     <persistence-units>
       <persistence-unit name="Default">
         <packages>
-          <package value="com.microsoft.gbb.rasa.orderservice" />
+          <package value="com.microsoft.gbb.reddog.orderservice" />
         </packages>
       </persistence-unit>
     </persistence-units>
diff --git a/order-service/pom.xml b/order-service/pom.xml
index 5671b58..1f35777 100644
--- a/order-service/pom.xml
+++ b/order-service/pom.xml
@@ -8,7 +8,7 @@
         <version>2.7.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.microsoft.gbb.rasa</groupId>
+    <groupId>com.microsoft.gbb.reddog</groupId>
     <artifactId>order-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>order-service</name>
@@ -22,6 +22,8 @@
         <spring-boot-maven-plugin.version>2.7.3</spring-boot-maven-plugin.version>
         <flyway-maven-plugin.version>9.3.0</flyway-maven-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <spring-cloud-azure-starter-servicebus-jms.version>4.5.0
+        </spring-cloud-azure-starter-servicebus-jms.version>
     </properties>
     <dependencies>
         <dependency>
@@ -159,6 +161,11 @@
             <artifactId>opentelemetry-api</artifactId>
             <version>1.19.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.azure.spring</groupId>
+            <artifactId>spring-cloud-azure-starter-servicebus-jms</artifactId>
+            <version>${spring-cloud-azure-starter-servicebus-jms.version}</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/ProductController.java b/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/ProductController.java
deleted file mode 100644
index 33e0944..0000000
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/ProductController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.microsoft.gbb.rasa.orderservice.controller;
-
-import com.microsoft.gbb.rasa.orderservice.dto.ProductDto;
-import com.microsoft.gbb.rasa.orderservice.entities.Product;
-import com.microsoft.gbb.rasa.orderservice.exception.ProductsNotFoundException;
-import com.microsoft.gbb.rasa.orderservice.service.ProductService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.common.errors.ResourceNotFoundException;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@RestController
-@Slf4j
-public class ProductController {
-
-    private final ProductService productService;
-
-    public ProductController(ProductService productService) {
-        this.productService = productService;
-    }
-
-    @GetMapping(value = "/products")
-    @CrossOrigin(origins = "*")
-    public ResponseEntity<List<ProductDto>> getAllProducts() {
-        List<ProductDto> products = Optional.ofNullable(productService.getAllProducts()).orElseThrow(() -> {
-            log.error("Unable to fetch products");
-            return new ProductsNotFoundException("Unable to fetch products");
-        });
-        return ResponseEntity.ok(products);
-    }
-}
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderItemSummaryMapper.java b/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderItemSummaryMapper.java
deleted file mode 100644
index f169e32..0000000
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/OrderItemSummaryMapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.microsoft.gbb.rasa.orderservice.mapper;
-
-import com.microsoft.gbb.rasa.orderservice.dto.OrderItemSummaryDto;
-import com.microsoft.gbb.rasa.orderservice.entities.OrderItemSummary;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-
-@Mapper(componentModel = "spring")
-public interface OrderItemSummaryMapper extends EntityMapper<OrderItemSummaryDto, OrderItemSummary> {
-}
\ No newline at end of file
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/ProductMapper.java b/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/ProductMapper.java
deleted file mode 100644
index 1860fe5..0000000
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/ProductMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.microsoft.gbb.rasa.orderservice.mapper;
-
-import com.microsoft.gbb.rasa.orderservice.dto.ProductDto;
-import com.microsoft.gbb.rasa.orderservice.entities.Product;
-import org.mapstruct.Mapper;
-
-@Mapper(componentModel = "spring")
-public interface ProductMapper extends EntityMapper<ProductDto, Product> {
-}
\ No newline at end of file
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/ProductService.java b/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/ProductService.java
deleted file mode 100644
index 195ed6d..0000000
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/ProductService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.microsoft.gbb.rasa.orderservice.service;
-
-import com.microsoft.gbb.rasa.orderservice.dto.ProductDto;
-import com.microsoft.gbb.rasa.orderservice.mapper.ProductMapper;
-import com.microsoft.gbb.rasa.orderservice.repositories.ProductRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@Service
-public class ProductService {
-    private final ProductRepository productRepository;
-    private final ProductMapper productMapper;
-
-    public ProductService(ProductRepository productRepository, ProductMapper productMapper) {
-        this.productRepository = productRepository;
-        this.productMapper = productMapper;
-    }
-
-    public List<ProductDto> getAllProducts() {
-        return productMapper.toDto(productRepository.findAll());
-    }
-}
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplication.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplication.java
similarity index 76%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplication.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplication.java
index 03dab54..5de64c5 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplication.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplication.java
@@ -1,11 +1,12 @@
-package com.microsoft.gbb.rasa.orderservice;
+package com.microsoft.gbb.reddog.orderservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.jms.annotation.EnableJms;
 import org.springframework.kafka.annotation.EnableKafka;
 
 @EnableKafka
+@EnableJms
 @SpringBootApplication
 public class OrderServiceApplication {
 
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/KafkaTopicConfiguration.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/KafkaTopicConfiguration.java
similarity index 96%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/KafkaTopicConfiguration.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/KafkaTopicConfiguration.java
index 896835b..311920a 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/KafkaTopicConfiguration.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/KafkaTopicConfiguration.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.config;
+package com.microsoft.gbb.reddog.orderservice.config;
 
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/SwaggerConfig.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/SwaggerConfig.java
similarity index 89%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/SwaggerConfig.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/SwaggerConfig.java
index 3c60dfb..63c5fce 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/config/SwaggerConfig.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.config;
+package com.microsoft.gbb.reddog.orderservice.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/OrderController.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/OrderController.java
similarity index 74%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/OrderController.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/OrderController.java
index f116af7..f2f9c32 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/controller/OrderController.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/OrderController.java
@@ -1,8 +1,8 @@
-package com.microsoft.gbb.rasa.orderservice.controller;
+package com.microsoft.gbb.reddog.orderservice.controller;
 
-import com.microsoft.gbb.rasa.orderservice.dto.CustomerOrderDto;
-import com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.orderservice.service.OrderService;
+import com.microsoft.gbb.reddog.orderservice.dto.CustomerOrderDto;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.service.OrderService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/ProductController.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/ProductController.java
new file mode 100644
index 0000000..f58c2fd
--- /dev/null
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/controller/ProductController.java
@@ -0,0 +1,42 @@
+package com.microsoft.gbb.reddog.orderservice.controller;
+
+import com.microsoft.gbb.reddog.orderservice.dto.ProductDto;
+import com.microsoft.gbb.reddog.orderservice.exception.ProductsNotFoundException;
+import com.microsoft.gbb.reddog.orderservice.service.ProductService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@Slf4j
+public class ProductController {
+
+    private final ProductService productService;
+
+    public ProductController(ProductService productService) {
+        this.productService = productService;
+    }
+
+    @GetMapping(value = "/products")
+    @CrossOrigin(origins = "*")
+    public ResponseEntity<List<ProductDto>> getAllProducts() {
+        List<ProductDto> products = Optional.ofNullable(productService.getAllProducts()).orElseThrow(() -> {
+            log.error("Unable to fetch products");
+            return new ProductsNotFoundException("Unable to fetch products");
+        });
+        return ResponseEntity.ok(products);
+    }
+
+    @PostMapping(value = "/product-images")
+    @CrossOrigin(origins = "*")
+    public ResponseEntity<List<String>> generateProductImagesFromDiffusion(@RequestBody List<String> productIds) {
+        List<String> productImages = Optional.ofNullable(productService.generateProductImages(productIds)).orElseThrow(() -> {
+            log.error("Unable to fetch product images");
+            return new ProductsNotFoundException("Unable to fetch product images");
+        });
+        return ResponseEntity.ok(productImages);
+    }
+}
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/AbstractDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/AbstractDto.java
similarity index 87%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/AbstractDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/AbstractDto.java
index 9380ee5..4563392 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/AbstractDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/AbstractDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderDto.java
similarity index 95%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderDto.java
index e297f9d..b82cdca 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
@@ -6,7 +6,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
 import java.util.List;
 @Getter
 @Setter
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderItemDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderItemDto.java
similarity index 87%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderItemDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderItemDto.java
index 4dff2cd..d0bd2db 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/CustomerOrderItemDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/CustomerOrderItemDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
@@ -6,7 +6,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.io.Serializable;
 @Getter
 @Setter
 @Builder
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderItemSummaryDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderItemSummaryDto.java
similarity index 92%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderItemSummaryDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderItemSummaryDto.java
index 8e544bf..6e9f428 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderItemSummaryDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderItemSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderSummaryDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderSummaryDto.java
similarity index 97%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderSummaryDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderSummaryDto.java
index d48012a..4a4b2b5 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/OrderSummaryDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/OrderSummaryDto.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/ProductDto.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/ProductDto.java
similarity index 93%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/ProductDto.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/ProductDto.java
index a4d4a3c..69d4dfd 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/dto/ProductDto.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/dto/ProductDto.java
@@ -1,10 +1,8 @@
-package com.microsoft.gbb.rasa.orderservice.dto;
+package com.microsoft.gbb.reddog.orderservice.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 
-import java.io.Serializable;
-
 @AllArgsConstructor
 @Getter
 @Setter
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/CustomerOrder.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/CustomerOrder.java
similarity index 95%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/CustomerOrder.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/CustomerOrder.java
index 185258f..d8eab9f 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/CustomerOrder.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/CustomerOrder.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.entities;
+package com.microsoft.gbb.reddog.orderservice.entities;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderItemSummary.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderItemSummary.java
similarity index 95%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderItemSummary.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderItemSummary.java
index 652962f..415187f 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderItemSummary.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderItemSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.entities;
+package com.microsoft.gbb.reddog.orderservice.entities;
 
 import lombok.*;
 
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderSummary.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderSummary.java
similarity index 96%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderSummary.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderSummary.java
index 77cb5ab..1c0543d 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/OrderSummary.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/OrderSummary.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.entities;
+package com.microsoft.gbb.reddog.orderservice.entities;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/Product.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/Product.java
similarity index 93%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/Product.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/Product.java
index 7913ccd..ff75500 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/entities/Product.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/entities/Product.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.entities;
+package com.microsoft.gbb.reddog.orderservice.entities;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/exception/ProductsNotFoundException.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/exception/ProductsNotFoundException.java
similarity index 88%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/exception/ProductsNotFoundException.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/exception/ProductsNotFoundException.java
index 2208532..e2a1a4a 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/exception/ProductsNotFoundException.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/exception/ProductsNotFoundException.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.exception;
+package com.microsoft.gbb.reddog.orderservice.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/EntityMapper.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/EntityMapper.java
similarity index 84%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/EntityMapper.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/EntityMapper.java
index 23e7051..e5bd052 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/mapper/EntityMapper.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/EntityMapper.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice.mapper;
+package com.microsoft.gbb.reddog.orderservice.mapper;
 
 import org.mapstruct.Mapping;
 
diff --git a/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderItemSummaryMapper.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderItemSummaryMapper.java
new file mode 100644
index 0000000..f86661b
--- /dev/null
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderItemSummaryMapper.java
@@ -0,0 +1,9 @@
+package com.microsoft.gbb.reddog.orderservice.mapper;
+
+import com.microsoft.gbb.reddog.orderservice.dto.OrderItemSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.entities.OrderItemSummary;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface OrderItemSummaryMapper extends EntityMapper<OrderItemSummaryDto, OrderItemSummary> {
+}
\ No newline at end of file
diff --git a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderSummaryMapper.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderSummaryMapper.java
similarity index 67%
rename from makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderSummaryMapper.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderSummaryMapper.java
index e55b49e..d41fbca 100644
--- a/makeline-service/src/main/java/com/microsoft/gbb/rasa/makelineservice/mapper/OrderSummaryMapper.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/OrderSummaryMapper.java
@@ -1,7 +1,7 @@
-package com.microsoft.gbb.rasa.makelineservice.mapper;
+package com.microsoft.gbb.reddog.orderservice.mapper;
 
-import com.microsoft.gbb.rasa.makelineservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.makelineservice.model.OrderSummary;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.entities.OrderSummary;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
diff --git a/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/ProductMapper.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/ProductMapper.java
new file mode 100644
index 0000000..afde99f
--- /dev/null
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/mapper/ProductMapper.java
@@ -0,0 +1,9 @@
+package com.microsoft.gbb.reddog.orderservice.mapper;
+
+import com.microsoft.gbb.reddog.orderservice.dto.ProductDto;
+import com.microsoft.gbb.reddog.orderservice.entities.Product;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface ProductMapper extends EntityMapper<ProductDto, Product> {
+}
\ No newline at end of file
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/messaging/TopicProducer.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/messaging/TopicProducer.java
similarity index 84%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/messaging/TopicProducer.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/messaging/TopicProducer.java
index d978a67..d46000f 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/messaging/TopicProducer.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/messaging/TopicProducer.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.orderservice.messaging;
+package com.microsoft.gbb.reddog.orderservice.messaging;
 
-import com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderItemRepository.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderItemRepository.java
similarity index 54%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderItemRepository.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderItemRepository.java
index e7f79bb..059a78d 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderItemRepository.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderItemRepository.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.orderservice.repositories;
+package com.microsoft.gbb.reddog.orderservice.repositories;
 
-import com.microsoft.gbb.rasa.orderservice.entities.OrderItemSummary;
+import com.microsoft.gbb.reddog.orderservice.entities.OrderItemSummary;
 import org.springframework.data.repository.CrudRepository;
 
 public interface CustomerOrderItemRepository extends CrudRepository<OrderItemSummary, Long> {
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderRepository.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderRepository.java
similarity index 53%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderRepository.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderRepository.java
index 5ea7f86..0cc9733 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/CustomerOrderRepository.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/CustomerOrderRepository.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.orderservice.repositories;
+package com.microsoft.gbb.reddog.orderservice.repositories;
 
-import com.microsoft.gbb.rasa.orderservice.entities.CustomerOrder;
+import com.microsoft.gbb.reddog.orderservice.entities.CustomerOrder;
 import org.springframework.data.repository.CrudRepository;
 
 public interface CustomerOrderRepository extends CrudRepository<CustomerOrder, Long> {
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/OrderSummaryRepository.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/OrderSummaryRepository.java
similarity index 53%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/OrderSummaryRepository.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/OrderSummaryRepository.java
index 79ea314..c5ad1cf 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/OrderSummaryRepository.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/OrderSummaryRepository.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.orderservice.repositories;
+package com.microsoft.gbb.reddog.orderservice.repositories;
 
-import com.microsoft.gbb.rasa.orderservice.entities.OrderSummary;
+import com.microsoft.gbb.reddog.orderservice.entities.OrderSummary;
 import org.springframework.data.repository.CrudRepository;
 
 public interface OrderSummaryRepository extends CrudRepository<OrderSummary, Long> {
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/ProductRepository.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/ProductRepository.java
similarity index 61%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/ProductRepository.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/ProductRepository.java
index 99114c9..86230f4 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/repositories/ProductRepository.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/repositories/ProductRepository.java
@@ -1,6 +1,6 @@
-package com.microsoft.gbb.rasa.orderservice.repositories;
+package com.microsoft.gbb.reddog.orderservice.repositories;
 
-import com.microsoft.gbb.rasa.orderservice.entities.Product;
+import com.microsoft.gbb.reddog.orderservice.entities.Product;
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.ArrayList;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/CustomerOrderService.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/CustomerOrderService.java
similarity index 84%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/CustomerOrderService.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/CustomerOrderService.java
index 7870325..54f8379 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/CustomerOrderService.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/CustomerOrderService.java
@@ -1,14 +1,13 @@
-package com.microsoft.gbb.rasa.orderservice.service;
+package com.microsoft.gbb.reddog.orderservice.service;
 
-import com.microsoft.gbb.rasa.orderservice.dto.CustomerOrderDto;
-import com.microsoft.gbb.rasa.orderservice.dto.OrderItemSummaryDto;
-import com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto;
-import com.microsoft.gbb.rasa.orderservice.entities.CustomerOrder;
-import com.microsoft.gbb.rasa.orderservice.entities.Product;
-import com.microsoft.gbb.rasa.orderservice.exception.ProductsNotFoundException;
-import com.microsoft.gbb.rasa.orderservice.messaging.TopicProducer;
-import com.microsoft.gbb.rasa.orderservice.repositories.CustomerOrderRepository;
-import com.microsoft.gbb.rasa.orderservice.repositories.ProductRepository;
+import com.microsoft.gbb.reddog.orderservice.dto.CustomerOrderDto;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderItemSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.entities.Product;
+import com.microsoft.gbb.reddog.orderservice.exception.ProductsNotFoundException;
+import com.microsoft.gbb.reddog.orderservice.messaging.TopicProducer;
+import com.microsoft.gbb.reddog.orderservice.repositories.CustomerOrderRepository;
+import com.microsoft.gbb.reddog.orderservice.repositories.ProductRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
diff --git a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/OrderService.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/OrderService.java
similarity index 56%
rename from order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/OrderService.java
rename to order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/OrderService.java
index e55997b..c480417 100644
--- a/order-service/src/main/java/com/microsoft/gbb/rasa/orderservice/service/OrderService.java
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/OrderService.java
@@ -1,8 +1,8 @@
-package com.microsoft.gbb.rasa.orderservice.service;
+package com.microsoft.gbb.reddog.orderservice.service;
 
 
-import com.microsoft.gbb.rasa.orderservice.dto.CustomerOrderDto;
-import com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto;
+import com.microsoft.gbb.reddog.orderservice.dto.CustomerOrderDto;
+import com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto;
 
 /**
  * The interface Order service.
diff --git a/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/ProductService.java b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/ProductService.java
new file mode 100644
index 0000000..cd5dad1
--- /dev/null
+++ b/order-service/src/main/java/com/microsoft/gbb/reddog/orderservice/service/ProductService.java
@@ -0,0 +1,42 @@
+package com.microsoft.gbb.reddog.orderservice.service;
+
+import com.microsoft.gbb.reddog.orderservice.dto.ProductDto;
+import com.microsoft.gbb.reddog.orderservice.mapper.ProductMapper;
+import com.microsoft.gbb.reddog.orderservice.repositories.ProductRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class ProductService {
+    private final ProductRepository productRepository;
+    private final ProductMapper productMapper;
+
+    private static final String PRODUCT_QUEUE = "productimagegen";
+
+    @Autowired
+    private JmsTemplate jmsTemplate;
+
+    public ProductService(ProductRepository productRepository, ProductMapper productMapper) {
+        this.productRepository = productRepository;
+        this.productMapper = productMapper;
+    }
+
+    public List<ProductDto> getAllProducts() {
+        return productMapper.toDto(productRepository.findAll());
+    }
+
+    public List<String> generateProductImages(List<String> productIds) {
+        List<String> productImages = new ArrayList<>();
+        for (String productId : productIds) {
+            log.info("Generating product image for product id: {}", productId);
+            jmsTemplate.convertAndSend(PRODUCT_QUEUE, productId);
+        }
+        return productImages;
+    }
+}
diff --git a/order-service/src/main/resources/application.yaml b/order-service/src/main/resources/application.yaml
index c4349c1..19ae33f 100644
--- a/order-service/src/main/resources/application.yaml
+++ b/order-service/src/main/resources/application.yaml
@@ -15,7 +15,7 @@ spring:
         spring:
           json:
             type:
-              mapping: ordersummary:com.microsoft.gbb.rasa.orderservice.dto.OrderSummaryDto
+              mapping: ordersummary:com.microsoft.gbb.reddog.orderservice.dto.OrderSummaryDto
       bootstrap-servers: ${KAFKABOOTSTRAPSERVERS:localhost:9092}
     security:
       protocol: ${KAFKASECURITYPROTOCOL:PLAINTEXT}
@@ -26,6 +26,10 @@ spring:
     show-sql: 'true'
   config:
     import: optional:classpath:.env[.properties]
+  jms:
+    servicebus:
+      connection-string: ${SERVICEBUSCONNECTIONSTRING}
+      pricing-tier: ${SERVICEBUSPRICINGTIER:Basic}
   datasource:
     driverClassName: com.mysql.cj.jdbc.Driver
     password: ${MYSQLPASSWORD}
@@ -37,9 +41,9 @@ spring:
     location: static/banner.txt
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 springdoc:
   swagger-ui:
     enabled: 'true'
diff --git a/order-service/src/test/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplicationTests.java b/order-service/src/test/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplicationTests.java
similarity index 81%
rename from order-service/src/test/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplicationTests.java
rename to order-service/src/test/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplicationTests.java
index 72b6ec0..8f91cfe 100644
--- a/order-service/src/test/java/com/microsoft/gbb/rasa/orderservice/OrderServiceApplicationTests.java
+++ b/order-service/src/test/java/com/microsoft/gbb/reddog/orderservice/OrderServiceApplicationTests.java
@@ -1,4 +1,4 @@
-package com.microsoft.gbb.rasa.orderservice;
+package com.microsoft.gbb.reddog.orderservice;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/receipt-generation-service/src/main/resources/application.yaml b/receipt-generation-service/src/main/resources/application.yaml
index 159105e..fc6094b 100644
--- a/receipt-generation-service/src/main/resources/application.yaml
+++ b/receipt-generation-service/src/main/resources/application.yaml
@@ -33,9 +33,9 @@ spring:
           endpoint: ${AZURESTORAGEENDPOINT}
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 data:
   BLOB:
     CONTAINER: ${BLOB_CONTAINER:reddogasa}
diff --git a/virtual-customers/src/main/resources/application.yaml b/virtual-customers/src/main/resources/application.yaml
index f240a95..9467816 100644
--- a/virtual-customers/src/main/resources/application.yaml
+++ b/virtual-customers/src/main/resources/application.yaml
@@ -25,9 +25,9 @@ server:
   port: 8091
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 org:
   jobrunr:
     background-job-server:
diff --git a/virtual-worker/src/main/resources/application.yaml b/virtual-worker/src/main/resources/application.yaml
index b39bb0a..8fcdd01 100644
--- a/virtual-worker/src/main/resources/application.yaml
+++ b/virtual-worker/src/main/resources/application.yaml
@@ -16,9 +16,9 @@ management:
       show-details: ALWAYS
 eureka:
   client:
-    register-with-eureka: true
-    fetch-registry: true
-    enabled: true
+    register-with-eureka: false
+    fetch-registry: false
+    enabled: false
 server:
   port: 8086
 springdoc: