diff --git a/src/main/java/ch/hepia/mq/Message.java b/src/main/java/ch/hepia/mq/Message.java
index c53885e1f7fab5a2a15980427c81680e1713d383..689c4198b693ff051c097dc82fd5176932c24db4 100644
--- a/src/main/java/ch/hepia/mq/Message.java
+++ b/src/main/java/ch/hepia/mq/Message.java
@@ -2,16 +2,20 @@ package ch.hepia.mq;
 import java.io.Serializable;
 
 public final class Message implements Serializable {
+    public static enum Type {
+        JoinedJourney, LeftJourney
+    }
+    
     private static final long serialVersionUID = 0xAEF34565673L;
-    private final MessageType type;
+    private final Type type;
     private byte[] data;
 
-    public <T extends Serializable> Message(MessageType type, T object) {
+    public <T extends Serializable> Message(Type type, T object) {
         this.type = type;
         this.data = MessageQueue.serialize(object);
     }
 
-    public MessageType getMessageType() {
+    public Type getMessageType() {
         return this.type;
     }
 
diff --git a/src/main/java/ch/hepia/mq/MessageManager.java b/src/main/java/ch/hepia/mq/MessageManager.java
index 36eb33da35da5a6bbaf8f195a118c39a413716fd..2a5f84dc3ba360f32132a756742186b0e3d4a95a 100644
--- a/src/main/java/ch/hepia/mq/MessageManager.java
+++ b/src/main/java/ch/hepia/mq/MessageManager.java
@@ -16,7 +16,7 @@ public class MessageManager extends MessageQueue {
     /*
      * Private functions
      */
-    private <T extends Serializable> void sendEvent(MessageType type, T event) {
+    private <T extends Serializable> void sendEvent(Message.Type type, T event) {
         Message m = new Message(type, event);
         try {
             this.sendBytes(MessageQueue.serialize(m));
@@ -25,7 +25,7 @@ public class MessageManager extends MessageQueue {
         }
     }
 
-    private <T extends Serializable> void conditionalSubscribe(MessageType type, Consumer<T> eventHandler,
+    private <T extends Serializable> void conditionalSubscribe(Message.Type type, Consumer<T> eventHandler,
             Predicate<T> condition) {
         Consumer<byte[]> consumer = (bytes) -> {
             Message receivedMessage = MessageQueue.unserialize(bytes);
@@ -52,18 +52,18 @@ public class MessageManager extends MessageQueue {
 
     public void conditionalSubscribeJoinedJourney(Consumer<JoinedJourney> eventHandler,
             Predicate<JoinedJourney> condition) {
-        this.conditionalSubscribe(MessageType.JoinedJourney, eventHandler, condition);
+        this.conditionalSubscribe(Message.Type.JoinedJourney, eventHandler, condition);
     }
 
     public void conditionalSubscribeLeftJourney(Consumer<LeftJourney> eventHandler, Predicate<LeftJourney> condition) {
-        this.conditionalSubscribe(MessageType.LeftJourney, eventHandler, condition);
+        this.conditionalSubscribe(Message.Type.LeftJourney, eventHandler, condition);
     }
 
     public void sendJoinedJourney(JoinedJourney event) {
-        this.sendEvent(MessageType.JoinedJourney, event);
+        this.sendEvent(Message.Type.JoinedJourney, event);
     }
 
     public void sendLeftJourney(LeftJourney event) {
-        this.sendEvent(MessageType.LeftJourney, event);
+        this.sendEvent(Message.Type.LeftJourney, event);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ch/hepia/mq/MessageType.java b/src/main/java/ch/hepia/mq/MessageType.java
deleted file mode 100644
index 5db2e83ec9a924e87674bec47c0f4086e8dd523d..0000000000000000000000000000000000000000
--- a/src/main/java/ch/hepia/mq/MessageType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package ch.hepia.mq;
-
-public enum MessageType {
-    JoinedJourney, LeftJourney
-}
\ No newline at end of file