diff --git a/pom.xml b/pom.xml
index a1fb653dfda0779f3e5c3e4c55918830ddf43c17..59c40cf166f6db003762fb285f767f0045598d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.takima</groupId>
diff --git a/src/main/java/io/takima/temporalpractice/bakery/CookieOrderer.java b/src/main/java/io/takima/temporalpractice/bakery/MakeCookiesApp.java
similarity index 76%
rename from src/main/java/io/takima/temporalpractice/bakery/CookieOrderer.java
rename to src/main/java/io/takima/temporalpractice/bakery/MakeCookiesApp.java
index a369b38fc96c9dd67aa13d97fae940a8e0573d98..e7c4d63d7ac9d0b0d1997e1ebd219b661d24ca90 100644
--- a/src/main/java/io/takima/temporalpractice/bakery/CookieOrderer.java
+++ b/src/main/java/io/takima/temporalpractice/bakery/MakeCookiesApp.java
@@ -1,6 +1,6 @@
 package io.takima.temporalpractice.bakery;
 
-public class CookieOrderer {
+public class MakeCookiesApp {
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/io/takima/temporalpractice/bakery/OrderCookiesApp.java b/src/main/java/io/takima/temporalpractice/bakery/OrderCookiesApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fb1fc1c17456c25d89d80f5677d869acde29bec
--- /dev/null
+++ b/src/main/java/io/takima/temporalpractice/bakery/OrderCookiesApp.java
@@ -0,0 +1,6 @@
+package io.takima.temporalpractice.bakery;
+
+public class OrderCookiesApp {
+    public static void main(String[] args) {
+    }
+}
diff --git a/src/main/java/io/takima/temporalpractice/bakery/bake/BakeService.java b/src/main/java/io/takima/temporalpractice/bakery/bake/BakeService.java
deleted file mode 100644
index 66a48c3f3e5bcc80be8ab7de974826ab96b31088..0000000000000000000000000000000000000000
--- a/src/main/java/io/takima/temporalpractice/bakery/bake/BakeService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.takima.temporalpractice.bakery.bake;
-
-public interface BakeService {
-    void bake();
-}
diff --git a/src/main/java/io/takima/temporalpractice/bakery/cookie/BestCookieWorkflow.java b/src/main/java/io/takima/temporalpractice/bakery/cookie/BestCookieWorkflow.java
deleted file mode 100644
index 68fa2403a14d682d97ad474a3ab8613c536a3994..0000000000000000000000000000000000000000
--- a/src/main/java/io/takima/temporalpractice/bakery/cookie/BestCookieWorkflow.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.takima.temporalpractice.bakery.cookie;
-
-public class BestCookieWorkflow {
-    public void orderCookie() {
-        System.out.println("Cookie ordered... Miam");
-    }
-}
diff --git a/src/main/java/io/takima/temporalpractice/bakery/kitchen/KitchenWorkflowImpl.java b/src/main/java/io/takima/temporalpractice/bakery/kitchen/KitchenWorkflowImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..41dcf8c26a48702bd6b2fa1b233901c06d85b749
--- /dev/null
+++ b/src/main/java/io/takima/temporalpractice/bakery/kitchen/KitchenWorkflowImpl.java
@@ -0,0 +1,8 @@
+package io.takima.temporalpractice.bakery.kitchen;
+
+public class KitchenWorkflowImpl {
+    public void makeCookies() {
+        System.out.println("I'm making cookies");
+        System.out.println("Cookies are done!");
+    }
+}
diff --git a/src/main/java/io/takima/temporalpractice/bakery/kitchen/bake/BakeService.java b/src/main/java/io/takima/temporalpractice/bakery/kitchen/bake/BakeService.java
new file mode 100644
index 0000000000000000000000000000000000000000..50b3b72cfd96efc5d70ec48ab9aa0549074ba88a
--- /dev/null
+++ b/src/main/java/io/takima/temporalpractice/bakery/kitchen/bake/BakeService.java
@@ -0,0 +1,5 @@
+package io.takima.temporalpractice.bakery.kitchen.bake;
+
+public interface BakeService {
+    void bake();
+}
diff --git a/src/main/java/io/takima/temporalpractice/bakery/batter/BatterService.java b/src/main/java/io/takima/temporalpractice/bakery/kitchen/batter/BatterService.java
similarity index 51%
rename from src/main/java/io/takima/temporalpractice/bakery/batter/BatterService.java
rename to src/main/java/io/takima/temporalpractice/bakery/kitchen/batter/BatterService.java
index 486e82f5ed12bed568ecc0e77ad98631556d8559..ce25b125b72510bd8b4f15f3145314b5e4ee7b09 100644
--- a/src/main/java/io/takima/temporalpractice/bakery/batter/BatterService.java
+++ b/src/main/java/io/takima/temporalpractice/bakery/kitchen/batter/BatterService.java
@@ -1,4 +1,4 @@
-package io.takima.temporalpractice.bakery.batter;
+package io.takima.temporalpractice.bakery.kitchen.batter;
 
 public interface BatterService {
     void prepareBatter();