diff --git a/src/main/java/com/example/livecodingjavaspring/App.java b/src/main/java/com/example/livecodingjavaspring/App.java
index 36bb5700cc93b2797aedf7538786e87e4f04aa03..2715c6ae0bc811fd979e92c665d4db2b2cc2f34c 100644
--- a/src/main/java/com/example/livecodingjavaspring/App.java
+++ b/src/main/java/com/example/livecodingjavaspring/App.java
@@ -2,13 +2,9 @@ package com.example.livecodingjavaspring;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Scanner;
-
-import static java.lang.Integer.parseInt;
 
 public class App {
     public static void main(String[] args) {
-        System.out.println("Hello word");
         List<User> users = new ArrayList<>();
         users.add(new User("Laurine", "LE NET", 24));
         users.add(new User("Pilou", "BERTRAND", 24));
@@ -18,31 +14,7 @@ public class App {
         users.add(new User("Camille", "ONETTE", 23));
         users.add(new User("Jean", "TENRIEN", 22));
         users.add(new User("Lara", "TATOUILLE", 24));
-        users.forEach(System.out::println);
-
-        int choice = -1;
-        while (choice != 0) {
-            Scanner scanner = new Scanner(System.in);
-            System.out.println("Hello jeune Peufien ! dans ma super CLI");
-            System.out.println("Que veux-tu faire ?");
-            System.out.println("1- Lister les utilisateurs");
-            System.out.println("2- Ajouter un utilisateur");
-            choice = parseInt(scanner.next());
-            switch (choice) {
-                case 1-> users.forEach(System.out::println);
-                case 2 -> {
-                    System.out.println("Prénom de l'utilisateur");
-                    String firstname = scanner.next();
-                    System.out.println("Nom de l'utilisateur");
-                    String lastname = scanner.next();
-                    System.out.println("Age de l'utilisateur");
-                    String age = scanner.next();
-                    users.add(new User(firstname, lastname, Integer.valueOf(age)));
-                    users.forEach(System.out::println);
-                }
-                case 0 -> System.exit(0);
-                default -> System.out.println("Mauvaise commande");
-            }
-        }
+        Cli cli = new Cli(users);
+        cli.run();
     }
 }
diff --git a/src/main/java/com/example/livecodingjavaspring/Cli.java b/src/main/java/com/example/livecodingjavaspring/Cli.java
new file mode 100644
index 0000000000000000000000000000000000000000..497eba092e3d138cb0a9ba85363e44c381772751
--- /dev/null
+++ b/src/main/java/com/example/livecodingjavaspring/Cli.java
@@ -0,0 +1,40 @@
+package com.example.livecodingjavaspring;
+
+import java.util.List;
+import java.util.Scanner;
+
+import static java.lang.Integer.parseInt;
+
+public class Cli {
+    private List<User> users;
+
+    public Cli(List<User> users) {
+        this.users = users;
+    }
+    public void run() {
+        int choice = -1;
+        while (choice != 0) {
+            Scanner scanner = new Scanner(System.in);
+            System.out.println("Hello jeune Peufien ! dans ma super CLI");
+            System.out.println("Que veux-tu faire ?");
+            System.out.println("1- Lister les utilisateurs");
+            System.out.println("2- Ajouter un utilisateur");
+            choice = scanner.nextInt();
+            switch (choice) {
+                case 1-> users.forEach(System.out::println);
+                case 2 -> {
+                    System.out.println("Prénom de l'utilisateur");
+                    String firstname = scanner.next();
+                    System.out.println("Nom de l'utilisateur");
+                    String lastname = scanner.next();
+                    System.out.println("Age de l'utilisateur");
+                    String age = scanner.next();
+                    users.add(new User(firstname, lastname, Integer.valueOf(age)));
+                    users.forEach(System.out::println);
+                }
+                case 0 -> System.exit(0);
+                default -> System.out.println("Mauvaise commande");
+            }
+        }
+    }
+}