diff --git a/dvd-store/pom.xml b/dvd-store/pom.xml
index b95f1c0..46bbd69 100644
--- a/dvd-store/pom.xml
+++ b/dvd-store/pom.xml
@@ -2,7 +2,7 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.worldline.ep2.kata</groupId>
+  <groupId>com.quality.workshop</groupId>
   <artifactId>dvd-store</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <properties>
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/GreetingResource.java b/dvd-store/src/main/java/com/quality/workshop/GreetingResource.java
similarity index 90%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/GreetingResource.java
rename to dvd-store/src/main/java/com/quality/workshop/GreetingResource.java
index 4f4f511..71b783a 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/GreetingResource.java
+++ b/dvd-store/src/main/java/com/quality/workshop/GreetingResource.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata;
+package com.quality.workshop;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/db/DBRepo.java b/dvd-store/src/main/java/com/quality/workshop/db/DBRepo.java
similarity index 76%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/db/DBRepo.java
rename to dvd-store/src/main/java/com/quality/workshop/db/DBRepo.java
index e1d0b1b..502a85c 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/db/DBRepo.java
+++ b/dvd-store/src/main/java/com/quality/workshop/db/DBRepo.java
@@ -1,9 +1,9 @@
-package com.worldline.ep2.kata.db;
+package com.quality.workshop.db;
 
 import javax.enterprise.context.ApplicationScoped;
 
 
-import com.worldline.ep2.kata.entity.DVDRentEvents;
+import com.quality.workshop.entity.DVDRentEvents;
 
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/db/DataInitTool.java b/dvd-store/src/main/java/com/quality/workshop/db/DataInitTool.java
similarity index 95%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/db/DataInitTool.java
rename to dvd-store/src/main/java/com/quality/workshop/db/DataInitTool.java
index 81ab556..5aed4a0 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/db/DataInitTool.java
+++ b/dvd-store/src/main/java/com/quality/workshop/db/DataInitTool.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.db;
+package com.quality.workshop.db;
 
 import java.time.LocalDate;
 import java.util.Arrays;
@@ -9,10 +9,10 @@
 
 import javax.transaction.Transactional;
 
-import com.worldline.ep2.kata.entity.DVD;
-import com.worldline.ep2.kata.entity.DVDRentEvents;
-import com.worldline.ep2.kata.entity.Schauspieler;
-import com.worldline.ep2.kata.entity.VideoTape;
+import com.quality.workshop.entity.DVD;
+import com.quality.workshop.entity.DVDRentEvents;
+import com.quality.workshop.entity.Schauspieler;
+import com.quality.workshop.entity.VideoTape;
 
 import io.quarkus.runtime.StartupEvent;
 
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVD.java b/dvd-store/src/main/java/com/quality/workshop/entity/DVD.java
similarity index 97%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVD.java
rename to dvd-store/src/main/java/com/quality/workshop/entity/DVD.java
index 3053450..fffcebc 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVD.java
+++ b/dvd-store/src/main/java/com/quality/workshop/entity/DVD.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.entity;
+package com.quality.workshop.entity;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVDRentEvents.java b/dvd-store/src/main/java/com/quality/workshop/entity/DVDRentEvents.java
similarity index 94%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVDRentEvents.java
rename to dvd-store/src/main/java/com/quality/workshop/entity/DVDRentEvents.java
index 9d8f53f..a5f603d 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/DVDRentEvents.java
+++ b/dvd-store/src/main/java/com/quality/workshop/entity/DVDRentEvents.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.entity;
+package com.quality.workshop.entity;
 
 import java.sql.Date;
 import java.time.LocalDate;
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/Schauspieler.java b/dvd-store/src/main/java/com/quality/workshop/entity/Schauspieler.java
similarity index 91%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/entity/Schauspieler.java
rename to dvd-store/src/main/java/com/quality/workshop/entity/Schauspieler.java
index 34a8066..e8fecf3 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/Schauspieler.java
+++ b/dvd-store/src/main/java/com/quality/workshop/entity/Schauspieler.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.entity;
+package com.quality.workshop.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/VideoTape.java b/dvd-store/src/main/java/com/quality/workshop/entity/VideoTape.java
similarity index 94%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/entity/VideoTape.java
rename to dvd-store/src/main/java/com/quality/workshop/entity/VideoTape.java
index 279bae9..d1c5ae4 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/entity/VideoTape.java
+++ b/dvd-store/src/main/java/com/quality/workshop/entity/VideoTape.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.entity;
+package com.quality.workshop.entity;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/money/PriceCalculator.java b/dvd-store/src/main/java/com/quality/workshop/money/PriceCalculator.java
similarity index 69%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/money/PriceCalculator.java
rename to dvd-store/src/main/java/com/quality/workshop/money/PriceCalculator.java
index 2b8cf86..ca6f471 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/money/PriceCalculator.java
+++ b/dvd-store/src/main/java/com/quality/workshop/money/PriceCalculator.java
@@ -1,7 +1,7 @@
-package com.worldline.ep2.kata.money;
+package com.quality.workshop.money;
 
-import com.worldline.ep2.kata.entity.DVD;
-import com.worldline.ep2.kata.entity.VideoTape;
+import com.quality.workshop.entity.DVD;
+import com.quality.workshop.entity.VideoTape;
 
 public class PriceCalculator {
 
diff --git a/dvd-store/src/test/java/com/worldline/ep2/kata/money/PriceCalculatorTest.java b/dvd-store/src/main/java/com/quality/workshop/money/PriceCalculatorTest.java
similarity index 75%
rename from dvd-store/src/test/java/com/worldline/ep2/kata/money/PriceCalculatorTest.java
rename to dvd-store/src/main/java/com/quality/workshop/money/PriceCalculatorTest.java
index 31920fb..0c528fd 100644
--- a/dvd-store/src/test/java/com/worldline/ep2/kata/money/PriceCalculatorTest.java
+++ b/dvd-store/src/main/java/com/quality/workshop/money/PriceCalculatorTest.java
@@ -1,13 +1,13 @@
-package com.worldline.ep2.kata.money;
+package com.quality.workshop.money;
 
-import static com.worldline.ep2.kata.TestEntityHelper.getVideo;
-import static com.worldline.ep2.kata.money.PriceCalculator.computeDVDPrice;
+import static com.quality.workshop.TestEntityHelper.getVideo;
+import static com.quality.workshop.money.PriceCalculator.computeDVDPrice;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import com.worldline.ep2.kata.entity.VideoTape;
+import com.quality.workshop.entity.VideoTape;
 
 
 public class PriceCalculatorTest {
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/ActorResource.java b/dvd-store/src/main/java/com/quality/workshop/rest/ActorResource.java
similarity index 88%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/rest/ActorResource.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/ActorResource.java
index 5afff89..98a38ae 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/ActorResource.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/ActorResource.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
-import com.worldline.ep2.kata.entity.Schauspieler;
+import com.quality.workshop.entity.Schauspieler;
 
 @Path("/actor")
 public class ActorResource {
diff --git a/dvd-store/src/test/java/com/worldline/ep2/kata/rest/ActorResourceIT.java b/dvd-store/src/main/java/com/quality/workshop/rest/ActorResourceIT.java
similarity index 89%
rename from dvd-store/src/test/java/com/worldline/ep2/kata/rest/ActorResourceIT.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/ActorResourceIT.java
index f67032e..107267a 100644
--- a/dvd-store/src/test/java/com/worldline/ep2/kata/rest/ActorResourceIT.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/ActorResourceIT.java
@@ -1,6 +1,6 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
-import static com.worldline.ep2.kata.rest.RESTUtils.retrieveResourceFromResponse;
+import static com.quality.workshop.rest.RESTUtils.retrieveResourceFromResponse;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import com.worldline.ep2.kata.entity.Schauspieler;
+import com.quality.workshop.entity.Schauspieler;
 
 /***
  * Quick example of an integration-test.
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDEventsResource.java b/dvd-store/src/main/java/com/quality/workshop/rest/DVDEventsResource.java
similarity index 89%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDEventsResource.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/DVDEventsResource.java
index c631e84..a1883bb 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDEventsResource.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/DVDEventsResource.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
 import java.sql.Date;
 import java.time.LocalDate;
@@ -10,8 +10,8 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
-import com.worldline.ep2.kata.entity.DVD;
-import com.worldline.ep2.kata.entity.DVDRentEvents;
+import com.quality.workshop.entity.DVD;
+import com.quality.workshop.entity.DVDRentEvents;
 
 @Path("/dvdevents")
 @Produces
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDResource.java b/dvd-store/src/main/java/com/quality/workshop/rest/DVDResource.java
similarity index 82%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDResource.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/DVDResource.java
index a86bd17..777c66f 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/DVDResource.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/DVDResource.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
-import com.worldline.ep2.kata.entity.DVD;
-import com.worldline.ep2.kata.entity.Schauspieler;
+import com.quality.workshop.entity.DVD;
+import com.quality.workshop.entity.Schauspieler;
 
 @Path("/dvd")
 public class DVDResource {
diff --git a/dvd-store/src/test/java/com/worldline/ep2/kata/rest/RESTUtils.java b/dvd-store/src/main/java/com/quality/workshop/rest/RESTUtils.java
similarity index 94%
rename from dvd-store/src/test/java/com/worldline/ep2/kata/rest/RESTUtils.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/RESTUtils.java
index 88030f9..fffe409 100644
--- a/dvd-store/src/test/java/com/worldline/ep2/kata/rest/RESTUtils.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/RESTUtils.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
 import java.io.IOException;
 
diff --git a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/VideoTapeResource.java b/dvd-store/src/main/java/com/quality/workshop/rest/VideoTapeResource.java
similarity index 80%
rename from dvd-store/src/main/java/com/worldline/ep2/kata/rest/VideoTapeResource.java
rename to dvd-store/src/main/java/com/quality/workshop/rest/VideoTapeResource.java
index b7961cd..0b0b454 100644
--- a/dvd-store/src/main/java/com/worldline/ep2/kata/rest/VideoTapeResource.java
+++ b/dvd-store/src/main/java/com/quality/workshop/rest/VideoTapeResource.java
@@ -1,4 +1,4 @@
-package com.worldline.ep2.kata.rest;
+package com.quality.workshop.rest;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
-import com.worldline.ep2.kata.entity.Schauspieler;
-import com.worldline.ep2.kata.entity.VideoTape;
+import com.quality.workshop.entity.Schauspieler;
+import com.quality.workshop.entity.VideoTape;
 
 @Path("/video")
 public class VideoTapeResource {
diff --git a/dvd-store/src/test/java/com/worldline/ep2/kata/TestEntityHelper.java b/dvd-store/src/test/java/com/quality/workshop/TestEntityHelper.java
similarity index 96%
rename from dvd-store/src/test/java/com/worldline/ep2/kata/TestEntityHelper.java
rename to dvd-store/src/test/java/com/quality/workshop/TestEntityHelper.java
index 86550f7..e78cf16 100644
--- a/dvd-store/src/test/java/com/worldline/ep2/kata/TestEntityHelper.java
+++ b/dvd-store/src/test/java/com/quality/workshop/TestEntityHelper.java
@@ -1,11 +1,11 @@
-package com.worldline.ep2.kata;
+package com.quality.workshop;
 
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import com.worldline.ep2.kata.entity.Schauspieler;
-import com.worldline.ep2.kata.entity.VideoTape;
+import com.quality.workshop.entity.Schauspieler;
+import com.quality.workshop.entity.VideoTape;
 
 /**
  * Helper class to get Entity-like objects for unit-tests