diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
index 2ea592eb..5388f3ae 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java
@@ -11,7 +11,7 @@ import org.dna.mqtt.moquette.messaging.spi.impl.events.PubAckEvent;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
-import org.dna.mqtt.moquette.proto.PubCompMessage;
+import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
 import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
 import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
index e00a772f..d8141dee 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
@@ -14,7 +14,7 @@ import org.dna.mqtt.moquette.messaging.spi.IMessaging;
 import org.dna.mqtt.moquette.messaging.spi.IStorageService;
 import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
 import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
-import org.dna.mqtt.moquette.proto.PubCompMessage;
+import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
 import org.dna.mqtt.moquette.proto.messages.*;
 import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
 import org.dna.mqtt.moquette.server.ConnectionDescriptor;
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
index 5c658f28..ec0b6392 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java
@@ -1,5 +1,6 @@
 package org.dna.mqtt.moquette.server;
 
+import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
index 5c3d53d6..bc9ac49a 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompDecoder.java
@@ -1,5 +1,6 @@
 package org.dna.mqtt.moquette.proto;
 
+import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.demux.MessageDecoderResult;
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
index a368cff8..c77c82bc 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompEncoder.java
@@ -1,5 +1,6 @@
 package org.dna.mqtt.moquette.proto;
 
+import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java
deleted file mode 100644
index 1b5f0e2e..00000000
--- a/parser/src/main/java/org/dna/mqtt/moquette/proto/PubCompMessage.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.dna.mqtt.moquette.proto;
-
-import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
-
-/**
- *
- * @author andrea
- */
-public class PubCompMessage extends MessageIDMessage {
-}
-
diff --git a/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java
new file mode 100644
index 00000000..a4dbdff5
--- /dev/null
+++ b/parser_commons/src/main/java/org/dna/mqtt/moquette/proto/messages/PubCompMessage.java
@@ -0,0 +1,9 @@
+package org.dna.mqtt.moquette.proto.messages;
+
+/**
+ *
+ * @author andrea
+ */
+public class PubCompMessage extends MessageIDMessage {
+}
+