Merge pull request #124 from CJSCommonPlatform/reorganize-modules

Reorganise modules to move them to root level
CJSCommonPlatform · Jan 16, 2024 · 6c6a254 · 6c6a254
2 parents 9a92c77 + 3f98b4d
commit 6c6a254
Show file tree

Hide file tree

Showing 353 changed files with 534 additions and 568 deletions.
diff --git a/...ample-command/example-command-api/pom.xml → example-command/example-command-api/pom.xml b/...ample-command/example-command-api/pom.xml → example-command/example-command-api/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-command</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -114,7 +114,7 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>uk.gov.justice.services.example</groupId>
+                        <groupId>uk.gov.justice.example</groupId>
                         <artifactId>example-command-handler</artifactId>
                         <version>${project.version}</version>
                         <classifier>raml</classifier>

diff --git a/...eshop/command/api/MakeCakeCommandApi.java → ...eshop/command/api/MakeCakeCommandApi.java b/...eshop/command/api/MakeCakeCommandApi.java → ...eshop/command/api/MakeCakeCommandApi.java
diff --git a/...shop/command/api/OrderCakeCommandApi.java → ...shop/command/api/OrderCakeCommandApi.java b/...shop/command/api/OrderCakeCommandApi.java → ...shop/command/api/OrderCakeCommandApi.java
diff --git a/...akeshop/command/api/RecipeCommandApi.java → ...akeshop/command/api/RecipeCommandApi.java b/...akeshop/command/api/RecipeCommandApi.java → ...akeshop/command/api/RecipeCommandApi.java
diff --git a/...tice/services/example/pojo/CakeOrder.java → ...tice/services/example/pojo/CakeOrder.java b/...tice/services/example/pojo/CakeOrder.java → ...tice/services/example/pojo/CakeOrder.java
diff --git a/...leCommandApiInterceptorChainProvider.java → ...leCommandApiInterceptorChainProvider.java b/...leCommandApiInterceptorChainProvider.java → ...leCommandApiInterceptorChainProvider.java
diff --git a/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml b/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...and-api/src/raml/example-command-api.raml → ...and-api/src/raml/example-command-api.raml b/...and-api/src/raml/example-command-api.raml → ...and-api/src/raml/example-command-api.raml
diff --git a/...nd-api/src/raml/json/add-recipe-file.json → ...nd-api/src/raml/json/add-recipe-file.json b/...nd-api/src/raml/json/add-recipe-file.json → ...nd-api/src/raml/json/add-recipe-file.json
diff --git a/...mand-api/src/raml/json/add-recipe-v2.json → ...mand-api/src/raml/json/add-recipe-v2.json b/...mand-api/src/raml/json/add-recipe-v2.json → ...mand-api/src/raml/json/add-recipe-v2.json
diff --git a/...command-api/src/raml/json/add-recipe.json → ...command-api/src/raml/json/add-recipe.json b/...command-api/src/raml/json/add-recipe.json → ...command-api/src/raml/json/add-recipe.json
diff --git a/...d-api/src/raml/json/make-cake-status.json → ...d-api/src/raml/json/make-cake-status.json b/...d-api/src/raml/json/make-cake-status.json → ...d-api/src/raml/json/make-cake-status.json
diff --git a/...-command-api/src/raml/json/make-cake.json → ...-command-api/src/raml/json/make-cake.json b/...-command-api/src/raml/json/make-cake.json → ...-command-api/src/raml/json/make-cake.json
diff --git a/...command-api/src/raml/json/order-cake.json → ...command-api/src/raml/json/order-cake.json b/...command-api/src/raml/json/order-cake.json → ...command-api/src/raml/json/order-cake.json
diff --git a/...mand-api/src/raml/json/remove-recipe.json → ...mand-api/src/raml/json/remove-recipe.json b/...mand-api/src/raml/json/remove-recipe.json → ...mand-api/src/raml/json/remove-recipe.json
diff --git a/...mand-api/src/raml/json/rename-recipe.json → ...mand-api/src/raml/json/rename-recipe.json b/...mand-api/src/raml/json/rename-recipe.json → ...mand-api/src/raml/json/rename-recipe.json
diff --git a/.../json/schema/example.add-recipe-file.json → .../json/schema/example.add-recipe-file.json b/.../json/schema/example.add-recipe-file.json → .../json/schema/example.add-recipe-file.json
diff --git a/...ml/json/schema/example.add-recipe-v2.json → ...ml/json/schema/example.add-recipe-v2.json b/...ml/json/schema/example.add-recipe-v2.json → ...ml/json/schema/example.add-recipe-v2.json
diff --git a/.../raml/json/schema/example.add-recipe.json → .../raml/json/schema/example.add-recipe.json b/.../raml/json/schema/example.add-recipe.json → .../raml/json/schema/example.add-recipe.json
diff --git a/...json/schema/example.make-cake-status.json → ...json/schema/example.make-cake-status.json b/...json/schema/example.make-cake-status.json → ...json/schema/example.make-cake-status.json
diff --git a/...c/raml/json/schema/example.make-cake.json → ...c/raml/json/schema/example.make-cake.json b/...c/raml/json/schema/example.make-cake.json → ...c/raml/json/schema/example.make-cake.json
diff --git a/.../raml/json/schema/example.order-cake.json → .../raml/json/schema/example.order-cake.json b/.../raml/json/schema/example.order-cake.json → .../raml/json/schema/example.order-cake.json
diff --git a/...ml/json/schema/example.remove-recipe.json → ...ml/json/schema/example.remove-recipe.json b/...ml/json/schema/example.remove-recipe.json → ...ml/json/schema/example.remove-recipe.json
diff --git a/...ml/json/schema/example.rename-recipe.json → ...ml/json/schema/example.rename-recipe.json b/...ml/json/schema/example.rename-recipe.json → ...ml/json/schema/example.rename-recipe.json
diff --git a/...son/schema/example.upload-photograph.json → ...son/schema/example.upload-photograph.json b/...son/schema/example.upload-photograph.json → ...son/schema/example.upload-photograph.json
diff --git a/...p/command/api/MakeCakeCommandApiTest.java → ...p/command/api/MakeCakeCommandApiTest.java b/...p/command/api/MakeCakeCommandApiTest.java → ...p/command/api/MakeCakeCommandApiTest.java
diff --git a/.../command/api/OrderCakeCommandApiTest.java → .../command/api/OrderCakeCommandApiTest.java b/.../command/api/OrderCakeCommandApiTest.java → .../command/api/OrderCakeCommandApiTest.java
diff --git a/...hop/command/api/RecipeCommandApiTest.java → ...hop/command/api/RecipeCommandApiTest.java b/...hop/command/api/RecipeCommandApiTest.java → ...hop/command/api/RecipeCommandApiTest.java
diff --git a/...e-command/example-command-handler/pom.xml → ...e-command/example-command-handler/pom.xml b/...e-command/example-command-handler/pom.xml → ...e-command/example-command-handler/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-command</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
             <artifactId>command-handler-interceptors</artifactId>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/...akeshop/command/handler/EventFactory.java → ...akeshop/command/handler/EventFactory.java b/...akeshop/command/handler/EventFactory.java → ...akeshop/command/handler/EventFactory.java
diff --git a/...mmand/handler/MakeCakeCommandHandler.java → ...mmand/handler/MakeCakeCommandHandler.java b/...mmand/handler/MakeCakeCommandHandler.java → ...mmand/handler/MakeCakeCommandHandler.java
diff --git a/...mand/handler/OrderCakeCommandHandler.java → ...mand/handler/OrderCakeCommandHandler.java b/...mand/handler/OrderCakeCommandHandler.java → ...mand/handler/OrderCakeCommandHandler.java
diff --git a/...command/handler/RecipeCommandHandler.java → ...command/handler/RecipeCommandHandler.java b/...command/handler/RecipeCommandHandler.java → ...command/handler/RecipeCommandHandler.java
diff --git a/...akeshop/command/handler/RenameRecipe.java → ...akeshop/command/handler/RenameRecipe.java b/...akeshop/command/handler/RenameRecipe.java → ...akeshop/command/handler/RenameRecipe.java
diff --git a/...mmandHandlerInterceptorChainProvider.java → ...mmandHandlerInterceptorChainProvider.java b/...mmandHandlerInterceptorChainProvider.java → ...mmandHandlerInterceptorChainProvider.java
diff --git a/...ler/src/main/resources/META-INF/beans.xml → ...ler/src/main/resources/META-INF/beans.xml b/...ler/src/main/resources/META-INF/beans.xml → ...ler/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...ml/example-command-handler.messaging.raml → ...ml/example-command-handler.messaging.raml b/...ml/example-command-handler.messaging.raml → ...ml/example-command-handler.messaging.raml
diff --git a/...ler/src/raml/json/command.add-recipe.json → ...ler/src/raml/json/command.add-recipe.json b/...ler/src/raml/json/command.add-recipe.json → ...ler/src/raml/json/command.add-recipe.json
diff --git a/...dler/src/raml/json/command.make-cake.json → ...dler/src/raml/json/command.make-cake.json b/...dler/src/raml/json/command.make-cake.json → ...dler/src/raml/json/command.make-cake.json
diff --git a/...ler/src/raml/json/command.order-cake.json → ...ler/src/raml/json/command.order-cake.json b/...ler/src/raml/json/command.order-cake.json → ...ler/src/raml/json/command.order-cake.json
diff --git a/.../src/raml/json/command.remove-recipe.json → .../src/raml/json/command.remove-recipe.json b/.../src/raml/json/command.remove-recipe.json → .../src/raml/json/command.remove-recipe.json
diff --git a/.../src/raml/json/command.rename-recipe.json → .../src/raml/json/command.rename-recipe.json b/.../src/raml/json/command.rename-recipe.json → .../src/raml/json/command.rename-recipe.json
diff --git a/.../raml/json/command.upload-photograph.json → .../raml/json/command.upload-photograph.json b/.../raml/json/command.upload-photograph.json → .../raml/json/command.upload-photograph.json
diff --git a/...rc/raml/json/recipe-photograph-added.json → ...rc/raml/json/recipe-photograph-added.json b/...rc/raml/json/recipe-photograph-added.json → ...rc/raml/json/recipe-photograph-added.json
diff --git a/...handler/src/raml/json/recipe-removed.json → ...handler/src/raml/json/recipe-removed.json b/...handler/src/raml/json/recipe-removed.json → ...handler/src/raml/json/recipe-removed.json
diff --git a/...handler/src/raml/json/recipe-renamed.json → ...handler/src/raml/json/recipe-renamed.json b/...handler/src/raml/json/recipe-renamed.json → ...handler/src/raml/json/recipe-renamed.json
diff --git a/...on/schema/example.command.add-recipe.json → ...on/schema/example.command.add-recipe.json b/...on/schema/example.command.add-recipe.json → ...on/schema/example.command.add-recipe.json
diff --git a/...son/schema/example.command.make-cake.json → ...son/schema/example.command.make-cake.json b/...son/schema/example.command.make-cake.json → ...son/schema/example.command.make-cake.json
diff --git a/...on/schema/example.command.order-cake.json → ...on/schema/example.command.order-cake.json b/...on/schema/example.command.order-cake.json → ...on/schema/example.command.order-cake.json
diff --git a/...schema/example.command.remove-recipe.json → ...schema/example.command.remove-recipe.json b/...schema/example.command.remove-recipe.json → ...schema/example.command.remove-recipe.json
diff --git a/...schema/example.command.rename-recipe.json → ...schema/example.command.rename-recipe.json b/...schema/example.command.rename-recipe.json → ...schema/example.command.rename-recipe.json
diff --git a/...ma/example.command.upload-photograph.json → ...ma/example.command.upload-photograph.json b/...ma/example.command.upload-photograph.json → ...ma/example.command.upload-photograph.json
diff --git a/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json b/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json
diff --git a/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json b/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json
diff --git a/...ample.events.recipe-photograph-added.json → ...ample.events.recipe-photograph-added.json b/...ample.events.recipe-photograph-added.json → ...ample.events.recipe-photograph-added.json
diff --git a/...schema/example.events.recipe-removed.json → ...schema/example.events.recipe-removed.json b/...schema/example.events.recipe-removed.json → ...schema/example.events.recipe-removed.json
diff --git a/...schema/example.events.recipe-renamed.json → ...schema/example.events.recipe-renamed.json b/...schema/example.events.recipe-renamed.json → ...schema/example.events.recipe-renamed.json
diff --git a/...ler/src/raml/private-event.messaging.raml → ...ler/src/raml/private-event.messaging.raml b/...ler/src/raml/private-event.messaging.raml → ...ler/src/raml/private-event.messaging.raml
diff --git a/...hop/command/handler/EventFactoryTest.java → ...hop/command/handler/EventFactoryTest.java b/...hop/command/handler/EventFactoryTest.java → ...hop/command/handler/EventFactoryTest.java
diff --git a/...d/handler/MakeCakeCommandHandlerTest.java → ...d/handler/MakeCakeCommandHandlerTest.java b/...d/handler/MakeCakeCommandHandlerTest.java → ...d/handler/MakeCakeCommandHandlerTest.java
diff --git a/.../handler/OrderCakeCommandHandlerTest.java → .../handler/OrderCakeCommandHandlerTest.java b/.../handler/OrderCakeCommandHandlerTest.java → .../handler/OrderCakeCommandHandlerTest.java
diff --git a/...and/handler/RecipeCommandHandlerTest.java → ...and/handler/RecipeCommandHandlerTest.java b/...and/handler/RecipeCommandHandlerTest.java → ...and/handler/RecipeCommandHandlerTest.java
diff --git a/...cakeshop/domain/aggregate/RecipeTest.java → ...cakeshop/domain/aggregate/RecipeTest.java b/...cakeshop/domain/aggregate/RecipeTest.java → ...cakeshop/domain/aggregate/RecipeTest.java
diff --git a/example-context/example-command/pom.xml → example-command/pom.xml b/example-context/example-command/pom.xml → example-command/pom.xml
@@ -3,8 +3,8 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/example-context/pom.xml b/example-context/pom.xml
diff --git a/...example-custom/example-custom-api/pom.xml → example-custom/example-custom-api/pom.xml b/...example-custom/example-custom-api/pom.xml → example-custom/example-custom-api/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-custom</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...le/cakeshop/custom/api/OvenCustomApi.java → ...le/cakeshop/custom/api/OvenCustomApi.java b/...le/cakeshop/custom/api/OvenCustomApi.java → ...le/cakeshop/custom/api/OvenCustomApi.java
diff --git a/...eshop/custom/api/response/OvenStatus.java → ...eshop/custom/api/response/OvenStatus.java b/...eshop/custom/api/response/OvenStatus.java → ...eshop/custom/api/response/OvenStatus.java
diff --git a/...shop/custom/api/response/OvensStatus.java → ...shop/custom/api/response/OvensStatus.java b/...shop/custom/api/response/OvensStatus.java → ...shop/custom/api/response/OvensStatus.java
diff --git a/...pleCustomApiInterceptorChainProvider.java → ...pleCustomApiInterceptorChainProvider.java b/...pleCustomApiInterceptorChainProvider.java → ...pleCustomApiInterceptorChainProvider.java
diff --git a/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml b/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...stom-api/src/raml/example-custom-api.raml → ...stom-api/src/raml/example-custom-api.raml b/...stom-api/src/raml/example-custom-api.raml → ...stom-api/src/raml/example-custom-api.raml
diff --git a/...ustom-api/src/raml/json/ovens-status.json → ...ustom-api/src/raml/json/ovens-status.json b/...ustom-api/src/raml/json/ovens-status.json → ...ustom-api/src/raml/json/ovens-status.json
diff --git a/...aml/json/schema/example.ovens-status.json → ...aml/json/schema/example.ovens-status.json b/...aml/json/schema/example.ovens-status.json → ...aml/json/schema/example.ovens-status.json
diff --git a/...akeshop/custom/api/OvenCustomApiTest.java → ...akeshop/custom/api/OvenCustomApiTest.java b/...akeshop/custom/api/OvenCustomApiTest.java → ...akeshop/custom/api/OvenCustomApiTest.java
diff --git a/...p/custom/api/response/OvenStatusTest.java → ...p/custom/api/response/OvenStatusTest.java b/...p/custom/api/response/OvenStatusTest.java → ...p/custom/api/response/OvenStatusTest.java
diff --git a/.../custom/api/response/OvensStatusTest.java → .../custom/api/response/OvensStatusTest.java b/.../custom/api/response/OvensStatusTest.java → .../custom/api/response/OvensStatusTest.java
diff --git a/example-context/example-custom/pom.xml → example-custom/pom.xml b/example-context/example-custom/pom.xml → example-custom/pom.xml
@@ -3,8 +3,8 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/example-context/example-domain/pom.xml → example-domain/pom.xml b/example-context/example-domain/pom.xml → example-domain/pom.xml
@@ -3,8 +3,8 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...s/example/cakeshop/domain/Ingredient.java → ...s/example/cakeshop/domain/Ingredient.java b/...s/example/cakeshop/domain/Ingredient.java → ...s/example/cakeshop/domain/Ingredient.java
diff --git a/...mple/cakeshop/domain/aggregate/Order.java → ...mple/cakeshop/domain/aggregate/Order.java b/...mple/cakeshop/domain/aggregate/Order.java → ...mple/cakeshop/domain/aggregate/Order.java
diff --git a/...ple/cakeshop/domain/aggregate/Recipe.java → ...ple/cakeshop/domain/aggregate/Recipe.java b/...ple/cakeshop/domain/aggregate/Recipe.java → ...ple/cakeshop/domain/aggregate/Recipe.java
diff --git a/...ample/cakeshop/domain/event/CakeMade.java → ...ample/cakeshop/domain/event/CakeMade.java b/...ample/cakeshop/domain/event/CakeMade.java → ...ample/cakeshop/domain/event/CakeMade.java
diff --git a/...le/cakeshop/domain/event/CakeOrdered.java → ...le/cakeshop/domain/event/CakeOrdered.java b/...le/cakeshop/domain/event/CakeOrdered.java → ...le/cakeshop/domain/event/CakeOrdered.java
diff --git a/...le/cakeshop/domain/event/RecipeAdded.java → ...le/cakeshop/domain/event/RecipeAdded.java b/...le/cakeshop/domain/event/RecipeAdded.java → ...le/cakeshop/domain/event/RecipeAdded.java
diff --git a/...p/domain/event/RecipePhotographAdded.java → ...p/domain/event/RecipePhotographAdded.java b/...p/domain/event/RecipePhotographAdded.java → ...p/domain/event/RecipePhotographAdded.java
diff --git a/.../cakeshop/domain/event/RecipeRemoved.java → .../cakeshop/domain/event/RecipeRemoved.java b/.../cakeshop/domain/event/RecipeRemoved.java → .../cakeshop/domain/event/RecipeRemoved.java
diff --git a/.../cakeshop/domain/event/RecipeRenamed.java → .../cakeshop/domain/event/RecipeRenamed.java b/.../cakeshop/domain/event/RecipeRenamed.java → .../cakeshop/domain/event/RecipeRenamed.java
diff --git a/...ain/src/main/resources/META-INF/beans.xml → ...ain/src/main/resources/META-INF/beans.xml b/...ain/src/main/resources/META-INF/beans.xml → ...ain/src/main/resources/META-INF/beans.xml
diff --git a/example-context/example-event-source/pom.xml → example-event-source/pom.xml b/example-context/example-event-source/pom.xml → example-event-source/pom.xml
@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...-event-source/src/yaml/event-sources.yaml → ...-event-source/src/yaml/event-sources.yaml b/...-event-source/src/yaml/event-sources.yaml → ...-event-source/src/yaml/event-sources.yaml
diff --git a/...ample-event/example-event-indexer/pom.xml → example-event/example-event-indexer/pom.xml b/...ample-event/example-event-indexer/pom.xml → example-event/example-event-indexer/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-event</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -76,12 +76,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/...shop/dummy/DummyUnifiedSearchIndexer.java → ...shop/dummy/DummyUnifiedSearchIndexer.java b/...shop/dummy/DummyUnifiedSearchIndexer.java → ...shop/dummy/DummyUnifiedSearchIndexer.java
diff --git a/...my/DummyUnifiedSearchIndexerProducer.java → ...my/DummyUnifiedSearchIndexerProducer.java b/...my/DummyUnifiedSearchIndexerProducer.java → ...my/DummyUnifiedSearchIndexerProducer.java
diff --git a/...xer/src/main/resources/META-INF/beans.xml → ...xer/src/main/resources/META-INF/beans.xml b/...xer/src/main/resources/META-INF/beans.xml → ...xer/src/main/resources/META-INF/beans.xml
diff --git a/...er/src/transformer/cake-ordered-spec.json → ...er/src/transformer/cake-ordered-spec.json b/...er/src/transformer/cake-ordered-spec.json → ...er/src/transformer/cake-ordered-spec.json
diff --git a/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml b/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml
diff --git a/...r/src/yaml/unified-search-descriptor.yaml → ...r/src/yaml/unified-search-descriptor.yaml b/...r/src/yaml/unified-search-descriptor.yaml → ...r/src/yaml/unified-search-descriptor.yaml
diff --git a/...mple-event/example-event-listener/pom.xml → example-event/example-event-listener/pom.xml b/...mple-event/example-event-listener/pom.xml → example-event/example-event-listener/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-event</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -60,12 +60,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/...event/listener/CakeMadeEventListener.java → ...event/listener/CakeMadeEventListener.java b/...event/listener/CakeMadeEventListener.java → ...event/listener/CakeMadeEventListener.java
diff --git a/...nt/listener/CakeOrderedEventListener.java → ...nt/listener/CakeOrderedEventListener.java b/...nt/listener/CakeOrderedEventListener.java → ...nt/listener/CakeOrderedEventListener.java
diff --git a/...p/event/listener/RecipeEventListener.java → ...p/event/listener/RecipeEventListener.java b/...p/event/listener/RecipeEventListener.java → ...p/event/listener/RecipeEventListener.java
diff --git a/...er/RecipeAddedToIngredientsConverter.java → ...er/RecipeAddedToIngredientsConverter.java b/...er/RecipeAddedToIngredientsConverter.java → ...er/RecipeAddedToIngredientsConverter.java
diff --git a/...nverter/RecipeAddedToRecipeConverter.java → ...nverter/RecipeAddedToRecipeConverter.java b/...nverter/RecipeAddedToRecipeConverter.java → ...nverter/RecipeAddedToRecipeConverter.java
diff --git a/...rceptor/ExceptionThrowingInterceptor.java → ...rceptor/ExceptionThrowingInterceptor.java b/...rceptor/ExceptionThrowingInterceptor.java → ...rceptor/ExceptionThrowingInterceptor.java
diff --git a/...interceptor/TestInterceptorException.java → ...interceptor/TestInterceptorException.java b/...interceptor/TestInterceptorException.java → ...interceptor/TestInterceptorException.java
diff --git a/...ventListenerInterceptorChainProvider.java → ...ventListenerInterceptorChainProvider.java b/...ventListenerInterceptorChainProvider.java → ...ventListenerInterceptorChainProvider.java
diff --git a/...ner/src/main/resources/META-INF/beans.xml → ...ner/src/main/resources/META-INF/beans.xml b/...ner/src/main/resources/META-INF/beans.xml → ...ner/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...t/listener/CakeMadeEventListenerTest.java → ...t/listener/CakeMadeEventListenerTest.java b/...t/listener/CakeMadeEventListenerTest.java → ...t/listener/CakeMadeEventListenerTest.java
diff --git a/...istener/CakeOrderedEventListenerTest.java → ...istener/CakeOrderedEventListenerTest.java b/...istener/CakeOrderedEventListenerTest.java → ...istener/CakeOrderedEventListenerTest.java
diff --git a/...ent/listener/RecipeEventListenerTest.java → ...ent/listener/RecipeEventListenerTest.java b/...ent/listener/RecipeEventListenerTest.java → ...ent/listener/RecipeEventListenerTest.java
diff --git a/...ecipeAddedToIngredientsConverterTest.java → ...ecipeAddedToIngredientsConverterTest.java b/...ecipeAddedToIngredientsConverterTest.java → ...ecipeAddedToIngredientsConverterTest.java
diff --git a/...ter/RecipeAddedToRecipeConverterTest.java → ...ter/RecipeAddedToRecipeConverterTest.java b/...ter/RecipeAddedToRecipeConverterTest.java → ...ter/RecipeAddedToRecipeConverterTest.java
diff --git a/...tor/ExceptionThrowingInterceptorTest.java → ...tor/ExceptionThrowingInterceptorTest.java b/...tor/ExceptionThrowingInterceptorTest.java → ...tor/ExceptionThrowingInterceptorTest.java
diff --git a/...ListenerInterceptorChainProviderTest.java → ...ListenerInterceptorChainProviderTest.java b/...ListenerInterceptorChainProviderTest.java → ...ListenerInterceptorChainProviderTest.java
diff --git a/...nt-listener/src/yaml/json/add-recipe.json → ...nt-listener/src/yaml/json/add-recipe.json b/...nt-listener/src/yaml/json/add-recipe.json → ...nt-listener/src/yaml/json/add-recipe.json
diff --git a/...-listener/src/yaml/json/cake-ordered.json → ...-listener/src/yaml/json/cake-ordered.json b/...-listener/src/yaml/json/cake-ordered.json → ...-listener/src/yaml/json/cake-ordered.json
diff --git a/...ent-listener/src/yaml/json/make-cake.json → ...ent-listener/src/yaml/json/make-cake.json b/...ent-listener/src/yaml/json/make-cake.json → ...ent-listener/src/yaml/json/make-cake.json
diff --git a/...rc/yaml/json/recipe-photograph-added.json → ...rc/yaml/json/recipe-photograph-added.json b/...rc/yaml/json/recipe-photograph-added.json → ...rc/yaml/json/recipe-photograph-added.json
diff --git a/...istener/src/yaml/json/recipe-removed.json → ...istener/src/yaml/json/recipe-removed.json b/...istener/src/yaml/json/recipe-removed.json → ...istener/src/yaml/json/recipe-removed.json
diff --git a/...istener/src/yaml/json/recipe-renamed.json → ...istener/src/yaml/json/recipe-renamed.json b/...istener/src/yaml/json/recipe-renamed.json → ...istener/src/yaml/json/recipe-renamed.json
diff --git a/...c/yaml/json/schema/example.cake-made.json → ...c/yaml/json/schema/example.cake-made.json b/...c/yaml/json/schema/example.cake-made.json → ...c/yaml/json/schema/example.cake-made.json
diff --git a/...aml/json/schema/example.cake-ordered.json → ...aml/json/schema/example.cake-ordered.json b/...aml/json/schema/example.cake-ordered.json → ...aml/json/schema/example.cake-ordered.json
diff --git a/...aml/json/schema/example.recipe-added.json → ...aml/json/schema/example.recipe-added.json b/...aml/json/schema/example.recipe-added.json → ...aml/json/schema/example.recipe-added.json
diff --git a/...hema/example.recipe-photograph-added.json → ...hema/example.recipe-photograph-added.json b/...hema/example.recipe-photograph-added.json → ...hema/example.recipe-photograph-added.json
diff --git a/...l/json/schema/example.recipe-removed.json → ...l/json/schema/example.recipe-removed.json b/...l/json/schema/example.recipe-removed.json → ...l/json/schema/example.recipe-removed.json
diff --git a/...l/json/schema/example.recipe-renamed.json → ...l/json/schema/example.recipe-renamed.json b/...l/json/schema/example.recipe-renamed.json → ...l/json/schema/example.recipe-renamed.json
diff --git a/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml b/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml
diff --git a/...ple-event/example-event-processor/pom.xml → ...ple-event/example-event-processor/pom.xml b/...ple-event/example-event-processor/pom.xml → ...ple-event/example-event-processor/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-event</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...ent/processor/CakeMadeEventProcessor.java → ...ent/processor/CakeMadeEventProcessor.java b/...ent/processor/CakeMadeEventProcessor.java → ...ent/processor/CakeMadeEventProcessor.java
diff --git a/.../processor/RecipeAddedEventProcessor.java → .../processor/RecipeAddedEventProcessor.java b/.../processor/RecipeAddedEventProcessor.java → .../processor/RecipeAddedEventProcessor.java
diff --git a/...entProcessorInterceptorChainProvider.java → ...entProcessorInterceptorChainProvider.java b/...entProcessorInterceptorChainProvider.java → ...entProcessorInterceptorChainProvider.java
diff --git a/...sor/src/main/resources/META-INF/beans.xml → ...sor/src/main/resources/META-INF/beans.xml b/...sor/src/main/resources/META-INF/beans.xml → ...sor/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...nt-processor/src/yaml/json/cake-made.json → ...nt-processor/src/yaml/json/cake-made.json b/...nt-processor/src/yaml/json/cake-made.json → ...nt-processor/src/yaml/json/cake-made.json
diff --git a/...processor/src/yaml/json/recipe-added.json → ...processor/src/yaml/json/recipe-added.json b/...processor/src/yaml/json/recipe-added.json → ...processor/src/yaml/json/recipe-added.json
diff --git a/...c/yaml/json/schema/example.cake-made.json → ...c/yaml/json/schema/example.cake-made.json b/...c/yaml/json/schema/example.cake-made.json → ...c/yaml/json/schema/example.cake-made.json
diff --git a/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json b/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json
diff --git a/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json b/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json
diff --git a/...aml/json/schema/example.recipe-added.json → ...aml/json/schema/example.recipe-added.json b/...aml/json/schema/example.recipe-added.json → ...aml/json/schema/example.recipe-added.json
diff --git a/...yaml/public-subscriptions-descriptor.yaml → ...yaml/public-subscriptions-descriptor.yaml b/...yaml/public-subscriptions-descriptor.yaml → ...yaml/public-subscriptions-descriptor.yaml
diff --git a/...or/src/yaml/subscriptions-descriptor.yaml → ...or/src/yaml/subscriptions-descriptor.yaml b/...or/src/yaml/subscriptions-descriptor.yaml → ...or/src/yaml/subscriptions-descriptor.yaml
diff --git a/...xample-event/other-event-listener/pom.xml → example-event/other-event-listener/pom.xml b/...xample-event/other-event-listener/pom.xml → example-event/other-event-listener/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-event</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -56,12 +56,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/...nt/listener/OtherRecipeEventListener.java → ...nt/listener/OtherRecipeEventListener.java b/...nt/listener/OtherRecipeEventListener.java → ...nt/listener/OtherRecipeEventListener.java
diff --git a/...herRecipeAddedToIngredientsConverter.java → ...herRecipeAddedToIngredientsConverter.java b/...herRecipeAddedToIngredientsConverter.java → ...herRecipeAddedToIngredientsConverter.java
diff --git a/...er/OtherRecipeAddedToRecipeConverter.java → ...er/OtherRecipeAddedToRecipeConverter.java b/...er/OtherRecipeAddedToRecipeConverter.java → ...er/OtherRecipeAddedToRecipeConverter.java
diff --git a/...ner/src/main/resources/META-INF/beans.xml → ...ner/src/main/resources/META-INF/beans.xml b/...ner/src/main/resources/META-INF/beans.xml → ...ner/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...vent-listener/src/yaml/event-sources.yaml → ...vent-listener/src/yaml/event-sources.yaml b/...vent-listener/src/yaml/event-sources.yaml → ...vent-listener/src/yaml/event-sources.yaml
diff --git a/...nt-listener/src/yaml/json/add-recipe.json → ...nt-listener/src/yaml/json/add-recipe.json b/...nt-listener/src/yaml/json/add-recipe.json → ...nt-listener/src/yaml/json/add-recipe.json
diff --git a/.../yaml/json/schema/other.recipe-added.json → .../yaml/json/schema/other.recipe-added.json b/.../yaml/json/schema/other.recipe-added.json → .../yaml/json/schema/other.recipe-added.json
diff --git a/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml b/...er/src/yaml/subscriptions-descriptor.yaml → ...er/src/yaml/subscriptions-descriptor.yaml
diff --git a/example-context/example-event/pom.xml → example-event/pom.xml b/example-context/example-event/pom.xml → example-event/pom.xml
@@ -3,8 +3,8 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>uk.gov.justice.services.example</groupId>
-        <artifactId>example-context</artifactId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -233,7 +233,7 @@
                                 <version>${framework.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>uk.gov.justice.services.example</groupId>
+                                <groupId>uk.gov.justice.example</groupId>
                                 <artifactId>example-event-source</artifactId>
                                 <classifier>yaml</classifier>
                                 <version>${project.version}</version>
@@ -282,7 +282,7 @@
                                 <version>${framework.version}</version>
                             </dependency>
                             <dependency>
-                                <groupId>uk.gov.justice.services.example</groupId>
+                                <groupId>uk.gov.justice.example</groupId>
                                 <artifactId>example-event-source</artifactId>
                                 <classifier>yaml</classifier>
                                 <version>${project.version}</version>

diff --git a/...e-context/example-feature-control/pom.xml → example-feature-control/pom.xml b/...e-context/example-feature-control/pom.xml → example-feature-control/pom.xml
@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...trol/example/HardCodedFeatureFetcher.java → ...trol/example/HardCodedFeatureFetcher.java b/...trol/example/HardCodedFeatureFetcher.java → ...trol/example/HardCodedFeatureFetcher.java
diff --git a/...rol/src/main/resources/META-INF/beans.xml → ...rol/src/main/resources/META-INF/beans.xml b/...rol/src/main/resources/META-INF/beans.xml → ...rol/src/main/resources/META-INF/beans.xml
diff --git a/example-context/example-healthcheck/pom.xml → example-healthcheck/pom.xml b/example-context/example-healthcheck/pom.xml → example-healthcheck/pom.xml
@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>example-context</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...eShopIgnoredHealthcheckNamesProvider.java → ...eShopIgnoredHealthcheckNamesProvider.java b/...eShopIgnoredHealthcheckNamesProvider.java → ...eShopIgnoredHealthcheckNamesProvider.java
diff --git a/...eck/src/main/resources/META-INF/beans.xml → ...eck/src/main/resources/META-INF/beans.xml b/...eck/src/main/resources/META-INF/beans.xml → ...eck/src/main/resources/META-INF/beans.xml
diff --git a/...pIgnoredHealthcheckNamesProviderTest.java → ...pIgnoredHealthcheckNamesProviderTest.java b/...pIgnoredHealthcheckNamesProviderTest.java → ...pIgnoredHealthcheckNamesProviderTest.java
diff --git a/...-context/example-integration-test/pom.xml → example-integration-test/pom.xml b/...-context/example-integration-test/pom.xml → example-integration-test/pom.xml
@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>uk.gov.justice.services.example</groupId>
-        <artifactId>example-context</artifactId>
+        <groupId>uk.gov.justice.example</groupId>
+        <artifactId>cake-shop</artifactId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>example-integration-test</artifactId>
@@ -37,7 +37,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-domain</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
@@ -115,7 +115,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
@@ -300,7 +300,7 @@
                         <version>${event-store.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>uk.gov.justice.services.example</groupId>
+                        <groupId>uk.gov.justice.example</groupId>
                         <artifactId>example-viewstore-liquibase</artifactId>
                         <version>${project.version}</version>
                     </dependency>
@@ -331,7 +331,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <dependencies>
                        <dependency>
-                           <groupId>uk.gov.justice.services.example</groupId>
+                           <groupId>uk.gov.justice.example</groupId>
                            <artifactId>example-service</artifactId>
                            <version>${project.version}</version>
                            <type>war</type>
@@ -366,7 +366,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>uk.gov.justice.services.example</groupId>
+                                    <groupId>uk.gov.justice.example</groupId>
                                     <artifactId>example-service</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>

diff --git a/...ndaloneSnapshotJdbcRepositoryFactory.java → ...ndaloneSnapshotJdbcRepositoryFactory.java b/...ndaloneSnapshotJdbcRepositoryFactory.java → ...ndaloneSnapshotJdbcRepositoryFactory.java
diff --git a/...ry/jdbc/event/EventRepositoryFactory.java → ...ry/jdbc/event/EventRepositoryFactory.java b/...ry/jdbc/event/EventRepositoryFactory.java → ...ry/jdbc/event/EventRepositoryFactory.java
diff --git a/...ent/EventStreamJdbsRepositoryFactory.java → ...ent/EventStreamJdbsRepositoryFactory.java b/...ent/EventStreamJdbsRepositoryFactory.java → ...ent/EventStreamJdbsRepositoryFactory.java
diff --git a/...event/LinkedEventRepositoryTruncator.java → ...event/LinkedEventRepositoryTruncator.java b/...event/LinkedEventRepositoryTruncator.java → ...event/LinkedEventRepositoryTruncator.java
diff --git a/...c/event/PublishedEventTableTruncator.java → ...c/event/PublishedEventTableTruncator.java b/...c/event/PublishedEventTableTruncator.java → ...c/event/PublishedEventTableTruncator.java
diff --git a/...le/cakeshop/it/CakeShopConcurrencyIT.java → ...le/cakeshop/it/CakeShopConcurrencyIT.java b/...le/cakeshop/it/CakeShopConcurrencyIT.java → ...le/cakeshop/it/CakeShopConcurrencyIT.java
diff --git a/...CakeShopCrossOriginResourceSharingIT.java → ...CakeShopCrossOriginResourceSharingIT.java b/...CakeShopCrossOriginResourceSharingIT.java → ...CakeShopCrossOriginResourceSharingIT.java
diff --git a/...cakeshop/it/CakeShopEventBufferingIT.java → ...cakeshop/it/CakeShopEventBufferingIT.java b/...cakeshop/it/CakeShopEventBufferingIT.java → ...cakeshop/it/CakeShopEventBufferingIT.java
diff --git a/...ample/cakeshop/it/CakeShopFailuresIT.java → ...ample/cakeshop/it/CakeShopFailuresIT.java b/...ample/cakeshop/it/CakeShopFailuresIT.java → ...ample/cakeshop/it/CakeShopFailuresIT.java
diff --git a/...le/cakeshop/it/CakeShopFileServiceIT.java → ...le/cakeshop/it/CakeShopFileServiceIT.java b/...le/cakeshop/it/CakeShopFileServiceIT.java → ...le/cakeshop/it/CakeShopFileServiceIT.java
diff --git a/...mple/cakeshop/it/CakeShopFilteringIT.java → ...mple/cakeshop/it/CakeShopFilteringIT.java b/...mple/cakeshop/it/CakeShopFilteringIT.java → ...mple/cakeshop/it/CakeShopFilteringIT.java
diff --git a/...vices/example/cakeshop/it/CakeShopIT.java → ...vices/example/cakeshop/it/CakeShopIT.java b/...vices/example/cakeshop/it/CakeShopIT.java → ...vices/example/cakeshop/it/CakeShopIT.java
diff --git a/...le/cakeshop/it/CakeShopManyUpdatesIT.java → ...le/cakeshop/it/CakeShopManyUpdatesIT.java b/...le/cakeshop/it/CakeShopManyUpdatesIT.java → ...le/cakeshop/it/CakeShopManyUpdatesIT.java
diff --git a/...mple/cakeshop/it/CakeShopTimeStampIT.java → ...mple/cakeshop/it/CakeShopTimeStampIT.java b/...mple/cakeshop/it/CakeShopTimeStampIT.java → ...mple/cakeshop/it/CakeShopTimeStampIT.java
diff --git a/...ple/cakeshop/it/CatchupPerformanceIT.java → ...ple/cakeshop/it/CatchupPerformanceIT.java b/...ple/cakeshop/it/CatchupPerformanceIT.java → ...ple/cakeshop/it/CatchupPerformanceIT.java
diff --git a/...s/example/cakeshop/it/EventHealingIT.java → ...s/example/cakeshop/it/EventHealingIT.java b/...s/example/cakeshop/it/EventHealingIT.java → ...s/example/cakeshop/it/EventHealingIT.java
diff --git a/...xample/cakeshop/it/EventValidationIT.java → ...xample/cakeshop/it/EventValidationIT.java b/...xample/cakeshop/it/EventValidationIT.java → ...xample/cakeshop/it/EventValidationIT.java
diff --git a/...xample/cakeshop/it/FeatureTogglingIT.java → ...xample/cakeshop/it/FeatureTogglingIT.java b/...xample/cakeshop/it/FeatureTogglingIT.java → ...xample/cakeshop/it/FeatureTogglingIT.java
diff --git a/...es/example/cakeshop/it/HealthcheckIT.java → ...es/example/cakeshop/it/HealthcheckIT.java b/...es/example/cakeshop/it/HealthcheckIT.java → ...es/example/cakeshop/it/HealthcheckIT.java
diff --git a/...ple/cakeshop/it/ListSystemCommandsIT.java → ...ple/cakeshop/it/ListSystemCommandsIT.java b/...ple/cakeshop/it/ListSystemCommandsIT.java → ...ple/cakeshop/it/ListSystemCommandsIT.java
diff --git a/...p/it/MultipleEventListenerCakeShopIT.java → ...p/it/MultipleEventListenerCakeShopIT.java b/...p/it/MultipleEventListenerCakeShopIT.java → ...p/it/MultipleEventListenerCakeShopIT.java
diff --git a/...rvices/example/cakeshop/it/RebuildIT.java → ...rvices/example/cakeshop/it/RebuildIT.java b/...rvices/example/cakeshop/it/RebuildIT.java → ...rvices/example/cakeshop/it/RebuildIT.java
diff --git a/...ample/cakeshop/it/SnapshotCakeShopIT.java → ...ample/cakeshop/it/SnapshotCakeShopIT.java b/...ample/cakeshop/it/SnapshotCakeShopIT.java → ...ample/cakeshop/it/SnapshotCakeShopIT.java
diff --git a/...rvices/example/cakeshop/it/SuspendIT.java → ...rvices/example/cakeshop/it/SuspendIT.java b/...rvices/example/cakeshop/it/SuspendIT.java → ...rvices/example/cakeshop/it/SuspendIT.java
diff --git a/...e/cakeshop/it/UnifiedSearchIndexerIT.java → ...e/cakeshop/it/UnifiedSearchIndexerIT.java b/...e/cakeshop/it/UnifiedSearchIndexerIT.java → ...e/cakeshop/it/UnifiedSearchIndexerIT.java
diff --git a/...mple/cakeshop/it/helpers/ApiResponse.java → ...mple/cakeshop/it/helpers/ApiResponse.java b/...mple/cakeshop/it/helpers/ApiResponse.java → ...mple/cakeshop/it/helpers/ApiResponse.java
diff --git a/...keshop/it/helpers/BatchEventInserter.java → ...keshop/it/helpers/BatchEventInserter.java b/...keshop/it/helpers/BatchEventInserter.java → ...keshop/it/helpers/BatchEventInserter.java
diff --git a/...op/it/helpers/CakeshopEventGenerator.java → ...op/it/helpers/CakeshopEventGenerator.java b/...op/it/helpers/CakeshopEventGenerator.java → ...op/it/helpers/CakeshopEventGenerator.java
diff --git a/...e/cakeshop/it/helpers/CommandFactory.java → ...e/cakeshop/it/helpers/CommandFactory.java b/...e/cakeshop/it/helpers/CommandFactory.java → ...e/cakeshop/it/helpers/CommandFactory.java
diff --git a/...le/cakeshop/it/helpers/CommandSender.java → ...le/cakeshop/it/helpers/CommandSender.java b/...le/cakeshop/it/helpers/CommandSender.java → ...le/cakeshop/it/helpers/CommandSender.java
diff --git a/.../cakeshop/it/helpers/DatabaseManager.java → .../cakeshop/it/helpers/DatabaseManager.java b/.../cakeshop/it/helpers/DatabaseManager.java → .../cakeshop/it/helpers/DatabaseManager.java
diff --git a/...ple/cakeshop/it/helpers/EventFactory.java → ...ple/cakeshop/it/helpers/EventFactory.java b/...ple/cakeshop/it/helpers/EventFactory.java → ...ple/cakeshop/it/helpers/EventFactory.java
diff --git a/...mple/cakeshop/it/helpers/EventFinder.java → ...mple/cakeshop/it/helpers/EventFinder.java b/...mple/cakeshop/it/helpers/EventFinder.java → ...mple/cakeshop/it/helpers/EventFinder.java
diff --git a/...mple/cakeshop/it/helpers/EventSender.java → ...mple/cakeshop/it/helpers/EventSender.java b/...mple/cakeshop/it/helpers/EventSender.java → ...mple/cakeshop/it/helpers/EventSender.java
diff --git a/...hop/it/helpers/IndexerTableInspector.java → ...hop/it/helpers/IndexerTableInspector.java b/...hop/it/helpers/IndexerTableInspector.java → ...hop/it/helpers/IndexerTableInspector.java
diff --git a/.../cakeshop/it/helpers/JmsBootstrapper.java → .../cakeshop/it/helpers/JmsBootstrapper.java b/.../cakeshop/it/helpers/JmsBootstrapper.java → .../cakeshop/it/helpers/JmsBootstrapper.java
diff --git a/...shop/it/helpers/JmxParametersFactory.java → ...shop/it/helpers/JmxParametersFactory.java b/...shop/it/helpers/JmxParametersFactory.java → ...shop/it/helpers/JmxParametersFactory.java
diff --git a/.../it/helpers/PositionInStreamIterator.java → .../it/helpers/PositionInStreamIterator.java b/.../it/helpers/PositionInStreamIterator.java → .../it/helpers/PositionInStreamIterator.java
diff --git a/...hop/it/helpers/ProcessedEventCounter.java → ...hop/it/helpers/ProcessedEventCounter.java b/...hop/it/helpers/ProcessedEventCounter.java → ...hop/it/helpers/ProcessedEventCounter.java
diff --git a/...hop/it/helpers/PublishedEventCounter.java → ...hop/it/helpers/PublishedEventCounter.java b/...hop/it/helpers/PublishedEventCounter.java → ...hop/it/helpers/PublishedEventCounter.java
diff --git a/.../example/cakeshop/it/helpers/Querier.java → .../example/cakeshop/it/helpers/Querier.java b/.../example/cakeshop/it/helpers/Querier.java → .../example/cakeshop/it/helpers/Querier.java
diff --git a/...hop/it/helpers/RestEasyClientFactory.java → ...hop/it/helpers/RestEasyClientFactory.java b/...hop/it/helpers/RestEasyClientFactory.java → ...hop/it/helpers/RestEasyClientFactory.java
diff --git a/...StandaloneStreamStatusJdbcRepository.java → ...StandaloneStreamStatusJdbcRepository.java b/...StandaloneStreamStatusJdbcRepository.java → ...StandaloneStreamStatusJdbcRepository.java
diff --git a/...oneStreamStatusJdbcRepositoryFactory.java → ...oneStreamStatusJdbcRepositoryFactory.java b/...oneStreamStatusJdbcRepositoryFactory.java → ...oneStreamStatusJdbcRepositoryFactory.java
diff --git a/.../cakeshop/it/helpers/StreamGenerator.java → .../cakeshop/it/helpers/StreamGenerator.java b/.../cakeshop/it/helpers/StreamGenerator.java → .../cakeshop/it/helpers/StreamGenerator.java
diff --git a/...shop/it/helpers/SystemPropertyFinder.java → ...shop/it/helpers/SystemPropertyFinder.java b/...shop/it/helpers/SystemPropertyFinder.java → ...shop/it/helpers/SystemPropertyFinder.java
diff --git a/...le/cakeshop/it/helpers/TestConstants.java → ...le/cakeshop/it/helpers/TestConstants.java b/...le/cakeshop/it/helpers/TestConstants.java → ...le/cakeshop/it/helpers/TestConstants.java
diff --git a/...e/cakeshop/it/helpers/TestProperties.java → ...e/cakeshop/it/helpers/TestProperties.java b/...e/cakeshop/it/helpers/TestProperties.java → ...e/cakeshop/it/helpers/TestProperties.java
diff --git a/...shop/it/helpers/WildflyDeploymentDir.java → ...shop/it/helpers/WildflyDeploymentDir.java b/...shop/it/helpers/WildflyDeploymentDir.java → ...shop/it/helpers/WildflyDeploymentDir.java
diff --git a/...hop/it/helpers/WildflyFeatureUpdater.java → ...hop/it/helpers/WildflyFeatureUpdater.java b/...hop/it/helpers/WildflyFeatureUpdater.java → ...hop/it/helpers/WildflyFeatureUpdater.java
diff --git a/...akeshop/it/params/CakeShopMediaTypes.java → ...akeshop/it/params/CakeShopMediaTypes.java b/...akeshop/it/params/CakeShopMediaTypes.java → ...akeshop/it/params/CakeShopMediaTypes.java
diff --git a/...mple/cakeshop/it/params/CakeShopUris.java → ...mple/cakeshop/it/params/CakeShopUris.java b/...mple/cakeshop/it/params/CakeShopUris.java → ...mple/cakeshop/it/params/CakeShopUris.java
diff --git a/...ation-test/src/test/resources/croydon.jpg → ...ation-test/src/test/resources/croydon.jpg b/...ation-test/src/test/resources/croydon.jpg → ...ation-test/src/test/resources/croydon.jpg
diff --git a/...n-test/src/test/resources/test.properties → ...n-test/src/test/resources/test.properties b/...n-test/src/test/resources/test.properties → ...n-test/src/test/resources/test.properties
diff --git a/...ldfly-config/application-roles.properties → ...ldfly-config/application-roles.properties b/...ldfly-config/application-roles.properties → ...ldfly-config/application-roles.properties
diff --git a/...ldfly-config/application-users.properties → ...ldfly-config/application-users.properties b/...ldfly-config/application-users.properties → ...ldfly-config/application-users.properties
diff --git a/...rces/wildfly-config/mgmt-users.properties → ...rces/wildfly-config/mgmt-users.properties b/...rces/wildfly-config/mgmt-users.properties → ...rces/wildfly-config/mgmt-users.properties
diff --git a/...t/resources/wildfly-config/standalone.xml → ...t/resources/wildfly-config/standalone.xml b/...t/resources/wildfly-config/standalone.xml → ...t/resources/wildfly-config/standalone.xml
diff --git a/...ly-modules/org/postgresql/main/module.xml → ...ly-modules/org/postgresql/main/module.xml b/...ly-modules/org/postgresql/main/module.xml → ...ly-modules/org/postgresql/main/module.xml
diff --git a/...mple-integration-test/start-server-it.bat → example-integration-test/start-server-it.bat b/...mple-integration-test/start-server-it.bat → example-integration-test/start-server-it.bat
diff --git a/...ample-integration-test/start-server-it.sh → example-integration-test/start-server-it.sh b/...ample-integration-test/start-server-it.sh → example-integration-test/start-server-it.sh
diff --git a/...t/example-query/example-query-api/pom.xml → example-query/example-query-api/pom.xml b/...t/example-query/example-query-api/pom.xml → example-query/example-query-api/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-query</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -83,7 +83,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
@@ -123,7 +123,7 @@
                         <version>${javaee-api.version}</version>
                     </dependency>
                     <dependency>
-                        <groupId>uk.gov.justice.services.example</groupId>
+                        <groupId>uk.gov.justice.example</groupId>
                         <artifactId>example-query-view</artifactId>
                         <version>${project.version}</version>
                         <classifier>raml</classifier>

diff --git a/...akeshop/query/api/CakeOrdersQueryApi.java → ...akeshop/query/api/CakeOrdersQueryApi.java b/...akeshop/query/api/CakeOrdersQueryApi.java → ...akeshop/query/api/CakeOrdersQueryApi.java
diff --git a/...ple/cakeshop/query/api/CakesQueryApi.java → ...ple/cakeshop/query/api/CakesQueryApi.java b/...ple/cakeshop/query/api/CakesQueryApi.java → ...ple/cakeshop/query/api/CakesQueryApi.java
diff --git a/...ple/cakeshop/query/api/IndexQueryApi.java → ...ple/cakeshop/query/api/IndexQueryApi.java b/...ple/cakeshop/query/api/IndexQueryApi.java → ...ple/cakeshop/query/api/IndexQueryApi.java
diff --git a/...e/cakeshop/query/api/RecipesQueryApi.java → ...e/cakeshop/query/api/RecipesQueryApi.java b/...e/cakeshop/query/api/RecipesQueryApi.java → ...e/cakeshop/query/api/RecipesQueryApi.java
diff --git a/...akeshop/query/api/request/SearchCake.java → ...akeshop/query/api/request/SearchCake.java b/...akeshop/query/api/request/SearchCake.java → ...akeshop/query/api/request/SearchCake.java
diff --git a/...op/query/api/request/SearchCakeOrder.java → ...op/query/api/request/SearchCakeOrder.java b/...op/query/api/request/SearchCakeOrder.java → ...op/query/api/request/SearchCakeOrder.java
diff --git a/...keshop/query/api/request/SearchIndex.java → ...keshop/query/api/request/SearchIndex.java b/...keshop/query/api/request/SearchIndex.java → ...keshop/query/api/request/SearchIndex.java
diff --git a/...shop/query/api/request/SearchRecipes.java → ...shop/query/api/request/SearchRecipes.java b/...shop/query/api/request/SearchRecipes.java → ...shop/query/api/request/SearchRecipes.java
diff --git a/...hop/query/api/response/CakeOrderView.java → ...hop/query/api/response/CakeOrderView.java b/...hop/query/api/response/CakeOrderView.java → ...hop/query/api/response/CakeOrderView.java
diff --git a/...akeshop/query/api/response/CakesView.java → ...akeshop/query/api/response/CakesView.java b/...akeshop/query/api/response/CakesView.java → ...akeshop/query/api/response/CakesView.java
diff --git a/...akeshop/query/api/response/IndexView.java → ...akeshop/query/api/response/IndexView.java b/...akeshop/query/api/response/IndexView.java → ...akeshop/query/api/response/IndexView.java
diff --git a/...keshop/query/api/response/RecipeView.java → ...keshop/query/api/response/RecipeView.java b/...keshop/query/api/response/RecipeView.java → ...keshop/query/api/response/RecipeView.java
diff --git a/...eshop/query/api/response/RecipesView.java → ...eshop/query/api/response/RecipesView.java b/...eshop/query/api/response/RecipesView.java → ...eshop/query/api/response/RecipesView.java
diff --git a/...mpleQueryApiInterceptorChainProvider.java → ...mpleQueryApiInterceptorChainProvider.java b/...mpleQueryApiInterceptorChainProvider.java → ...mpleQueryApiInterceptorChainProvider.java
diff --git a/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml b/...api/src/main/resources/META-INF/beans.xml → ...api/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...query-api/src/raml/example-query-api.raml → ...query-api/src/raml/example-query-api.raml b/...query-api/src/raml/example-query-api.raml → ...query-api/src/raml/example-query-api.raml
diff --git a/...xample-query-api/src/raml/json/cakes.json → ...xample-query-api/src/raml/json/cakes.json b/...xample-query-api/src/raml/json/cakes.json → ...xample-query-api/src/raml/json/cakes.json
diff --git a/...xample-query-api/src/raml/json/index.json → ...xample-query-api/src/raml/json/index.json b/...xample-query-api/src/raml/json/index.json → ...xample-query-api/src/raml/json/index.json
diff --git a/...xample-query-api/src/raml/json/order.json → ...xample-query-api/src/raml/json/order.json b/...xample-query-api/src/raml/json/order.json → ...xample-query-api/src/raml/json/order.json
diff --git a/...uery-api/src/raml/json/query-recipes.json → ...uery-api/src/raml/json/query-recipes.json b/...uery-api/src/raml/json/query-recipes.json → ...uery-api/src/raml/json/query-recipes.json
diff --git a/...-api/src/raml/json/recipe-photograph.json → ...-api/src/raml/json/recipe-photograph.json b/...-api/src/raml/json/recipe-photograph.json → ...-api/src/raml/json/recipe-photograph.json
diff --git a/...ample-query-api/src/raml/json/recipe.json → ...ample-query-api/src/raml/json/recipe.json b/...ample-query-api/src/raml/json/recipe.json → ...ample-query-api/src/raml/json/recipe.json
diff --git a/...mple-query-api/src/raml/json/recipes.json → ...mple-query-api/src/raml/json/recipes.json b/...mple-query-api/src/raml/json/recipes.json → ...mple-query-api/src/raml/json/recipes.json
diff --git a/...c/raml/json/schema/example.get-order.json → ...c/raml/json/schema/example.get-order.json b/...c/raml/json/schema/example.get-order.json → ...c/raml/json/schema/example.get-order.json
diff --git a/...schema/example.get-recipe-photograph.json → ...schema/example.get-recipe-photograph.json b/...schema/example.get-recipe-photograph.json → ...schema/example.get-recipe-photograph.json
diff --git a/.../raml/json/schema/example.get-recipe.json → .../raml/json/schema/example.get-recipe.json b/.../raml/json/schema/example.get-recipe.json → .../raml/json/schema/example.get-recipe.json
diff --git a/...ml/json/schema/example.query-recipes.json → ...ml/json/schema/example.query-recipes.json b/...ml/json/schema/example.query-recipes.json → ...ml/json/schema/example.query-recipes.json
diff --git a/...aml/json/schema/example.search-cakes.json → ...aml/json/schema/example.search-cakes.json b/...aml/json/schema/example.search-cakes.json → ...aml/json/schema/example.search-cakes.json
diff --git a/...aml/json/schema/example.search-index.json → ...aml/json/schema/example.search-index.json b/...aml/json/schema/example.search-index.json → ...aml/json/schema/example.search-index.json
diff --git a/...l/json/schema/example.search-recipes.json → ...l/json/schema/example.search-recipes.json b/...l/json/schema/example.search-recipes.json → ...l/json/schema/example.search-recipes.json
diff --git a/...hop/query/api/CakeOrdersQueryApiTest.java → ...hop/query/api/CakeOrdersQueryApiTest.java b/...hop/query/api/CakeOrdersQueryApiTest.java → ...hop/query/api/CakeOrdersQueryApiTest.java
diff --git a/...cakeshop/query/api/CakesQueryApiTest.java → ...cakeshop/query/api/CakesQueryApiTest.java b/...cakeshop/query/api/CakesQueryApiTest.java → ...cakeshop/query/api/CakesQueryApiTest.java
diff --git a/...cakeshop/query/api/IndexQueryApiTest.java → ...cakeshop/query/api/IndexQueryApiTest.java b/...cakeshop/query/api/IndexQueryApiTest.java → ...cakeshop/query/api/IndexQueryApiTest.java
diff --git a/...keshop/query/api/RecipesQueryApiTest.java → ...keshop/query/api/RecipesQueryApiTest.java b/...keshop/query/api/RecipesQueryApiTest.java → ...keshop/query/api/RecipesQueryApiTest.java
diff --git a/.../example-query/example-query-view/pom.xml → example-query/example-query-view/pom.xml b/.../example-query/example-query-view/pom.xml → example-query/example-query-view/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>example-query</artifactId>
-        <groupId>uk.gov.justice.services.example</groupId>
+        <groupId>uk.gov.justice.example</groupId>
         <version>17.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
             <artifactId>rest-adapter-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.services.example</groupId>
+            <groupId>uk.gov.justice.example</groupId>
             <artifactId>example-viewstore-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/...eshop/query/view/CakeOrdersQueryView.java → ...eshop/query/view/CakeOrdersQueryView.java b/...eshop/query/view/CakeOrdersQueryView.java → ...eshop/query/view/CakeOrdersQueryView.java
diff --git a/...e/cakeshop/query/view/CakesQueryView.java → ...e/cakeshop/query/view/CakesQueryView.java b/...e/cakeshop/query/view/CakesQueryView.java → ...e/cakeshop/query/view/CakesQueryView.java
diff --git a/...e/cakeshop/query/view/IndexQueryView.java → ...e/cakeshop/query/view/IndexQueryView.java b/...e/cakeshop/query/view/IndexQueryView.java → ...e/cakeshop/query/view/IndexQueryView.java
diff --git a/...cakeshop/query/view/RecipesQueryView.java → ...cakeshop/query/view/RecipesQueryView.java b/...cakeshop/query/view/RecipesQueryView.java → ...cakeshop/query/view/RecipesQueryView.java
diff --git a/...p/query/view/request/SearchCakeOrder.java → ...p/query/view/request/SearchCakeOrder.java b/...p/query/view/request/SearchCakeOrder.java → ...p/query/view/request/SearchCakeOrder.java
diff --git a/...eshop/query/view/request/SearchIndex.java → ...eshop/query/view/request/SearchIndex.java b/...eshop/query/view/request/SearchIndex.java → ...eshop/query/view/request/SearchIndex.java
diff --git a/...hop/query/view/request/SearchRecipes.java → ...hop/query/view/request/SearchRecipes.java b/...hop/query/view/request/SearchRecipes.java → ...hop/query/view/request/SearchRecipes.java
diff --git a/...op/query/view/response/CakeOrderView.java → ...op/query/view/response/CakeOrderView.java b/...op/query/view/response/CakeOrderView.java → ...op/query/view/response/CakeOrderView.java
diff --git a/...akeshop/query/view/response/CakeView.java → ...akeshop/query/view/response/CakeView.java b/...akeshop/query/view/response/CakeView.java → ...akeshop/query/view/response/CakeView.java
diff --git a/...keshop/query/view/response/CakesView.java → ...keshop/query/view/response/CakesView.java b/...keshop/query/view/response/CakesView.java → ...keshop/query/view/response/CakesView.java
diff --git a/...keshop/query/view/response/IndexView.java → ...keshop/query/view/response/IndexView.java b/...keshop/query/view/response/IndexView.java → ...keshop/query/view/response/IndexView.java
diff --git a/...keshop/query/view/response/PhotoView.java → ...keshop/query/view/response/PhotoView.java b/...keshop/query/view/response/PhotoView.java → ...keshop/query/view/response/PhotoView.java
diff --git a/...eshop/query/view/response/RecipeView.java → ...eshop/query/view/response/RecipeView.java b/...eshop/query/view/response/RecipeView.java → ...eshop/query/view/response/RecipeView.java
diff --git a/...shop/query/view/response/RecipesView.java → ...shop/query/view/response/RecipesView.java b/...shop/query/view/response/RecipesView.java → ...shop/query/view/response/RecipesView.java
diff --git a/.../query/view/service/CakeOrderService.java → .../query/view/service/CakeOrderService.java b/.../query/view/service/CakeOrderService.java → .../query/view/service/CakeOrderService.java
diff --git a/...eshop/query/view/service/CakeService.java → ...eshop/query/view/service/CakeService.java b/...eshop/query/view/service/CakeService.java → ...eshop/query/view/service/CakeService.java
diff --git a/...shop/query/view/service/IndexService.java → ...shop/query/view/service/IndexService.java b/...shop/query/view/service/IndexService.java → ...shop/query/view/service/IndexService.java
diff --git a/...hop/query/view/service/RecipeService.java → ...hop/query/view/service/RecipeService.java b/...hop/query/view/service/RecipeService.java → ...hop/query/view/service/RecipeService.java
diff --git a/...pleQueryViewInterceptorChainProvider.java → ...pleQueryViewInterceptorChainProvider.java b/...pleQueryViewInterceptorChainProvider.java → ...pleQueryViewInterceptorChainProvider.java
diff --git a/...iew/src/main/resources/META-INF/beans.xml → ...iew/src/main/resources/META-INF/beans.xml b/...iew/src/main/resources/META-INF/beans.xml → ...iew/src/main/resources/META-INF/beans.xml
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...ery-view/src/raml/example-query-view.raml → ...ery-view/src/raml/example-query-view.raml b/...ery-view/src/raml/example-query-view.raml → ...ery-view/src/raml/example-query-view.raml
diff --git a/...ample-query-view/src/raml/json/cakes.json → ...ample-query-view/src/raml/json/cakes.json b/...ample-query-view/src/raml/json/cakes.json → ...ample-query-view/src/raml/json/cakes.json
diff --git a/...ample-query-view/src/raml/json/index.json → ...ample-query-view/src/raml/json/index.json b/...ample-query-view/src/raml/json/index.json → ...ample-query-view/src/raml/json/index.json
diff --git a/...ample-query-view/src/raml/json/order.json → ...ample-query-view/src/raml/json/order.json b/...ample-query-view/src/raml/json/order.json → ...ample-query-view/src/raml/json/order.json
diff --git a/...ery-view/src/raml/json/query-recipes.json → ...ery-view/src/raml/json/query-recipes.json b/...ery-view/src/raml/json/query-recipes.json → ...ery-view/src/raml/json/query-recipes.json
diff --git a/...view/src/raml/json/recipe-photograph.json → ...view/src/raml/json/recipe-photograph.json b/...view/src/raml/json/recipe-photograph.json → ...view/src/raml/json/recipe-photograph.json
diff --git a/...mple-query-view/src/raml/json/recipe.json → ...mple-query-view/src/raml/json/recipe.json b/...mple-query-view/src/raml/json/recipe.json → ...mple-query-view/src/raml/json/recipe.json
diff --git a/...ple-query-view/src/raml/json/recipes.json → ...ple-query-view/src/raml/json/recipes.json b/...ple-query-view/src/raml/json/recipes.json → ...ple-query-view/src/raml/json/recipes.json
diff --git a/...c/raml/json/schema/example.get-order.json → ...c/raml/json/schema/example.get-order.json b/...c/raml/json/schema/example.get-order.json → ...c/raml/json/schema/example.get-order.json
diff --git a/...schema/example.get-recipe-photograph.json → ...schema/example.get-recipe-photograph.json b/...schema/example.get-recipe-photograph.json → ...schema/example.get-recipe-photograph.json
diff --git a/.../raml/json/schema/example.get-recipe.json → .../raml/json/schema/example.get-recipe.json b/.../raml/json/schema/example.get-recipe.json → .../raml/json/schema/example.get-recipe.json
diff --git a/...ml/json/schema/example.query-recipes.json → ...ml/json/schema/example.query-recipes.json b/...ml/json/schema/example.query-recipes.json → ...ml/json/schema/example.query-recipes.json
diff --git a/...aml/json/schema/example.search-cakes.json → ...aml/json/schema/example.search-cakes.json b/...aml/json/schema/example.search-cakes.json → ...aml/json/schema/example.search-cakes.json
diff --git a/...aml/json/schema/example.search-index.json → ...aml/json/schema/example.search-index.json b/...aml/json/schema/example.search-index.json → ...aml/json/schema/example.search-index.json
diff --git a/...l/json/schema/example.search-recipes.json → ...l/json/schema/example.search-recipes.json b/...l/json/schema/example.search-recipes.json → ...l/json/schema/example.search-recipes.json
diff --git a/...query/api/request/CakesQueryViewTest.java → ...query/api/request/CakesQueryViewTest.java b/...query/api/request/CakesQueryViewTest.java → ...query/api/request/CakesQueryViewTest.java